diff options
4 files changed, 7 insertions, 4 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java index f36da19afd30..20f1b175e1de 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java @@ -144,7 +144,8 @@ public class RestrictedLockUtilsInternal extends RestrictedLockUtils { uid, packageName); final boolean ecmEnabled = context.getResources().getBoolean( com.android.internal.R.bool.config_enhancedConfirmationModeEnabled); - return ecmEnabled && mode != AppOpsManager.MODE_ALLOWED; + return ecmEnabled && mode != AppOpsManager.MODE_ALLOWED + && mode != AppOpsManager.MODE_DEFAULT; } catch (Exception e) { // Fallback in case if app ops is not available in testing. return false; diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java index 0c54c1903742..45754eb8f16d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java @@ -289,7 +289,8 @@ public class RestrictedSwitchPreference extends SwitchPreferenceCompat { uid, packageName); final boolean ecmEnabled = getContext().getResources().getBoolean( com.android.internal.R.bool.config_enhancedConfirmationModeEnabled); - final boolean appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED; + final boolean appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED + || mode == AppOpsManager.MODE_DEFAULT; if (!isEnableAllowed && !isEnabled) { setEnabled(false); } else if (isEnabled) { diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 880a68776055..a57138f9de72 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -4815,7 +4815,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub uid, packageName); final boolean ecmEnabled = mContext.getResources().getBoolean( com.android.internal.R.bool.config_enhancedConfirmationModeEnabled); - return !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED; + return !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED + || mode == AppOpsManager.MODE_DEFAULT; } catch (Exception e) { // Fallback in case if app ops is not available in testing. return false; diff --git a/services/companion/java/com/android/server/companion/utils/PackageUtils.java b/services/companion/java/com/android/server/companion/utils/PackageUtils.java index 81dc36ddcff1..254d28b1b2c2 100644 --- a/services/companion/java/com/android/server/companion/utils/PackageUtils.java +++ b/services/companion/java/com/android/server/companion/utils/PackageUtils.java @@ -241,7 +241,7 @@ public final class PackageUtils { final int mode = context.getSystemService(AppOpsManager.class).noteOpNoThrow( AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS, uid, packageName, /* attributionTag= */ null, /* message= */ null); - return mode == AppOpsManager.MODE_ALLOWED; + return mode == AppOpsManager.MODE_ALLOWED || mode == AppOpsManager.MODE_DEFAULT; } } } |