Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cacded5 authored Apr 06, 2022 by Ricky Wai

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

parent e0f6939c

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,9 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
		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

+3 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,9 @@ public class RestrictedPreferenceHelper {
		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.