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

Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571

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

Change-Id: Iaf6508517a2078145f639cd7694a3ffa0cd9e997
This commit is contained in:
John Wu
2022-03-23 17:02:17 +00:00
committed by Automerger Merge Worker
parent 9a06a0290e 2e64dda571
commit 289609bdb3
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
keystore/java/android/security/AndroidKeyStoreMaintenance.java
View File

@@ -20,7 +20,6 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
import android.security.keystore.KeyProperties;
import android.security.maintenance.IKeystoreMaintenance; import android.security.maintenance.IKeystoreMaintenance;
import android.system.keystore2.Domain; import android.system.keystore2.Domain;
import android.system.keystore2.KeyDescriptor; import android.system.keystore2.KeyDescriptor;
@@ -158,11 +157,6 @@ public class AndroidKeyStoreMaintenance {
* Migrates a key given by the source descriptor to the location designated by the destination * Migrates a key given by the source descriptor to the location designated by the destination
* descriptor. * descriptor.
* *
* If Domain::APP is selected in either source or destination, nspace must be set to
* {@link KeyProperties#NAMESPACE_APPLICATION}, implying the caller's UID.
* If the caller has the MIGRATE_ANY_KEY permission, Domain::APP may be used with
* other nspace values which then indicates the UID of a different application.
*
* @param source - The key to migrate may be specified by Domain.APP, Domain.SELINUX, or * @param source - The key to migrate may be specified by Domain.APP, Domain.SELINUX, or
* Domain.KEY_ID. The caller needs the permissions use, delete, and grant for the * Domain.KEY_ID. The caller needs the permissions use, delete, and grant for the
* source namespace. * source namespace.
@@ -189,20 +183,4 @@ public class AndroidKeyStoreMaintenance {
return SYSTEM_ERROR; return SYSTEM_ERROR;
} }
} }
/**
* @see IKeystoreMaintenance#listEntries(int, long)
*/
@Nullable
public static KeyDescriptor[] listEntries(int domain, long nspace) {
try {
return getService().listEntries(domain, nspace);
} catch (ServiceSpecificException e) {
Log.e(TAG, "listEntries failed", e);
return null;
} catch (Exception e) {
Log.e(TAG, "Can not connect to keystore", e);
return null;
}
}
} }