Merge "Fix DPMS.isCredentialManagementApp()" (fbaa64c2) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+17 −16

Original line number	Diff line number	Diff line
		@@ -5924,6 +5924,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		* @return {@code true} if the calling process is the credential management app.
		*/
		private boolean isCredentialManagementApp(CallerIdentity caller, String alias) {
		return mInjector.binderWithCleanCallingIdentity(() -> {
		// Should include alias in authentication policy
		try (KeyChainConnection connection = KeyChain.bindAsUser(mContext,
		caller.getUserHandle())) {
		@@ -5939,10 +5940,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}

		AppOpsManager appOpsManager = mInjector.getAppOpsManager();
		return appOpsManager != null
		? appOpsManager.noteOpNoThrow(AppOpsManager.OP_MANAGE_CREDENTIALS, caller.getUid(),
		caller.getPackageName(), null, null) == AppOpsManager.MODE_ALLOWED
		: false;
		if (appOpsManager == null) return false;
		return appOpsManager.noteOpNoThrow(AppOpsManager.OP_MANAGE_CREDENTIALS, caller.getUid(),
		caller.getPackageName(), null, null) == AppOpsManager.MODE_ALLOWED;
		});
		}

		private static boolean containsAlias(AppUriAuthenticationPolicy policy, String alias) {