Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clear binder identity before calling PackageManager API" into rvc-dev am: 3ce0702633 am: 16fe5ad9ac

Browse Source 
Change-Id: Ie998ee0cd92f93a4058aaa573fc160083ee81175
This commit is contained in:
Automerger Merge Worker
2020-03-09 12:56:32 +00:00
parent 9de2f85624 16fe5ad9ac
commit dd19d890e3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -951,18 +951,18 @@ public class Vpn {
|| isVpnServicePreConsented(context, packageName);
}
private int getAppUid(String app, int userHandle) {
private int getAppUid(final String app, final int userHandle) {
if (VpnConfig.LEGACY_VPN.equals(app)) {
return Process.myUid();
}
PackageManager pm = mContext.getPackageManager();
int result;
try {
result = pm.getPackageUidAsUser(app, userHandle);
} catch (NameNotFoundException e) {
result = -1;
}
return result;
return Binder.withCleanCallingIdentity(() -> {
try {
return pm.getPackageUidAsUser(app, userHandle);
} catch (NameNotFoundException e) {
return -1;
}
});
}
private boolean doesPackageTargetAtLeastQ(String packageName) {