Merge "Replace PackageManager @hide APIs" am: dddbd4f495

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4e2fab962ba401f2c941c58c0eb2210a8f835e7
This commit is contained in:
Paul Hu
2020-12-11 10:05:38 +00:00
committed by Automerger Merge Worker

View File

@@ -5579,11 +5579,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
private boolean checkUnsupportedStartingFrom(int version, String callingPackageName) { private boolean checkUnsupportedStartingFrom(int version, String callingPackageName) {
final PackageManager pm = mContext.getPackageManager(); final UserHandle user = UserHandle.getUserHandleForUid(Binder.getCallingUid());
final int userId = UserHandle.getCallingUserId(); final PackageManager pm =
mContext.createContextAsUser(user, 0 /* flags */).getPackageManager();
try { try {
final int callingVersion = pm.getApplicationInfoAsUser( final int callingVersion = pm.getApplicationInfo(
callingPackageName, 0 /* flags */, userId).targetSdkVersion; callingPackageName, 0 /* flags */).targetSdkVersion;
if (callingVersion < version) return false; if (callingVersion < version) return false;
} catch (PackageManager.NameNotFoundException e) { } } catch (PackageManager.NameNotFoundException e) { }
return true; return true;