Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new Credential prefix for platform VPNs" am: 0ce0c59535 am: 27d405ab14

Browse Source 
Change-Id: Ifa880c915ae1226d44fcf92e092147be0f677eb9
This commit is contained in:
Automerger Merge Worker
2019-12-17 18:43:56 +00:00
parent e69e206ba9 27d405ab14
commit 5a51aa7af8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keystore/java/android/security/Credentials.java
View File

@@ -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_";