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

Commit 8f61acd8 authored Apr 22, 2022 by Ricky Wai Committed by Automerger Merge Worker Apr 22, 2022

Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I8342a30b9e86699fcce7f8f5858572def92c30ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5c7d0155 fd7153ed

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -163,7 +163,9 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
	try {		try {
	final int mode = mAppOps.noteOpNoThrow(AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS,		final int mode = mAppOps.noteOpNoThrow(AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS,
	uid, packageName);		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) {		} catch (Exception e) {
	// Fallback in case if app ops is not available in testing.		// Fallback in case if app ops is not available in testing.
	return true;		return true;

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -233,7 +233,9 @@ public class RestrictedPreferenceHelper {
	final int mode = mAppOps.noteOpNoThrow(		final int mode = mAppOps.noteOpNoThrow(
	AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS,		AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS,
	preference.getUid(), preference.getPackageName());		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;		serviceAllowed = appOpsAllowed;
	} catch (Exception e) {		} catch (Exception e) {
	// Allow service in case if app ops is not available in testing.		// Allow service in case if app ops is not available in testing.