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

Commit ab83fd57 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "DPMS organisation API - Add a missing checkNotNull"

parents 5f09616e d48788c1

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

+1 −0
Original line number Diff line number Diff line
@@ -7895,6 +7895,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        if (!mHasFeature || !isManagedProfile(userHandle)) {

            return ActiveAdmin.DEF_ORGANIZATION_COLOR;

        }

        Preconditions.checkNotNull(who, "ComponentName is null");

        synchronized (this) {

            ActiveAdmin admin = getActiveAdminForCallerLocked(who,

                    DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);