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

Commit acaa6434 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

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

parents a3375b62 91fc38b3

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

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

import android.net.IIpConnectivityMetrics;

import android.net.ProxyInfo;

import android.net.ProxyInfo;

import android.net.Uri;

import android.net.Uri;

import android.net.VpnManager;

import android.net.metrics.IpConnectivityLog;

import android.net.metrics.IpConnectivityLog;

import android.net.wifi.WifiManager;

import android.net.wifi.WifiManager;

import android.os.Binder;

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

            return mContext.getSystemService(ConnectivityManager.class);

        }

        }




















        VpnManager getVpnManager() {














            return mContext.getSystemService(VpnManager.class);














        }
























        LocationManager getLocationManager() {







        LocationManager getLocationManager() {











            return mContext.getSystemService(LocationManager.class);







            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 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)) {







                    userId, vpnPackage, lockdown, lockdownAllowlist)) {











                throw new UnsupportedOperationException();







                throw new UnsupportedOperationException();











            }







            }










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









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







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



























        return mInjector.binderWithCleanCallingIdentity(







        return mInjector.binderWithCleanCallingIdentity(











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







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











                        caller.getUserId()));














    }







    }



























    @Override







    @Override









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









        }







        }



























        return mInjector.binderWithCleanCallingIdentity(







        return mInjector.binderWithCleanCallingIdentity(











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







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











    }







    }



























    @Override







    @Override









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









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







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



























        return mInjector.binderWithCleanCallingIdentity(







        return mInjector.binderWithCleanCallingIdentity(











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







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











                        caller.getUserId()));














    }







    }



























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







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