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

Commit 6ebb4df6 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: Icfe611bc66e6dc2ce94f4a6eeee292158e98f15e
parents c9f99730 3f0c227d

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -103,9 +103,9 @@ filegroup { 
        ":android.hardware.security.secureclock-V1-java-source",

        ":android.security.apc-java-source",

        ":android.security.authorization-java-source",

        ":android.security.legacykeystore-java-source",

        ":android.security.maintenance-java-source",

        ":android.security.metrics-java-source",

        ":android.security.vpnprofilestore-java-source",

        ":android.system.keystore2-V1-java-source",

        ":credstore_aidl",

        ":dumpstate_aidl",

keystore/java/android/security/LegacyVpnProfileStore.java

+11 −11
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.security; 
import android.annotation.NonNull;

import android.os.ServiceManager;

import android.os.ServiceSpecificException;

import android.security.vpnprofilestore.IVpnProfileStore;

import android.security.legacykeystore.ILegacyKeystore;

import android.util.Log;



/**
@@ -32,14 +32,14 @@ import android.util.Log; 
public class LegacyVpnProfileStore {

    private static final String TAG = "LegacyVpnProfileStore";



    public static final int SYSTEM_ERROR = IVpnProfileStore.ERROR_SYSTEM_ERROR;

    public static final int PROFILE_NOT_FOUND = IVpnProfileStore.ERROR_PROFILE_NOT_FOUND;

    public static final int SYSTEM_ERROR = ILegacyKeystore.ERROR_SYSTEM_ERROR;

    public static final int PROFILE_NOT_FOUND = ILegacyKeystore.ERROR_ENTRY_NOT_FOUND;



    private static final String VPN_PROFILE_STORE_SERVICE_NAME = "android.security.vpnprofilestore";

    private static final String LEGACY_KEYSTORE_SERVICE_NAME = "android.security.legacykeystore";



    private static IVpnProfileStore getService() {

        return IVpnProfileStore.Stub.asInterface(

                    ServiceManager.checkService(VPN_PROFILE_STORE_SERVICE_NAME));

    private static ILegacyKeystore getService() {

        return ILegacyKeystore.Stub.asInterface(

                    ServiceManager.checkService(LEGACY_KEYSTORE_SERVICE_NAME));

    }



    /**
@@ -52,7 +52,7 @@ public class LegacyVpnProfileStore { 
     */

    public static boolean put(@NonNull String alias, @NonNull byte[] profile) {

        try {

            getService().put(alias, profile);

            getService().put(alias, ILegacyKeystore.UID_SELF, profile);

            return true;

        } catch (Exception e) {

            Log.e(TAG, "Failed to put vpn profile.", e);
@@ -71,7 +71,7 @@ public class LegacyVpnProfileStore { 
     */

    public static byte[] get(@NonNull String alias) {

        try {

            return getService().get(alias);

            return getService().get(alias, ILegacyKeystore.UID_SELF);

        } catch (ServiceSpecificException e) {

            if (e.errorCode != PROFILE_NOT_FOUND) {

                Log.e(TAG, "Failed to get vpn profile.", e);
@@ -90,7 +90,7 @@ public class LegacyVpnProfileStore { 
     */

    public static boolean remove(@NonNull String alias) {

        try {

            getService().remove(alias);

            getService().remove(alias, ILegacyKeystore.UID_SELF);

            return true;

        } catch (ServiceSpecificException e) {

            if (e.errorCode != PROFILE_NOT_FOUND) {
@@ -110,7 +110,7 @@ public class LegacyVpnProfileStore { 
     */

    public static @NonNull String[] list(@NonNull String prefix) {

        try {

            final String[] aliases = getService().list(prefix);

            final String[] aliases = getService().list(prefix, ILegacyKeystore.UID_SELF);

            for (int i = 0; i < aliases.length; ++i) {

                aliases[i] = aliases[i].substring(prefix.length());

            }