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

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

Merge "Don't cause an NPE"

parents c0819d20 648048ba

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

+2 −1
Original line number Diff line number Diff line
@@ -21220,7 +21220,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,