| commit | 8ccd0f50d477997eb7448dbce2c9be17fb5d51b3 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 17 18:52:38 2019 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 17 18:52:38 2019 +0000 |
| tree | 5c8d4a29cef21f0a4b9ff6dd3c8986b731d37024 | |
| parent | cdc8d5ee3e993754d3f065743bee8f72efc994d7 [diff] | |
| parent | 5a51aa7af8f137085e5614e61da4a45a7f48454d [diff] |
Merge "Add new Credential prefix for platform VPNs" am: 0ce0c59535 am: 27d405ab14 am: 5a51aa7af8 Change-Id: I9d83aeb57d05baea53d1afb086ae582d18701265
diff --git a/keystore/java/android/security/Credentials.java b/keystore/java/android/security/Credentials.java index 572fa8c..048dee6 100644 --- a/keystore/java/android/security/Credentials.java +++ b/keystore/java/android/security/Credentials.java
@@ -65,6 +65,9 @@ /** Key prefix for VPN. */ public static final String VPN = "VPN_"; + /** Key prefix for platform VPNs. */ + public static final String PLATFORM_VPN = "PLATFORM_VPN_"; + /** Key prefix for WIFI. */ public static final String WIFI = "WIFI_";