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

Commit 5a51aa7a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add new Credential prefix for platform VPNs" am: 0ce0c595 am: 27d405ab 

Change-Id: Ifa880c915ae1226d44fcf92e092147be0f677eb9
parents e69e206b 27d405ab

keystore/java/android/security/Credentials.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -16,11 +16,12 @@ 




package android.security;

package android.security;





import android.annotation.UnsupportedAppUsage;



import com.android.org.bouncycastle.util.io.pem.PemObject;

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.PemReader;

import com.android.org.bouncycastle.util.io.pem.PemWriter;

import com.android.org.bouncycastle.util.io.pem.PemWriter;





import android.annotation.UnsupportedAppUsage;

import java.io.ByteArrayInputStream;

import java.io.ByteArrayInputStream;

import java.io.ByteArrayOutputStream;

import java.io.ByteArrayOutputStream;

import java.io.IOException;

import java.io.IOException;
@@ -64,6 +65,9 @@ public class Credentials { 
    /** Key prefix for VPN. */

    /** Key prefix for VPN. */

    public static final String VPN = "VPN_";

    public static final String VPN = "VPN_";





    /** Key prefix for platform VPNs. */

    public static final String PLATFORM_VPN = "PLATFORM_VPN_";



    /** Key prefix for WIFI. */

    /** Key prefix for WIFI. */

    public static final String WIFI = "WIFI_";

    public static final String WIFI = "WIFI_";