Merge cherrypicks of [13091166, 13091167, 13091317, 13090992, 13091168, 13091169, 13090993, 13090994, 13090949, 13090950, 13090951, 13090952, 13091170, 13091171, 13090953, 13091129, 13091130, 13091178, 13091179, 13091180, 13091181, 13091182, 13091183, 13091184, 13091185, 13091186, 13091187, 13090954, 13090995, 13091336, 13091172, 13091131, 13091132, 13091318, 13091319, 13091320, 13091188, 13091189, 13091173, 13091190, 13091174, 13091175, 13091191, 13091192, 13091193, 13091356, 13091357, 13091358, 13090782] into rvc-qpr1-c-releaseandroid-11.0.0_r30android11-qpr1-c-release

Change-Id: I99cdc59c55e7124f8901c325340bc244aae97b4f

1 files changed, 3 insertions, 0 deletions

diff --git a/keystore/keystore_keymaster_enforcement.h b/keystore/keystore_keymaster_enforcement.h
index e7515a1f..b0dae48e 100644
--- a/keystore/keystore_keymaster_enforcement.h
+++ b/keystore/keystore_keymaster_enforcement.h
@@ -86,16 +86,19 @@ class KeystoreKeymasterEnforcement : public KeymasterEnforcement {
     }
 
     bool is_device_locked(int32_t userId) const override {
+        std::lock_guard<std::mutex> lock(is_device_locked_for_user_map_lock_);
         // If we haven't had a set call for this user yet, assume the device is locked.
         if (mIsDeviceLockedForUser.count(userId) == 0) return true;
         return mIsDeviceLockedForUser.find(userId)->second;
     }
 
     void set_device_locked(bool isLocked, int32_t userId) {
+        std::lock_guard<std::mutex> lock(is_device_locked_for_user_map_lock_);
         mIsDeviceLockedForUser[userId] = isLocked;
     }
 
   private:
+    mutable std::mutex is_device_locked_for_user_map_lock_;
     std::map<int32_t, bool> mIsDeviceLockedForUser;
 };