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

Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references

Browse Source 
Bug: 171305684
Test: CtsKeystoreTestCases
Change-Id: I337515dadc9e45b909bff058d4e13371b4fa843c
This commit is contained in:
Janis Danisevskis
2021-03-05 10:23:09 -08:00
parent f11ccc456b
commit a6dcf091f5
57 changed files with 249 additions and 9825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,6 @@ public class AndroidKeyStoreMaintenance {
* @hide
*/
public static int onUserAdded(@NonNull int userId) {
if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0;
try {
getService().onUserAdded(userId);
return 0;
@@ -68,7 +67,6 @@ public class AndroidKeyStoreMaintenance {
* @hide
*/
public static int onUserRemoved(int userId) {
if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0;
try {
getService().onUserRemoved(userId);
return 0;
@@ -91,7 +89,6 @@ public class AndroidKeyStoreMaintenance {
* @hide
*/
public static int onUserPasswordChanged(int userId, @Nullable byte[] password) {
if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0;
try {
getService().onUserPasswordChanged(userId, password);
return 0;
@@ -109,7 +106,6 @@ public class AndroidKeyStoreMaintenance {
* be cleared.
*/
public static int clearNamespace(@Domain int domain, long namespace) {
if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return 0;
try {
getService().clearNamespace(domain, namespace);
return 0;
@@ -144,7 +140,6 @@ public class AndroidKeyStoreMaintenance {
* Informs Keystore 2.0 that an off body event was detected.
*/
public static void onDeviceOffBody() {
if (!android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) return;
try {
getService().onDeviceOffBody();
} catch (Exception e) {