diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-17 18:43:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-17 18:43:56 +0000 |
| commit | 5a51aa7af8f137085e5614e61da4a45a7f48454d (patch) | |
| tree | f9d5fa26474f6aad98a66acc451828dc9bc6ba8b /keystore/java/android/security/Credentials.java | |
| parent | e69e206ba9b40b23dabc5ff93167ad209123565b (diff) | |
| parent | 27d405ab1462b3cb8d6cce1cf48bf9a945c00e6f (diff) | |
Merge "Add new Credential prefix for platform VPNs" am: 0ce0c59535 am: 27d405ab14
Change-Id: Ifa880c915ae1226d44fcf92e092147be0f677eb9
Diffstat (limited to 'keystore/java/android/security/Credentials.java')
| -rw-r--r-- | keystore/java/android/security/Credentials.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/keystore/java/android/security/Credentials.java b/keystore/java/android/security/Credentials.java index 08f417662523..fad7d8062a22 100644 --- a/keystore/java/android/security/Credentials.java +++ b/keystore/java/android/security/Credentials.java @@ -16,11 +16,12 @@ package android.security; +import android.annotation.UnsupportedAppUsage; + import com.android.org.bouncycastle.util.io.pem.PemObject; import com.android.org.bouncycastle.util.io.pem.PemReader; import com.android.org.bouncycastle.util.io.pem.PemWriter; -import android.annotation.UnsupportedAppUsage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -64,6 +65,9 @@ public class Credentials { /** 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_"; |