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

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

Merge "Removes direct use of LocalServices.getService"

parents 846c219d 2f2fd718

core/java/android/os/UserManagerInternal.java

+3 −0
Original line number Diff line number Diff line
@@ -221,4 +221,7 @@ public abstract class UserManagerInternal { 
     */

    public abstract boolean isSettingRestrictedForUser(String setting, int userId, String value,

            int callingUid);



    /** @return a specific user restriction that's in effect currently. */

    public abstract boolean hasUserRestriction(String restriction, int userId);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ class InstantAppRegistry { 


        // Prune first installed instant apps

        synchronized (mService.mLock) {

            allUsers = PackageManagerService.sUserManager.getUserIds();

            allUsers = mService.mUserManager.getUserIds();



            final int packageCount = mService.mPackages.size();

            for (int i = 0; i < packageCount; i++) {