fixup! Connectivity: Add capability to allow tethering to use VPN upstreams [2/3]
Change-Id: I55ccb291278510e1b7f37cd9c1a1c2825dd24408
diff --git a/Tethering/src/com/android/networkstack/tethering/Tethering.java b/Tethering/src/com/android/networkstack/tethering/Tethering.java
index 586b292..c89f96f 100644
--- a/Tethering/src/com/android/networkstack/tethering/Tethering.java
+++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java
@@ -461,7 +461,7 @@
}
};
mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.TETHERING_ALLOW_VPN_UPSTREAMS), false, vpnSettingObserver);
+ "tethering_allow_vpn_upstreams"), false, vpnSettingObserver);
}
private class TetheringThreadExecutor implements Executor {
diff --git a/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java b/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java
index 1565c76..5931400 100644
--- a/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java
+++ b/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java
@@ -329,7 +329,7 @@
// Use VPN upstreams if hotspot settings allow.
if (mVpnInternetNetwork != null &&
Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.TETHERING_ALLOW_VPN_UPSTREAMS, 0) == 1) {
+ "tethering_allow_vpn_upstreams", 0) == 1) {
return mNetworkMap.get(mVpnInternetNetwork);
}
final UpstreamNetworkState dfltState = (mDefaultInternetNetwork != null)