diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:58:16 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:58:16 +0000 |
commit | 355f446589dd625933c272176a388c7daa20fe85 (patch) | |
tree | e1a8764765d10936a2a733cb42eb03e2aaa9c910 | |
parent | 503315822d34a5000868e94f5fae061e96265ed7 (diff) | |
parent | b9f6fcd435291dff38a964fa65f4bce024a78228 (diff) | |
download | security-android11-mainline-conscrypt-release.tar.gz |
Snap for 7080740 from b9f6fcd435291dff38a964fa65f4bce024a78228 to mainline-conscrypt-releaseandroid-mainline-11.0.0_r31android-mainline-11.0.0_r20android11-mainline-conscrypt-release
Change-Id: I180bea2c6bbd96fc90df7f8dfb1455be69947d19
-rw-r--r-- | keystore/keystore_keymaster_enforcement.h | 3 |
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; }; |