Merge "Do not update enabled state when app ops is not changed" into tm-dev (8d4ecda1) · Commits · e / os / android_frameworks_base

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -198,9 +198,8 @@ public class RestrictedPreferenceHelper {
		if (mDisabledByAdmin != disabled) {
		mDisabledByAdmin = disabled;
		changed = true;
		}

		updateDisabledState();
		}

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

		updateDisabledState();
		}

		return changed;
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}