commit 4efc9240b8a371fc2ab5d14ff33d4b0332d3c9d1
author Sanket Padawe <sanketpadawe@google.com> Sun Aug 13 23:33:07 2017 -0700
committer Sanket Padawe <sanketpadawe@google.com> Tue Aug 15 17:04:15 2017 +0000
tree 36ec74a3079af97d5b2897b7e618e70ba42c2268
parent 9d14909e452cda946dcc141cbfe1f555affc4884

Fix mobile data settings UI bug.

Change-Id: Id13cf0e88c176cd42b051f444f4b69382625df66
Bug: 64465388
Test: manual

src/com/android/phone/MobileDataPreference.java

diff --git a/src/com/android/phone/MobileDataPreference.java b/src/com/android/phone/MobileDataPreference.java
index e1d0528..fe70028 100644
--- a/src/com/android/phone/MobileDataPreference.java
+++ b/src/com/android/phone/MobileDataPreference.java
@@ -114,6 +114,9 @@
 
     @Override
     public void performClick(PreferenceScreen preferenceScreen) {
+        if (!isEnabled() || !SubscriptionManager.isValidSubscriptionId(mSubId)) {
+            return;
+        }
         final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo(
                 mSubId);
         final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();