Stop using ConnectivityManager for VPNs.

These methods have all moved to VpnManager.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
This commit is contained in:
Lorenzo Colitti
2021-02-18 01:11:49 +09:00
parent 478db86589
commit 5c9a042370
9 changed files with 37 additions and 44 deletions

View File

@@ -20,6 +20,7 @@ import android.app.AppGlobals;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.VpnManager;
import android.os.UserManager;
import androidx.annotation.Keep;
@@ -172,7 +173,8 @@ public class FeatureFactoryImpl extends FeatureFactory {
Context.DEVICE_POLICY_SERVICE),
appContext.getPackageManager(),
UserManager.get(appContext),
(ConnectivityManager) appContext.getSystemService(Context.CONNECTIVITY_SERVICE),
appContext.getSystemService(ConnectivityManager.class),
appContext.getSystemService(VpnManager.class),
appContext.getResources());
}
return mEnterprisePrivacyFeatureProvider;