From 1cf1586af8ed6e8a4deed3a0e8bbc2988b050858 Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Tue, 18 Aug 2020 13:39:04 +0800 Subject: [PATCH] Rename pmInternal#getPackageUidInternal (3/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: If5a3926f6f2d5e74707b4088f497dbf2c2f8064b --- .../server/inputmethod/InputMethodManagerService.java | 2 +- .../core/java/com/android/server/wm/ActivityStarter.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 254285dfbd415..e37f16d3e456b 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -2590,7 +2590,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (mCurIntent != null && name.equals(mCurIntent.getComponent())) { mCurMethod = IInputMethod.Stub.asInterface(service); final String curMethodPackage = mCurIntent.getComponent().getPackageName(); - final int curMethodUid = mPackageManagerInternal.getPackageUidInternal( + final int curMethodUid = mPackageManagerInternal.getPackageUid( curMethodPackage, 0 /* flags */, mSettings.getCurrentUserId()); if (curMethodUid < 0) { Slog.e(TAG, "Failed to get UID for package=" + curMethodPackage); diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index f7cb0146ea523..bee726673decb 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1693,8 +1693,9 @@ class ActivityStarter { // we need to resolve resultTo to a uid as grantImplicitAccess deals explicitly in UIDs final PackageManagerInternal pmInternal = mService.getPackageManagerInternalLocked(); - final int resultToUid = pmInternal.getPackageUidInternal( - mStartActivity.resultTo.info.packageName, 0, mStartActivity.mUserId); + final int resultToUid = pmInternal.getPackageUid( + mStartActivity.resultTo.info.packageName, 0 /* flags */, + mStartActivity.mUserId); pmInternal.grantImplicitAccess(mStartActivity.mUserId, mIntent, UserHandle.getAppId(mStartActivity.info.applicationInfo.uid) /*recipient*/, resultToUid /*visible*/, true /*direct*/);