diff options
Diffstat (limited to 'src/com/android/settings/vpn2')
-rw-r--r-- | src/com/android/settings/vpn2/ConnectivityManagerWrapper.java | 9 | ||||
-rw-r--r-- | src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java b/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java index 938db506a8..9424278c9e 100644 --- a/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java +++ b/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java @@ -16,6 +16,8 @@ package com.android.settings.vpn2; +import android.net.ProxyInfo; + /** * This interface replicates a subset of the android.net.ConnectivityManager (CM). The interface * exists so that we can use a thin wrapper around the CM in production code and a mock in tests. @@ -30,4 +32,11 @@ public interface ConnectivityManagerWrapper { * @see android.net.ConnectivityManager#getAlwaysOnVpnPackageForUser */ String getAlwaysOnVpnPackageForUser(int userId); + + /** + * Calls {@code ConnectivityManager.getGlobalProxy()}. + * + * @see android.net.ConnectivityManager#getGlobalProxy + */ + ProxyInfo getGlobalProxy(); } diff --git a/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java b/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java index ad1b4ebffd..d3c17f210e 100644 --- a/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java +++ b/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java @@ -17,6 +17,7 @@ package com.android.settings.vpn2; import android.net.ConnectivityManager; +import android.net.ProxyInfo; public class ConnectivityManagerWrapperImpl implements ConnectivityManagerWrapper { @@ -30,4 +31,9 @@ public class ConnectivityManagerWrapperImpl implements ConnectivityManagerWrappe public String getAlwaysOnVpnPackageForUser(int userId) { return mCm.getAlwaysOnVpnPackageForUser(userId); } + + @Override + public ProxyInfo getGlobalProxy() { + return mCm.getGlobalProxy(); + } } |