From 7098379555d25db9c2daf4d5e15377e5500726ae Mon Sep 17 00:00:00 2001 From: Grace Jia Date: Mon, 27 Apr 2020 14:56:11 -0700 Subject: [PATCH] Disable 'Mobile data' selection after removing SIM Bug: 153895858 Test: Manually remove SIM and test Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1 Exempt-From-Owner-Approval: Telephony settings --- res/values/strings.xml | 3 +++ .../network/telephony/MobileDataPreferenceController.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6cf3c8c6133..d15be1e7a81 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10893,6 +10893,9 @@ Phone will automatically switch to this carrier when in range + + No SIM card available diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java index daee6ababbe..e5d0169ef18 100644 --- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java +++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java @@ -128,6 +128,13 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon preference.setEnabled(true); preference.setSummary(R.string.mobile_data_settings_summary); } + + if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { + preference.setSelectable(false); + preference.setSummary(R.string.mobile_data_settings_summary_unavailable); + } else { + preference.setSelectable(true); + } } private boolean isOpportunistic() {