From 7013bec16df1c320e004206c913d7ed5c45afe36 Mon Sep 17 00:00:00 2001
From: Bo Zhu <bozhu@google.com>
Date: Wed, 3 Jan 2018 23:51:27 -0800
Subject: [PATCH] Call setGenerationId inside generateAndLoadKey to simplify
 the code just a little

Change-Id: Ie4cc656def75449f0129db09496f4717e2473d70
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
---
 .../locksettings/recoverablekeystore/PlatformKeyManager.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/locksettings/recoverablekeystore/PlatformKeyManager.java b/services/core/java/com/android/server/locksettings/recoverablekeystore/PlatformKeyManager.java
index ef4dbf57430fe..a8b8361b4f03d 100644
--- a/services/core/java/com/android/server/locksettings/recoverablekeystore/PlatformKeyManager.java
+++ b/services/core/java/com/android/server/locksettings/recoverablekeystore/PlatformKeyManager.java
@@ -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) {