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

Commit 44c8c5cc authored by Hung-ying Tyan's avatar Hung-ying Tyan
Browse files

Revise lockdown check in getLegacyVpnInfo() 

Return null instead of raising exception in lockdown mode.

BUG=22749146

Change-Id: I0e9e3ded0d189e3fa9e872b7af9fe363799c85d6
parent b8040265

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

+4 −1
Original line number Diff line number Diff line
@@ -3048,7 +3048,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();

        }