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

Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev

Browse Source 
am: a5b29ffffe

Change-Id: Ida09ae3747db332fcaa4ccb8a2bb774c96ce0caf
This commit is contained in:
Dmitry Dementyev
2018-03-26 02:43:28 +00:00
committed by android-build-merger
parent 47ae32d079 a5b29ffffe
commit 55d2139ec6
4 changed files with 18 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/security/keystore/RecoveryController.java
View File

@@ -195,17 +195,7 @@ public class RecoveryController {
*/
public @NonNull Map<byte[], Integer> getRecoverySnapshotVersions()
throws InternalRecoveryServiceException {
try {
// IPC doesn't support generic Maps.
@SuppressWarnings("unchecked")
Map<byte[], Integer> result =
(Map<byte[], Integer>) mBinder.getRecoverySnapshotVersions();
return result;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
} catch (ServiceSpecificException e) {
throw wrapUnexpectedServiceSpecificException(e);
}
throw new UnsupportedOperationException();
}
/**
@@ -337,13 +327,7 @@ public class RecoveryController {
@NonNull
public @KeychainProtectionParams.UserSecretType int[] getPendingRecoverySecretTypes()
throws InternalRecoveryServiceException {
try {
return mBinder.getPendingRecoverySecretTypes();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
} catch (ServiceSpecificException e) {
throw wrapUnexpectedServiceSpecificException(e);
}
throw new UnsupportedOperationException();
}
/**