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

Commit bbf75b5a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DPMS isCredentialManagementApp add null check"

parents cffd2d12 be8ebd65

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

+5 −1
Original line number Diff line number Diff line
@@ -5847,7 +5847,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        // Should include alias in authentication policy

        try (KeyChainConnection connection = KeyChain.bindAsUser(mContext,

                caller.getUserHandle())) {

            if (!containsAlias(connection.getService().getCredentialManagementAppPolicy(), alias)) {

            // The policy will be null if there is no credential management app

            AppUriAuthenticationPolicy policy =

                    connection.getService().getCredentialManagementAppPolicy();

            if (policy == null || policy.getAppAndUriMappings().isEmpty()

                    || !containsAlias(policy, alias)) {

                return false;

            }

        } catch (RemoteException | InterruptedException e) {