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

Commit 058fbd0f authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

am 4581ca53: am 7b2b74e1: am 135c3791: am 410abcdb: Merge "Revise lockdown... 

am 4581ca53: am 7b2b74e1: am 135c3791: am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev

* commit '4581ca53':
  Revise lockdown check in getLegacyVpnInfo()
parents 8e717629 4581ca53

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

+4 −1
Original line number Diff line number Diff line
@@ -3102,7 +3102,10 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    @Override

    public LegacyVpnInfo getLegacyVpnInfo(int userId) {

        enforceCrossUserPermission(userId);

        throwIfLockdownEnabled();

        if (mLockdownEnabled) {

            return null;

        }



        synchronized(mVpns) {

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

        }