commit facefe79f4e33312ecd336082f96bf28f2ac60ce
author Brad Ebinger <breadley@google.com> Tue Aug 15 18:24:00 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 15 18:24:00 2017 +0000
tree a5dcf032aa9aa29d654b975ff609c0e298fb1cb8
parent 302aa43d1be9c8778237aab116dd94bdb3d302e0
parent 7462a23fe8bc74b0143db3e18cd30b85782d7609

Merge "Keep 4G LTE slider disabled after call" into oc-mr1-dev

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();