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

am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev

Browse Source 
* commit 'f82b029c7c47568f75eb4a7e676baf2cb61c967f':
  Check UID instead of package name when preparing VPN.
This commit is contained in:
Jeff Davidson
2014-10-28 20:06:08 +00:00
committed by Android Git Automerger
parent 296e0a79b9 f82b029c7c
commit 306eac5f41
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,7 +215,7 @@ public class Vpn {
*/ */
public synchronized boolean prepare(String oldPackage, String newPackage) { public synchronized boolean prepare(String oldPackage, String newPackage) {
// Return false if the package does not match. // Return false if the package does not match.
if (oldPackage != null && !oldPackage.equals(mPackage)) { if (oldPackage != null && getAppUid(oldPackage, mUserHandle) != mOwnerUID) {
// The package doesn't match. If this VPN was not previously authorized, return false // The package doesn't match. If this VPN was not previously authorized, return false
// to force user authorization. Otherwise, revoke the VPN anyway. // to force user authorization. Otherwise, revoke the VPN anyway.
if (!oldPackage.equals(VpnConfig.LEGACY_VPN) && isVpnUserPreConsented(oldPackage)) { if (!oldPackage.equals(VpnConfig.LEGACY_VPN) && isVpnUserPreConsented(oldPackage)) {
@@ -234,8 +234,8 @@ public class Vpn {
} }
// Return true if we do not need to revoke. // Return true if we do not need to revoke.
if (newPackage == null || if (newPackage == null || (!newPackage.equals(VpnConfig.LEGACY_VPN) &&
(newPackage.equals(mPackage) && !newPackage.equals(VpnConfig.LEGACY_VPN))) { getAppUid(newPackage, mUserHandle) == mOwnerUID)) {
return true; return true;
} }