Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: If96615fcb282df2f34399c3ef9f3246b3e506f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ricky Wai
2022-05-20 12:27:03 +00:00
committed by Automerger Merge Worker
parent 308a7d8451 8d4ecda17e
commit a70da224db
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
View File

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

6
packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java
View File

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