Merge "Replace PackageManager @hide APIs" am: dddbd4f495 am: 7ebc0f1ab3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I018004ee98ac6b9fada57972ca2affeb94ef4956
This commit is contained in:
Paul Hu
2020-12-11 10:49:04 +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) {
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;