invisiblek

diff --git a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index 1feb709..6823ef8 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -776,13 +776,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
                         // ERI text, so here it is ignored what is coming from the modem.
                         mNewSS.setOperatorName(null, opNames[1], opNames[2]);
                     } else {
-                        String brandOverride = mUiccController.getUiccCard() != null ?
-                            mUiccController.getUiccCard().getOperatorBrandOverride() : null;

invisiblek

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 70fdfa1..538b168 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -68,7 +68,10 @@ TARGET_ENABLE_QC_AV_ENHANCEMENTS := true
 TARGET_USES_QCOM_BSP := true
 
 # Audio
-AUDIO_FEATURE_DISABLED_MULTI_VOICE_SESSIONS := true
+AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false

invisiblek

78014 # gralloc: Add workaround for Jellybean camera drivers
78017 # display: Add flag to allow legacy allocations from MM heap
78066 # overlay: fw: increase brightness arrays
78537 # mkimage for OMAP
78539 # 60xx: add tenderloin to build barrier
79135 # g3-common: Change LCD density to 560dpi
skip 78919 # Telephony: fix getIccOperatorNumeric
skip 77856 # Telephony: Allow ruim to fetch in CDMA LTE mode
skip 78695 # jf: remove nfc module suffix
skip 78696 # jf: fix NFC

invisiblek

diff --git a/cpu_ref/rsCpuCore.cpp b/cpu_ref/rsCpuCore.cpp
index f09e334..28e574b 100644
--- a/cpu_ref/rsCpuCore.cpp
+++ b/cpu_ref/rsCpuCore.cpp
@@ -63,6 +63,15 @@ RsdCpuReference::~RsdCpuReference() {
 }
 
 RsdCpuReference * RsdCpuReference::create(Context *rsc, uint32_t version_major,
+        uint32_t version_minor, sym_lookup_t lfn, script_lookup_t slfn,
+        bcc::RSLinkRuntimeCallback pLinkRuntimeCallback,

invisiblek

skip 78919 # Telephony: fix getIccOperatorNumeric
skip 77856 # Telephony: Allow ruim to fetch in CDMA LTE mode
skip 79630 # media_profiles: fix 4k recording profile
skip 79857 # LgeLteRIL: Lollipop fixups for CDMA
skip 80056 # init: cleanup and juggling act
skip 80371 # MSIM: Fix subscription fallback issue
skip 81249 # prima: update to version 3.2.3.418
skip 81250 # staging: prima: add option to read calibration data from HTC NVS
skip 81251 # prima: fix building inline
skip 81240 # wifi: update wcnss and wpa supplicant configs from lollipop

invisiblek

On branch new
Your branch is up-to-date with 'github/cm-12.0'.

You are currently cherry-picking commit f0989df.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	deleted:    .gitignore

invisiblek

HEAD detached from 3b9620e
You are currently cherry-picking commit 2676ca2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   arch/arm/configs/jf_defconfig
	modified:   arch/arm/mach-msm/Kconfig
	modified:   arch/arm/mach-msm/bam_dmux.c

invisiblek

system 0 0 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/addon.d 0 0 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/addon.d/blacklist 0 0 644 selabel=u:object_r:system_file:s0 capabilities=0x0
system/addon.d/50-cm.sh 0 0 644 selabel=u:object_r:system_file:s0 capabilities=0x0
system/recovery-from-boot.p 0 0 644 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin/sane_schedstat 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin/unlzma 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin/base64 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin/setkeycodes 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0

invisiblek

system 0 0 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/addon.d 0 0 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/addon.d/blacklist 0 0 644 selabel=u:object_r:system_file:s0 capabilities=0x0
system/addon.d/50-cm.sh 0 0 644 selabel=u:object_r:system_file:s0 capabilities=0x0
system/recovery-from-boot.p 0 0 644 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin/sane_schedstat 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin/unlzma 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin/base64 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0
system/xbin/setkeycodes 0 2000 755 selabel=u:object_r:system_file:s0 capabilities=0x0

invisiblek

diff --git a/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java b/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
index 44e18de..b6ce507 100644
--- a/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
+++ b/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
@@ -36,6 +36,8 @@ import com.android.internal.telephony.uicc.IccCardStatus;
  */
 public class LgeLteRIL extends RIL implements CommandsInterface {
     private Message mPendingGetSimStatus;
+    private Message mPendingNetworkTypeMsg;
+    private int mPendingNetworkType;