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

Commit 6d265466 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Stop using ConnectivityManager for VPNs in DPMS." into sc-dev am: acaa6434 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bf20c2eca6c5034de11a43ed578500fa78ca154
parents eab51b7d acaa6434

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

+9 −6
Original line number Diff line number Diff line
@@ -222,6 +222,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;
@@ -1267,6 +1268,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);















        }










@@ -6302,7 +6307,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();















            }










@@ -6334,8 +6339,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller));





























        return mInjector.binderWithCleanCallingIdentity(













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













                        caller.getUserId()));













                () -> mInjector.getVpnManager().getAlwaysOnVpnPackageForUser(caller.getUserId()));















    }





























    @Override









@@ -6361,7 +6365,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        }





























        return mInjector.binderWithCleanCallingIdentity(













                () -> mInjector.getConnectivityManager().isVpnLockdownEnabled(caller.getUserId()));













                () -> mInjector.getVpnManager().isVpnLockdownEnabled(caller.getUserId()));















    }





























    @Override









@@ -6382,8 +6386,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller));





























        return mInjector.binderWithCleanCallingIdentity(













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













                        caller.getUserId()));













                () -> mInjector.getVpnManager().getVpnLockdownAllowlist(caller.getUserId()));















    }





























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