commit 67a237efcac7929b303b9615c5fdf337530c6dae
author Jay Sullivan <jaysullivan@google.com> Fri Mar 22 19:30:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 22 19:30:56 2024 +0000
tree a76bd4c9c6faa3d47d73d1e7004a9fc41de65434
parent c635e76d81d28559508eb75e4df712e07fc0b176
parent f8b405462a7465622d7be81d37568ad8e634566d

Merge "[ECM] Legacy code: treat DEFAULT as ALLOWED (st)" into main

src/com/android/settings/accessibility/RestrictedPreferenceHelper.java

diff --git a/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java b/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
index 03bf142..c806c0b 100644
--- a/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
+++ b/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
@@ -267,7 +267,8 @@
                             preference.getUid(), preference.getPackageName());
                     final boolean ecmEnabled = mContext.getResources().getBoolean(
                             com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
-                    appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED;
+                    appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED
+                            || mode == AppOpsManager.MODE_DEFAULT;
                     serviceAllowed = appOpsAllowed;
                 } catch (Exception e) {
                     // Allow service in case if app ops is not available in testing.