Merge "Avoid redundant unlock of newly created key"

2022-08-12 22:52:32 +00:00
parent 7bd8a386c6 361674de4e
commit 738af65712
1 changed files with 8 additions and 0 deletions
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -3047,6 +3047,10 @@ class StorageManagerService extends IStorageManager.Stub

        try {
            mVold.createUserKey(userId, serialNumber, ephemeral);
+            // New keys are always unlocked.
+            synchronized (mLock) {
+                mLocalUnlockedUsers.append(userId);
+            }
        } catch (Exception e) {
            Slog.wtf(TAG, e);
        }
@@ -3058,6 +3062,10 @@ class StorageManagerService extends IStorageManager.Stub

        try {
            mVold.destroyUserKey(userId);
+            // Destroying a key also locks it.
+            synchronized (mLock) {
+                mLocalUnlockedUsers.remove(userId);
+            }
        } catch (Exception e) {
            Slog.wtf(TAG, e);
        }