Merge "Replace PackageManager @hide APIs"

This commit is contained in:
Paul Hu
2020-12-11 09:50:28 +00:00
committed by Gerrit Code Review

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;