Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
diff --git a/src/com/android/bluetooth/btservice/AdapterProperties.java b/src/com/android/bluetooth/btservice/AdapterProperties.java
index b05becd..af8e416 100755
--- a/src/com/android/bluetooth/btservice/AdapterProperties.java
+++ b/src/com/android/bluetooth/btservice/AdapterProperties.java
@@ -203,10 +203,9 @@
* @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;
}
/**