invisiblek

 g3-common/Android.mk                               |  10 -
 g3-common/g3-common-vendor-blobs.mk                |  84 ++--
 g3-common/proprietary/app/TimeService.apk          | Bin 3761 -> 3836 bytes
 .../proprietary/app/com.qualcomm.location.apk      | Bin 71282 -> 130925 bytes
 .../app/com.qualcomm.services.location.apk         | Bin 51159 -> 16194 bytes
 g3-common/proprietary/app/qcrilmsgtunnel.apk       | Bin 20487 -> 20275 bytes
 g3-common/proprietary/app/shutdownlistener.apk     | Bin 4407 -> 0 bytes
 g3-common/proprietary/bin/adsprpcd                 | Bin 5564 -> 5568 bytes
 g3-common/proprietary/bin/irsc_util                | Bin 5284 -> 9384 bytes
 g3-common/proprietary/bin/mm-pp-daemon             | Bin 87560 -> 0 bytes

invisiblek

<?xml version="1.0" encoding="UTF-8"?>
<manifest>
  <remote fetch="ssh://[email protected]:22123" name="gitlab" />
  <remote fetch="git://codeaurora.org/quic/la/" name="caf" />

  <project name="CyanogenMod/hudson" path="hudson" revision="master" />

  <project name="TheMuppets/proprietary_vendor_samsung" path="vendor/samsung" />
  <project name="TheMuppets/proprietary_vendor_lge" path="vendor/lge" />
  <project name="TheMuppets/proprietary_vendor_htc" path="vendor/htc" />

invisiblek

78014 # gralloc: Add workaround for Jellybean camera drivers
78017 # display: Add flag to allow legacy allocations from MM heap
78023 # gralloc: Fix some differences with compatibility code
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 79187 # UiccController: Query GET_SIM_STATUS when radio state is ON
skip 77856 # Telephony: Allow ruim to fetch in CDMA LTE mode

invisiblek

# function to find all *.cpp files under a directory
define all-cpp-files-under
$(patsubst ./%,%, \
  $(shell cd $(LOCAL_PATH) ; \
          find $(1) -name "*.cpp" -and -not -name ".*") \
 )
endef


LOCAL_PATH:= $(call my-dir)

invisiblek

78014 # gralloc: Add workaround for Jellybean camera drivers
78017 # display: Add flag to allow legacy allocations from MM heap
78023 # gralloc: Fix some differences with compatibility code
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 79187 # UiccController: Query GET_SIM_STATUS when radio state is ON
skip 77856 # Telephony: Allow ruim to fetch in CDMA LTE mode

invisiblek

diff --git a/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java b/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
index e49a962..31e36d6 100644
--- a/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
+++ b/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
@@ -289,6 +289,8 @@ public class SubInfoRecordUpdater extends Handler {
                 if (sIccId[slotId] != null && !sIccId[slotId].equals(ICCID_STRING_FOR_NO_SIM)) {
                     logd("SIM" + (slotId + 1) + " hot plug out");
                     sNeedUpdate = true;
+                } else {
+                    sNeedUpdate = false;

invisiblek

diff --git a/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java b/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
index e49a962..25f146d 100644
--- a/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
+++ b/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
@@ -473,13 +473,13 @@ public class SubInfoRecordUpdater extends Handler {
 
         // true if any slot has no SIM this time, but has SIM last time
         boolean hasSimRemoved = false;
-        for (int i=0; i < PROJECT_SIM_NUM; i++) {
+/*        for (int i=0; i < PROJECT_SIM_NUM; i++) {

invisiblek

diff --git a/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java b/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
index e49a962..cc331cf 100644
--- a/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
+++ b/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
@@ -284,7 +284,7 @@ public class SubInfoRecordUpdater extends Handler {
             sCardState[slotId] = newState;
             logd("Slot[" + slotId + "]: New Card State = "
                     + newState + " " + "Old Card State = " + oldState);
-            if (!newState.isCardPresent()) {
+            if (!newState.isCardPresent() && newState != oldState) {

invisiblek

diff --git a/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java b/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
index e49a962..86e50e1 100644
--- a/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
+++ b/src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
@@ -276,15 +276,24 @@ public class SubInfoRecordUpdater extends Handler {
 
         for (int slotId = 0; slotId < PROJECT_SIM_NUM; slotId++) {
             CardState newState = CardState.CARDSTATE_ABSENT;
-            UiccCard newCard = mUiccController.getUiccCard(slotId);
-            if (newCard != null) {

invisiblek

78014 # gralloc: Add workaround for Jellybean camera drivers
78017 # display: Add flag to allow legacy allocations from MM heap
78023 # gralloc: Fix some differences with compatibility code
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
79187 # UiccController: Query GET_SIM_STATUS when radio state is ON
skip 77856 # Telephony: Allow ruim to fetch in CDMA LTE mode