diff options
| author | Zhihai Xu <zhihaixu@google.com> | 2013-11-15 22:30:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-15 22:30:39 +0000 |
| commit | 025c8ec1e42ccac17c896809c4e6d2cb90b3c71a (patch) | |
| tree | 46cc7450f6cf65fc3dc0d6044da55636500197f8 | |
| parent | 3987efa998a9bfbf148f83b286bfc3aeae62d87c (diff) | |
| parent | 50f6cb42218fd50ed2532884d1212e1c9a74c7b2 (diff) | |
| download | android_packages_apps_Bluetooth-025c8ec1e42ccac17c896809c4e6d2cb90b3c71a.tar.gz android_packages_apps_Bluetooth-025c8ec1e42ccac17c896809c4e6d2cb90b3c71a.tar.bz2 android_packages_apps_Bluetooth-025c8ec1e42ccac17c896809c4e6d2cb90b3c71a.zip | |
Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
| -rwxr-xr-x | src/com/android/bluetooth/btservice/AdapterProperties.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterProperties.java b/src/com/android/bluetooth/btservice/AdapterProperties.java index b05becde1..af8e41632 100755 --- a/src/com/android/bluetooth/btservice/AdapterProperties.java +++ b/src/com/android/bluetooth/btservice/AdapterProperties.java @@ -203,10 +203,9 @@ class AdapterProperties { * @return the mState */ int getState() { - synchronized (mObject) { - if (VDBG) debugLog("State = " + mState); - return mState; - } + /* remove the lock to work around a platform deadlock problem */ + /* and also for read access, it is safe to remove the lock to save CPU power */ + return mState; } /** |