diff options
author | Nathan Harold <nharold@google.com> | 2017-02-02 16:02:06 -0800 |
---|---|---|
committer | Nathan Harold <nharold@google.com> | 2017-02-03 10:46:03 -0800 |
commit | e871dc6e5e4408d5eca489d2550b6a553a3e958c (patch) | |
tree | 6746209da0bedf0af27b594051729eaa41698f3f | |
parent | 0939bc77ff1626e7204c00edbd5486d9744e888d (diff) | |
download | android_frameworks_opt_telephony-e871dc6e5e4408d5eca489d2550b6a553a3e958c.tar.gz android_frameworks_opt_telephony-e871dc6e5e4408d5eca489d2550b6a553a3e958c.tar.bz2 android_frameworks_opt_telephony-e871dc6e5e4408d5eca489d2550b6a553a3e958c.zip |
[DO NOT MERGE] Best-Effort Load of Potentially-Large SIM Records
Because we have at least one SIM in the field that has a massive
OPLMNw/ACT Record of 700 entries (3.5kB), some messaging
pipelines cannot handle these record sizes and the errors are
preventing the SIM load procedure from being completed.
To work around this, because these records are informational, they
will now load as part of SIM refresh, but that procedure will be
best-effort.
Bug: 34095124
Test: Manually verified with TMO and CT SIMs
Change-Id: I87eb84386a7e8094f3a0493f01ee8dc928864dc2
(cherry picked from commit f15ee16d1f9c325346a002a44b793a2a914ead9e)
-rw-r--r-- | src/java/com/android/internal/telephony/uicc/SIMRecords.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/SIMRecords.java b/src/java/com/android/internal/telephony/uicc/SIMRecords.java index 96311b382..d5985c808 100644 --- a/src/java/com/android/internal/telephony/uicc/SIMRecords.java +++ b/src/java/com/android/internal/telephony/uicc/SIMRecords.java @@ -1259,7 +1259,6 @@ public class SIMRecords extends IccRecords { break; case EVENT_GET_PLMN_W_ACT_DONE: - isRecordLoadResponse = true; ar = (AsyncResult) msg.obj; data = (byte[]) ar.result; @@ -1274,7 +1273,6 @@ public class SIMRecords extends IccRecords { break; case EVENT_GET_OPLMN_W_ACT_DONE: - isRecordLoadResponse = true; ar = (AsyncResult) msg.obj; data = (byte[]) ar.result; @@ -1290,7 +1288,6 @@ public class SIMRecords extends IccRecords { break; case EVENT_GET_HPLMN_W_ACT_DONE: - isRecordLoadResponse = true; ar = (AsyncResult) msg.obj; data = (byte[]) ar.result; @@ -1305,7 +1302,6 @@ public class SIMRecords extends IccRecords { break; case EVENT_GET_EHPLMN_DONE: - isRecordLoadResponse = true; ar = (AsyncResult) msg.obj; data = (byte[]) ar.result; if (ar.exception != null || data == null) { @@ -1723,16 +1719,12 @@ public class SIMRecords extends IccRecords { mRecordsToLoad++; mFh.loadEFTransparent(EF_PLMN_W_ACT, obtainMessage(EVENT_GET_PLMN_W_ACT_DONE)); - mRecordsToLoad++; mFh.loadEFTransparent(EF_OPLMN_W_ACT, obtainMessage(EVENT_GET_OPLMN_W_ACT_DONE)); - mRecordsToLoad++; mFh.loadEFTransparent(EF_HPLMN_W_ACT, obtainMessage(EVENT_GET_HPLMN_W_ACT_DONE)); - mRecordsToLoad++; mFh.loadEFTransparent(EF_EHPLMN, obtainMessage(EVENT_GET_EHPLMN_DONE)); - mRecordsToLoad++; mFh.loadEFTransparent(EF_FPLMN, obtainMessage(EVENT_GET_FPLMN_DONE)); mRecordsToLoad++; |