aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdnan <adnan@cyngn.com>2015-04-06 17:12:30 -0700
committerAdnan <adnan@cyngn.com>2015-04-06 17:12:30 -0700
commite35e025f0de83586dad5f1caee17a2a4536276cb (patch)
treedfe05944ab231757ad82d91e9ae3fe022fd894a1
parent9b2cf77f2b52736d928d9694eed913cc767d15d0 (diff)
downloadandroid_frameworks_opt_telephony-e35e025f0de83586dad5f1caee17a2a4536276cb.tar.gz
android_frameworks_opt_telephony-e35e025f0de83586dad5f1caee17a2a4536276cb.tar.bz2
android_frameworks_opt_telephony-e35e025f0de83586dad5f1caee17a2a4536276cb.zip
Telephony: Actually abort flex mapping if subs are null.
- Otherwise we attempt to still deactivate subscriptions which are not accessible. Change-Id: I380842a3e090b0bae0cc63b4367704a89a775e43
-rw-r--r--src/java/com/android/internal/telephony/ModemStackController.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/ModemStackController.java b/src/java/com/android/internal/telephony/ModemStackController.java
index b801c58a2..2831a6559 100644
--- a/src/java/com/android/internal/telephony/ModemStackController.java
+++ b/src/java/com/android/internal/telephony/ModemStackController.java
@@ -725,6 +725,7 @@ public class ModemStackController extends Handler {
if (subInfoList == null) {
//if getting sub info list is failed, abort cross mapping process.
notifyStackReady(false);
+ return;
}
for (SubInfoRecord subInfo : subInfoList) {
int subStatus = subCtrlr.getSubState(subInfo.subId);