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

Merge "Call setGenerationId inside generateAndLoadKey to simplify the code just a little"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-04 10:02:27 +00:00
committed by Android (Google) Code Review
parent 328f0b849e 7013bec16d
commit 41bbed87e9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,6 @@ public class PlatformKeyManager {
public void regenerate() throws NoSuchAlgorithmException, KeyStoreException {
int nextId = getGenerationId() + 1;
generateAndLoadKey(nextId);
setGenerationId(nextId);
}
/**
@@ -219,7 +218,6 @@ public class PlatformKeyManager {
}
generateAndLoadKey(generationId);
mDatabase.setPlatformKeyGenerationId(mUserId, generationId);
}
/**
@@ -301,6 +299,8 @@ public class PlatformKeyManager {
.setBoundToSpecificSecureUserId(mUserId)
.build());
setGenerationId(generationId);
try {
secretKey.destroy();
} catch (DestroyFailedException e) {