diff options
author | Hasini Gunasinghe <hasinitg@google.com> | 2020-10-14 14:49:58 +0000 |
---|---|---|
committer | Anis Assi <anisassi@google.com> | 2020-11-12 11:46:44 -0800 |
commit | 7e8756873c74a9c738f9cfd01467d2d08c685b58 (patch) | |
tree | c040fb51b6b7c1073ca0fcd4723d96de05824013 | |
parent | 4ea871ac86ea4c1f0309672e73527a54b36d4f67 (diff) | |
download | security-7e8756873c74a9c738f9cfd01467d2d08c685b58.tar.gz |
Make mIsDeviceLockedForUser synchronized.android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android10-security-release
Bug: 169933423
Test: TBD/Treehugger passes
Change-Id: I8e1f57dd5ab8314801bdd62058c9ed5f761b7c55
(cherry picked from commit 8696c2ca1be068551a01008d0df642f5ccd86354)
-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; }; |