diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-06 07:28:33 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-06 07:28:33 +0000 |
| commit | a8f61332dad9499c7a081b809e9edb422f7b9f10 (patch) | |
| tree | 0de56eca15f2efef6baba064b68d19e9ae4ce481 | |
| parent | 32d1abf3e1caffdc6251f96ae7f67c09115d9a68 (diff) | |
| parent | ecadb0d01d305f717e01d03391e3062fbaa2b42e (diff) | |
| download | android_system_bt-a8f61332dad9499c7a081b809e9edb422f7b9f10.tar.gz android_system_bt-a8f61332dad9499c7a081b809e9edb422f7b9f10.tar.bz2 android_system_bt-a8f61332dad9499c7a081b809e9edb422f7b9f10.zip | |
release-request-ce5644bf-c7ec-4125-96f7-5f9bba4fe5ad-for-git_oc-dr1-release-4249716 snap-temp-L41100000089724307
Change-Id: I27b4e42ef82c6a86dcf6830843888ff6998ca2e3
| -rw-r--r-- | btif/src/btif_config.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/btif/src/btif_config.cc b/btif/src/btif_config.cc index 3b3dc4f89..f6faa7de5 100644 --- a/btif/src/btif_config.cc +++ b/btif/src/btif_config.cc @@ -231,8 +231,10 @@ static future_t* clean_up(void) { btif_config_flush(); alarm_free(config_timer); - config_free(config); config_timer = NULL; + + std::unique_lock<std::mutex> lock(config_lock); + config_free(config); config = NULL; return future_new_immediate(FUTURE_SUCCESS); } |