diff --git a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java index 1d82f659b87..5fcedbaec41 100644 --- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java @@ -83,6 +83,10 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere /** Called to change the default subscription for the service. */ protected abstract void setDefaultSubscription(int subscriptionId); + protected boolean isAskEverytimeSupported() { + return true; + } + @Override public int getAvailabilityStatus(int subId) { final List subs = SubscriptionUtil.getActiveSubscriptions(mManager); @@ -123,7 +127,11 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere // display subscription based account return info.getDisplayName(); } else { - return mContext.getString(R.string.calls_and_sms_ask_every_time); + if (isAskEverytimeSupported()) { + return mContext.getString(R.string.calls_and_sms_ask_every_time); + } else { + return ""; + } } } @@ -163,9 +171,12 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere subIsAvailable = true; } } - // Add the extra "Ask every time" value at the end. - displayNames.add(mContext.getString(R.string.calls_and_sms_ask_every_time)); - subscriptionIds.add(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID)); + + if (isAskEverytimeSupported()) { + // Add the extra "Ask every time" value at the end. + displayNames.add(mContext.getString(R.string.calls_and_sms_ask_every_time)); + subscriptionIds.add(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID)); + } mPreference.setEntries(displayNames.toArray(new CharSequence[0])); mPreference.setEntryValues(subscriptionIds.toArray(new CharSequence[0])); diff --git a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java index cf544abf173..fadddd54745 100644 --- a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java @@ -23,8 +23,12 @@ import android.telephony.SubscriptionManager; public class SmsDefaultSubscriptionController extends DefaultSubscriptionController { + private final boolean mIsAskEverytimeSupported; + public SmsDefaultSubscriptionController(Context context, String preferenceKey) { super(context, preferenceKey); + mIsAskEverytimeSupported = mContext.getResources() + .getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support); } @Override @@ -42,6 +46,11 @@ public class SmsDefaultSubscriptionController extends DefaultSubscriptionControl mManager.setDefaultSmsSubId(subscriptionId); } + @Override + protected boolean isAskEverytimeSupported() { + return mIsAskEverytimeSupported; + } + @Override public PhoneAccountHandle getDefaultCallingAccountHandle() { // Not supporting calling account override by VoIP