From a13962204a906caa7ff7c45ed4842764b18bfac9 Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Tue, 18 Aug 2020 13:39:29 +0800 Subject: [PATCH] Rename pmInternal#getPackageUidInternal (4/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: If1ba2aa850036cb2ccb7ef9fc5b8e912155a733b --- .../java/com/android/server/webkit/WebViewUpdateService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateService.java b/services/core/java/com/android/server/webkit/WebViewUpdateService.java index 9bbeb728ae33b..90a153be8800b 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java @@ -209,8 +209,8 @@ public class WebViewUpdateService extends SystemService { private void grantVisibilityToCaller(String webViewPackageName, int callingUid) { final PackageManagerInternal pmInternal = LocalServices.getService( PackageManagerInternal.class); - final int webviewUid = pmInternal.getPackageUidInternal( - webViewPackageName, 0, UserHandle.getUserId(callingUid)); + final int webviewUid = pmInternal.getPackageUid( + webViewPackageName, 0 /* flags */, UserHandle.getUserId(callingUid)); pmInternal.grantImplicitAccess(UserHandle.getUserId(callingUid), null, UserHandle.getAppId(callingUid), webviewUid, true /*direct*/);