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

Commit 767bfd30 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop using ConnectivityManager for VPNs in DPMS." am: 6ec31401 am: d083daab 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594172

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59da3b91cce7c5d21220b13a0924526ec7439dac
parents 45553222 d083daab

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+9 −4
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ import android.net.ConnectivityManager; 
import android.net.IIpConnectivityMetrics;

import android.net.ProxyInfo;

import android.net.Uri;

import android.net.VpnManager;

import android.net.metrics.IpConnectivityLog;

import android.net.wifi.WifiManager;

import android.os.Binder;
@@ -2251,6 +2252,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            return mContext.getSystemService(ConnectivityManager.class);

        }













        VpnManager getVpnManager() {













            return mContext.getSystemService(VpnManager.class);













        }



























        LocationManager getLocationManager() {















            return mContext.getSystemService(LocationManager.class);















        }










@@ -7105,7 +7110,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                }















            }















            // If some package is uninstalled after the check above, it will be ignored by CM.













            if (!mInjector.getConnectivityManager().setAlwaysOnVpnPackageForUser(













            if (!mInjector.getVpnManager().setAlwaysOnVpnPackageForUser(















                    userId, vpnPackage, lockdown, lockdownAllowlist)) {















                throw new UnsupportedOperationException();















            }










@@ -7136,7 +7141,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {



























        final int userId = mInjector.userHandleGetCallingUserId();















        return mInjector.binderWithCleanCallingIdentity(













                () -> mInjector.getConnectivityManager().getAlwaysOnVpnPackageForUser(userId));













                () -> mInjector.getVpnManager().getAlwaysOnVpnPackageForUser(userId));















    }





























    @Override









@@ -7154,7 +7159,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {



























        final int userId = mInjector.userHandleGetCallingUserId();















        return mInjector.binderWithCleanCallingIdentity(













                () -> mInjector.getConnectivityManager().isVpnLockdownEnabled(userId));













                () -> mInjector.getVpnManager().isVpnLockdownEnabled(userId));















    }





























    @Override









@@ -7173,7 +7178,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {



























        final int userId = mInjector.userHandleGetCallingUserId();















        return mInjector.binderWithCleanCallingIdentity(













                () -> mInjector.getConnectivityManager().getVpnLockdownAllowlist(userId));













                () -> mInjector.getVpnManager().getVpnLockdownAllowlist(userId));















    }





























    private void forceWipeDeviceNoLock(boolean wipeExtRequested, String reason, boolean wipeEuicc) {