Revert "Delete VPN methods in ConnectivityManager."
This reverts commit e849277786bf9ec0514cbd53e8b7ed9ef5c6af5f.
Bug: 180710918
Reason for revert: Broken build
Change-Id: I6e6318b4c01ccab27ca3e9f16bb2194aa1d9ffd2
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 071ec34..d3414a4 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -1070,6 +1070,58 @@
}
/**
+ * Calls VpnManager#isAlwaysOnVpnPackageSupportedForUser.
+ * @deprecated TODO: remove when callers have migrated to VpnManager.
+ * @hide
+ */
+ @Deprecated
+ public boolean isAlwaysOnVpnPackageSupportedForUser(int userId, @Nullable String vpnPackage) {
+ return getVpnManager().isAlwaysOnVpnPackageSupportedForUser(userId, vpnPackage);
+ }
+
+ /**
+ * Calls VpnManager#setAlwaysOnVpnPackageForUser.
+ * @deprecated TODO: remove when callers have migrated to VpnManager.
+ * @hide
+ */
+ @Deprecated
+ public boolean setAlwaysOnVpnPackageForUser(int userId, @Nullable String vpnPackage,
+ boolean lockdownEnabled, @Nullable List<String> lockdownAllowlist) {
+ return getVpnManager().setAlwaysOnVpnPackageForUser(userId, vpnPackage, lockdownEnabled,
+ lockdownAllowlist);
+ }
+
+ /**
+ * Calls VpnManager#getAlwaysOnVpnPackageForUser.
+ * @deprecated TODO: remove when callers have migrated to VpnManager.
+ * @hide
+ */
+ @Deprecated
+ public String getAlwaysOnVpnPackageForUser(int userId) {
+ return getVpnManager().getAlwaysOnVpnPackageForUser(userId);
+ }
+
+ /**
+ * Calls VpnManager#isVpnLockdownEnabled.
+ * @deprecated TODO: remove when callers have migrated to VpnManager.
+ * @hide
+ */
+ @Deprecated
+ public boolean isVpnLockdownEnabled(int userId) {
+ return getVpnManager().isVpnLockdownEnabled(userId);
+ }
+
+ /**
+ * Calls VpnManager#getVpnLockdownAllowlist.
+ * @deprecated TODO: remove when callers have migrated to VpnManager.
+ * @hide
+ */
+ @Deprecated
+ public List<String> getVpnLockdownAllowlist(int userId) {
+ return getVpnManager().getVpnLockdownAllowlist(userId);
+ }
+
+ /**
* Adds or removes a requirement for given UID ranges to use the VPN.
*
* If set to {@code true}, informs the system that the UIDs in the specified ranges must not
@@ -3115,6 +3167,16 @@
}
/**
+ * Calls VpnManager#updateLockdownVpn.
+ * @deprecated TODO: remove when callers have migrated to VpnManager.
+ * @hide
+ */
+ @Deprecated
+ public boolean updateLockdownVpn() {
+ return getVpnManager().updateLockdownVpn();
+ }
+
+ /**
* Set sign in error notification to visible or invisible
*
* @hide
@@ -4475,6 +4537,8 @@
try {
mService.factoryReset();
mTetheringManager.stopAllTethering();
+ // TODO: Migrate callers to VpnManager#factoryReset.
+ getVpnManager().factoryReset();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -4768,6 +4832,15 @@
return new TestNetworkManager(ITestNetworkManager.Stub.asInterface(tnBinder));
}
+ /**
+ * Temporary hack to shim calls from ConnectivityManager to VpnManager. We cannot store a
+ * private final mVpnManager because ConnectivityManager is initialized before VpnManager.
+ * @hide TODO: remove.
+ */
+ public VpnManager getVpnManager() {
+ return mContext.getSystemService(VpnManager.class);
+ }
+
/** @hide */
public ConnectivityDiagnosticsManager createDiagnosticsManager() {
return new ConnectivityDiagnosticsManager(mContext, mService);