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

Commit 648048ba authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Don't cause an NPE 

Change-Id: I2ca5d928c04abc9471717603f12be46e82eaacdd
Fixes: 29050142
Test: Manual. See that package manager service doesn't crash
parent 55ce82b1

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -21060,7 +21060,8 @@ public class PackageManagerService extends IPackageManager.Stub 
    }















    @Override













    public int getComponentEnabledSetting(ComponentName component, int userId) {













    public int getComponentEnabledSetting(@NonNull ComponentName component, int userId) {













        if (component == null) return COMPONENT_ENABLED_STATE_DEFAULT;















        if (!sUserManager.exists(userId)) return COMPONENT_ENABLED_STATE_DISABLED;















        int callingUid = Binder.getCallingUid();















        mPermissionManager.enforceCrossUserPermission(callingUid, userId,