Merge "Do not update enabled state when app ops is not changed" into tm-dev am: 8d4ecda17e am: a70da224db

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482694

Change-Id: I6c09436ec4ad28281c8261066fc4914565abaf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java

@@ -198,10 +198,9 @@ public class RestrictedPreferenceHelper {
         if (mDisabledByAdmin != disabled) {
             mDisabledByAdmin = disabled;
             changed = true;
+            updateDisabledState();
         }
 
-        updateDisabledState();
-
         return changed;
     }
 
@@ -210,10 +209,9 @@ public class RestrictedPreferenceHelper {
         if (mDisabledByAppOps != disabled) {
             mDisabledByAppOps = disabled;
             changed = true;
+            updateDisabledState();
         }
 
-        updateDisabledState();
-
         return changed;
     }
 

packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java

@@ -254,9 +254,11 @@ public class RestrictedSwitchPreference extends SwitchPreference {
         final boolean ecmEnabled = getContext().getResources().getBoolean(
                 com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
         final boolean appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED;
-        if (appOpsAllowed || isEnabled) {
+        if (isEnabled) {
             setEnabled(true);
-        } else {
+        } else if (appOpsAllowed && isDisabledByAppOps()) {
+            setEnabled(true);
+        } else if (!appOpsAllowed){
             setDisabledByAppOps(true);
         }
     }