Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 306eac5f authored by Jeff Davidson's avatar Jeff Davidson Committed by Android Git Automerger
Browse files

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

* commit 'f82b029c':
  Check UID instead of package name when preparing VPN.
parents 296e0a79 f82b029c

services/core/java/com/android/server/connectivity/Vpn.java

+3 −3
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ public class Vpn { 
     */

    public synchronized boolean prepare(String oldPackage, String newPackage) {

        // 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

            // to force user authorization. Otherwise, revoke the VPN anyway.

            if (!oldPackage.equals(VpnConfig.LEGACY_VPN) && isVpnUserPreConsented(oldPackage)) {
@@ -234,8 +234,8 @@ public class Vpn { 
        }



        // Return true if we do not need to revoke.

        if (newPackage == null ||

                (newPackage.equals(mPackage) && !newPackage.equals(VpnConfig.LEGACY_VPN))) {

        if (newPackage == null || (!newPackage.equals(VpnConfig.LEGACY_VPN) &&

                getAppUid(newPackage, mUserHandle) == mOwnerUID)) {

            return true;

        }