diff options
| author | Robin Lee <rgl@google.com> | 2016-03-24 18:32:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-24 18:32:52 +0000 |
| commit | 363e70dd004e08d43f9908e913e48f2ae4fe1a28 (patch) | |
| tree | 0e4d5c15397d92aa9836df04ffd42a22f565a0f2 /core/java/android | |
| parent | 23c63dd65f304d554bc6cbf2f6016e6e9c8e4f4e (diff) | |
| parent | a249aee10b621a94c986f4823d840e33c2a7d480 (diff) | |
Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev
Diffstat (limited to 'core/java/android')
| -rwxr-xr-x | core/java/android/provider/Settings.java | 14 |
1 files changed, 14 insertions, 0 deletions
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 |