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

Commit a45ae7bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" am:... 

Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" am: 721f75ec am: 2172f587 am: 49e95446 am: 2bfebf3c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15d7eecb996d97b41fe706f7e1260ba154164d85
parents 806e6ba3 2bfebf3c

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ java_library { 
        "android.hardware.vibrator-V2-java",

        "android.security.apc-java",

        "android.security.authorization-java",

        "android.security.usermanager-java",

        "android.security.maintenance-java",

        "android.security.vpnprofilestore-java",

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

        "android.system.suspend.control.internal-java",

keystore/java/android/security/AndroidKeyStoreMaintenance.java

+4 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.os.ServiceManager;

import android.os.ServiceSpecificException;

import android.security.usermanager.IKeystoreUserManager;

import android.security.maintenance.IKeystoreMaintenance;

import android.system.keystore2.Domain;

import android.system.keystore2.ResponseCode;

import android.util.Log;
@@ -34,9 +34,9 @@ public class AndroidKeyStoreMaintenance { 


    public static final int SYSTEM_ERROR = ResponseCode.SYSTEM_ERROR;



    private static IKeystoreUserManager getService() {

        return IKeystoreUserManager.Stub.asInterface(

                ServiceManager.checkService("android.security.usermanager"));

    private static IKeystoreMaintenance getService() {

        return IKeystoreMaintenance.Stub.asInterface(

                ServiceManager.checkService("android.security.maintenance"));

    }



    /**