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

Merge "Fix some nits while reading the code"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-04 00:45:55 +00:00
committed by Android (Google) Code Review
parent 9661f209d5 57e77f7c13
commit 478b6caa48
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/security/recoverablekeystore/RecoverableKeyStoreLoader.java
View File

@@ -426,7 +426,7 @@ public class RecoverableKeyStoreLoader {
* Imports keys.
*
* @param sessionId Id for recovery session, same as in
* {@link #startRecoverySession(String, byte[], byte[], byte[], List)} on}.
* {@link #startRecoverySession(String, byte[], byte[], byte[], List)}.
* @param recoveryKeyBlob Recovery blob encrypted by symmetric key generated for this session.
* @param applicationKeys Application keys. Key material can be decrypted using recoveryKeyBlob
* and session. KeyStore only uses package names from the application info in {@link

5
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -2026,8 +2026,9 @@ public class LockSettingsService extends ILockSettings.Stub {
}
@Override
public Map<String, byte[]> recoverKeys(@NonNull String sessionId, @NonNull byte[] recoveryKeyBlob,
@NonNull List<KeyEntryRecoveryData> applicationKeys, @UserIdInt int userId)
public Map<String, byte[]> recoverKeys(@NonNull String sessionId,
@NonNull byte[] recoveryKeyBlob, @NonNull List<KeyEntryRecoveryData> applicationKeys,
@UserIdInt int userId)
throws RemoteException {
return mRecoverableKeyStoreManager.recoverKeys(
sessionId, recoveryKeyBlob, applicationKeys, userId);

3
services/core/java/com/android/server/locksettings/recoverablekeystore/PlatformKeyManager.java
View File

@@ -88,7 +88,8 @@ public class PlatformKeyManager {
*
* @hide
*/
public static PlatformKeyManager getInstance(Context context, RecoverableKeyStoreDb database, int userId)
public static PlatformKeyManager getInstance(Context context, RecoverableKeyStoreDb database,
int userId)
throws KeyStoreException, NoSuchAlgorithmException, InsecureUserException {
context = context.getApplicationContext();
PlatformKeyManager keyManager = new PlatformKeyManager(

1
services/core/java/com/android/server/locksettings/recoverablekeystore/storage/RecoverableKeyStoreDb.java
View File

@@ -590,6 +590,7 @@ public class RecoverableKeyStoreDb {
*
* @hide
*/
@Nullable
public Long getServerParameters(int userId, int uid) {
SQLiteDatabase db = mKeyStoreDbHelper.getReadableDatabase();