diff options
| author | Benedict Wong <benedictwong@google.com> | 2019-12-17 10:40:02 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-17 10:40:02 -0800 |
| commit | 27d405ab1462b3cb8d6cce1cf48bf9a945c00e6f (patch) | |
| tree | 9227c5a4500e476e86163653d8ded7e6857fa205 /keystore/java/android/security/Credentials.java | |
| parent | 684df48afc88ea6c53e664fb80e15efd1f32ef30 (diff) | |
| parent | 0ce0c59535864ca1f35eb09fb2f9a056ab5e6eba (diff) | |
Merge "Add new Credential prefix for platform VPNs"
am: 0ce0c59535
Change-Id: Icfe76e3ca3ba2f8245966f7eebe100fd9b77dcc8
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_"; |