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

Commit 1d4d4461 authored by Jackal Guo's avatar Jackal Guo Committed by Android (Google) Code Review
Browse files

Merge "Rename pmInternal#getPackageUidInternal (2/4)"

parents cde03184 816efd1c

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+1 −1
Original line number Diff line number Diff line
@@ -2131,7 +2131,7 @@ public class AppStandbyController implements AppStandbyInternal { 
        }



        public List<UserHandle> getValidCrossProfileTargets(String pkg, int userId) {

            final int uid = mPackageManagerInternal.getPackageUidInternal(pkg, 0, userId);

            final int uid = mPackageManagerInternal.getPackageUid(pkg, /* flags= */ 0, userId);

            final AndroidPackage aPkg = mPackageManagerInternal.getPackage(uid);

            if (uid < 0

                    || aPkg == null

services/usage/java/com/android/server/usage/UsageStatsService.java

+2 −2
Original line number Diff line number Diff line
@@ -1653,8 +1653,8 @@ public class UsageStatsService extends SystemService implements 


            // If the calling app is asking about itself, continue, else check for permission.

            if (packageName.equals(callingPackage)) {

                final int actualCallingUid = mPackageManagerInternal.getPackageUidInternal(

                        callingPackage, 0, userId);

                final int actualCallingUid = mPackageManagerInternal.getPackageUid(

                        callingPackage, /* flags= */ 0, userId);

                if (actualCallingUid != callingUid) {

                    return false;

                }