Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d405ab authored by Benedict Wong's avatar Benedict Wong Committed by android-build-merger
Browse files

Merge "Add new Credential prefix for platform VPNs" 

am: 0ce0c595

Change-Id: Icfe76e3ca3ba2f8245966f7eebe100fd9b77dcc8
parents 684df48a 0ce0c595

keystore/java/android/security/Credentials.java

+5 −1
Original line number Diff line number Diff line
@@ -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_";