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

Commit cec66307 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge "Replace isChangeEnabled() package name argument."

parents 0cdd3387 3d43f63a

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

+1 −1
Original line number Diff line number Diff line
@@ -5725,7 +5725,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        try {

            return setKeyChainGrantInternal(alias, hasGrant, granteeUid, caller.getUserHandle());

        } catch (IllegalArgumentException e) {

            if (mInjector.isChangeEnabled(THROW_EXCEPTION_WHEN_KEY_MISSING, packageName,

            if (mInjector.isChangeEnabled(THROW_EXCEPTION_WHEN_KEY_MISSING, callerPackage,

                    caller.getUserId())) {

                throw e;

            }