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

Commit f180fe31 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Legacy VPN calls to require a userID" into mnc-dev

parents 5d1654a9 3eed5eca

core/java/android/net/IConnectivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ interface IConnectivityManager 


    void startLegacyVpn(in VpnProfile profile);



    LegacyVpnInfo getLegacyVpnInfo();

    LegacyVpnInfo getLegacyVpnInfo(int userId);



    VpnInfo[] getAllVpnInfo();

services/core/java/com/android/server/ConnectivityService.java

+3 −3
Original line number Diff line number Diff line
@@ -3031,11 +3031,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
     * are checked in Vpn class.

     */

    @Override

    public LegacyVpnInfo getLegacyVpnInfo() {

    public LegacyVpnInfo getLegacyVpnInfo(int userId) {

        enforceCrossUserPermission(userId);

        throwIfLockdownEnabled();

        int user = UserHandle.getUserId(Binder.getCallingUid());

        synchronized(mVpns) {

            return mVpns.get(user).getLegacyVpnInfo();

            return mVpns.get(userId).getLegacyVpnInfo();

        }

    }