aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2016-04-05 08:14:29 -0700
committerMichael Bestas <mikeioannina@gmail.com>2017-01-07 01:41:43 +0200
commit51fea2db79d2714cbd4738515885ef12679452d2 (patch)
tree09defade4acd24824399959a3c9860b057d8139c
parent5a8306bafdcd0faab49245c3de2a9008e35c0975 (diff)
downloadandroid_frameworks_opt_telephony-51fea2db79d2714cbd4738515885ef12679452d2.tar.gz
android_frameworks_opt_telephony-51fea2db79d2714cbd4738515885ef12679452d2.tar.bz2
android_frameworks_opt_telephony-51fea2db79d2714cbd4738515885ef12679452d2.zip
telephony: Only set prompt enabled if available subscriptions > 1.
TICKET: CRACKLING-1026 Change-Id: I8a7555a41a52476af5236c03b4d410dd155db390
-rw-r--r--src/java/com/android/internal/telephony/SubscriptionController.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index 9086a5527..29994cc64 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -808,7 +808,7 @@ public class SubscriptionController extends ISub.Stub {
.getPhoneCount()) {
Rlog.i(LOG_TAG, "Subscription is invalid. Set default to " + subId);
setDefaultSmsSubId(subId);
- PhoneFactory.setSMSPromptEnabled(true);
+ PhoneFactory.setSMSPromptEnabled(subIdCountMax > 1);
}
} else {
@@ -859,6 +859,10 @@ public class SubscriptionController extends ISub.Stub {
if (DBG) logdl("[addSubInfoRecord]- info size=" + sSlotIdxToSubId.size());
+ if (sSlotIdxToSubId.size() <= 1) {
+ PhoneFactory.setSMSPromptEnabled(false);
+ }
+
} finally {
Binder.restoreCallingIdentity(identity);
}