From 816efd1cc05a36ace7a347d171bdfce63df8a6c9 Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Tue, 18 Aug 2020 13:38:12 +0800 Subject: [PATCH] Rename pmInternal#getPackageUidInternal (2/4) This method was added to operate as an internal variant of the public getPackageUid method since pmInternal#getPackageUid already exist. However, pmInternal#getPackageUid method just called to the public interface, and enforcing permissions and visibility checks. Since we don't expect any UID/permission checks in a local service, any callers to this method requiring permission checks should be migrated onto the PackageManager public method. Remove the original pmInternal#getPackageUid and rename #getPackageUidInternal to take its place. Bug: 148235092 Test: Build pass and boot Change-Id: Iebf51ab7f35710dea2b9c34c64138277c44cf30a --- .../java/com/android/server/usage/AppStandbyController.java | 2 +- .../java/com/android/server/usage/UsageStatsService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java index 6bc95bf8bc75a..c033138d5f20a 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -2131,7 +2131,7 @@ public class AppStandbyController implements AppStandbyInternal { } public List 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 diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 9b18ec644ceb0..d4a479e1a3a12 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -1654,8 +1654,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; }