commit 0cacded5cace60f0271b23503b9f9071ed709f85
author Ricky Wai <rickywai@google.com> Wed Apr 06 16:05:56 2022 +0000
committer Ricky Wai <rickywai@google.com> Fri Apr 08 13:57:02 2022 +0000
tree 5665168221c95ff9bfcc0d15a40bbb81b9ff7533
parent e0f6939c4c4f1fca1c786948074c4e66e9594553

Apply enhanced confirmation mode OEM config to Settings

So Settings app will block user accessing restricted settings
if OEM config is off.

Bug: 217709978
Test: With OEM config on, accessibility page for unknown source app is
disabled by default.
Test: With OEM config off, accessibility page for unknown source app is
not disabled.

Change-Id: Id25e8fd76e6192fd4db64f81903449bb02785b39

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

diff --git a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
index 911e2fc..c3359e4 100644
--- a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
@@ -163,7 +163,9 @@
         try {
             final int mode = mAppOps.noteOpNoThrow(AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS,
                     uid, packageName);
-            return mode != AppOpsManager.MODE_ERRORED && mode != AppOpsManager.MODE_IGNORED;
+            final boolean ecmEnabled = getContext().getResources().getBoolean(
+                    com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
+            return !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED;
         } catch (Exception e) {
             // Fallback in case if app ops is not available in testing.
             return true;

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 3e42e21..4344acc 100644
--- a/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
+++ b/src/com/android/settings/accessibility/RestrictedPreferenceHelper.java
@@ -233,7 +233,9 @@
                 final int mode = mAppOps.noteOpNoThrow(
                         AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS,
                         preference.getUid(), preference.getPackageName());
-                appOpsAllowed = mode == AppOpsManager.MODE_ALLOWED;
+                final boolean ecmEnabled = mContext.getResources().getBoolean(
+                        com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
+                appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED;
                 serviceAllowed = appOpsAllowed;
             } catch (Exception e) {
                 // Allow service in case if app ops is not available in testing.