commit dddbd4f495fbae1b25d9cfe81037fd301c5a96f6
author Paul Hu <paulhu@google.com> Fri Dec 11 09:50:28 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 11 09:50:28 2020 +0000
tree cb807ba270bc8db4cb5e5f47b47404d507694021
parent ec942a8e7068cab6fc7fc83b9477bc0b51289479
parent 667972157ff9a18f98c274463e9e87f334a985fc

Merge "Replace PackageManager @hide APIs"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index a42c864..d867442 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5579,11 +5579,12 @@
     }
 
     private boolean checkUnsupportedStartingFrom(int version, String callingPackageName) {
-        final PackageManager pm = mContext.getPackageManager();
-        final int userId = UserHandle.getCallingUserId();
+        final UserHandle user = UserHandle.getUserHandleForUid(Binder.getCallingUid());
+        final PackageManager pm =
+                mContext.createContextAsUser(user, 0 /* flags */).getPackageManager();
         try {
-            final int callingVersion = pm.getApplicationInfoAsUser(
-                    callingPackageName, 0 /* flags */, userId).targetSdkVersion;
+            final int callingVersion = pm.getApplicationInfo(
+                    callingPackageName, 0 /* flags */).targetSdkVersion;
             if (callingVersion < version) return false;
         } catch (PackageManager.NameNotFoundException e) { }
         return true;