diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 14 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSFooter.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/net/LockdownVpnTracker.java | 5 |
6 files changed, 20 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index cd1d6df9f132..71179fe1f2d2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32389,6 +32389,7 @@ package android.provider { field public static final java.lang.String ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE = "android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE"; field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE"; field public static final java.lang.String ACTION_VOICE_INPUT_SETTINGS = "android.settings.VOICE_INPUT_SETTINGS"; + field public static final java.lang.String ACTION_VPN_SETTINGS = "android.settings.VPN_SETTINGS"; field public static final java.lang.String ACTION_VR_LISTENER_SETTINGS = "android.settings.VR_LISTENER_SETTINGS"; field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS"; field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS"; diff --git a/api/system-current.txt b/api/system-current.txt index 822a054b4aac..9477354616ca 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -34836,6 +34836,7 @@ package android.provider { field public static final java.lang.String ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE = "android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE"; field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE"; field public static final java.lang.String ACTION_VOICE_INPUT_SETTINGS = "android.settings.VOICE_INPUT_SETTINGS"; + field public static final java.lang.String ACTION_VPN_SETTINGS = "android.settings.VPN_SETTINGS"; field public static final java.lang.String ACTION_VR_LISTENER_SETTINGS = "android.settings.VR_LISTENER_SETTINGS"; field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS"; field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS"; diff --git a/api/test-current.txt b/api/test-current.txt index ffbd5a508b07..108fee710ae8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -32458,6 +32458,7 @@ package android.provider { field public static final java.lang.String ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE = "android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE"; field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE"; field public static final java.lang.String ACTION_VOICE_INPUT_SETTINGS = "android.settings.VOICE_INPUT_SETTINGS"; + field public static final java.lang.String ACTION_VPN_SETTINGS = "android.settings.VPN_SETTINGS"; field public static final java.lang.String ACTION_VR_LISTENER_SETTINGS = "android.settings.VR_LISTENER_SETTINGS"; field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS"; field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b2e479a174ca..f7e0e033f0f2 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -322,6 +322,20 @@ public final class Settings { "android.settings.PRIVACY_SETTINGS"; /** + * Activity Action: Show settings to allow configuration of VPN. + * <p> + * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_VPN_SETTINGS = + "android.settings.VPN_SETTINGS"; + + /** * Activity Action: Show settings to allow configuration of Wi-Fi. * <p> * In some cases, a matching Activity may not exist, so ensure you diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java index 6d8b47665531..51efbf06739f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java @@ -36,12 +36,12 @@ import com.android.systemui.statusbar.phone.QSTileHost; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.statusbar.policy.SecurityController; +import static android.provider.Settings.ACTION_VPN_SETTINGS; + public class QSFooter implements OnClickListener, DialogInterface.OnClickListener { protected static final String TAG = "QSFooter"; protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - private static final String ACTION_VPN_SETTINGS = "android.net.vpn.SETTINGS"; - private final View mRootView; private final TextView mFooterText; private final ImageView mFooterIcon; diff --git a/services/core/java/com/android/server/net/LockdownVpnTracker.java b/services/core/java/com/android/server/net/LockdownVpnTracker.java index 5b1cedca3ee2..fc412e3dc9fa 100644 --- a/services/core/java/com/android/server/net/LockdownVpnTracker.java +++ b/services/core/java/com/android/server/net/LockdownVpnTracker.java @@ -20,6 +20,7 @@ import static android.Manifest.permission.CONNECTIVITY_INTERNAL; import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_NONE; import static android.net.NetworkPolicyManager.FIREWALL_RULE_ALLOW; import static android.net.NetworkPolicyManager.FIREWALL_RULE_DEFAULT; +import static android.provider.Settings.ACTION_VPN_SETTINGS; import android.app.Notification; import android.app.NotificationManager; @@ -66,9 +67,6 @@ public class LockdownVpnTracker { private static final String ACTION_LOCKDOWN_RESET = "com.android.server.action.LOCKDOWN_RESET"; - private static final String ACTION_VPN_SETTINGS = "android.net.vpn.SETTINGS"; - private static final String EXTRA_PICK_LOCKDOWN = "android.net.vpn.PICK_LOCKDOWN"; - private static final int ROOT_UID = 0; private final Context mContext; @@ -101,7 +99,6 @@ public class LockdownVpnTracker { mProfile = Preconditions.checkNotNull(profile); final Intent configIntent = new Intent(ACTION_VPN_SETTINGS); - configIntent.putExtra(EXTRA_PICK_LOCKDOWN, true); mConfigIntent = PendingIntent.getActivity(mContext, 0, configIntent, 0); final Intent resetIntent = new Intent(ACTION_LOCKDOWN_RESET); |