Merge "Fix ANR due to long wait for synchronization lock"

2018-02-07 01:26:09 +00:00
parent 1a535ba4b9 64ece0e582
commit 9193014ee6
1 changed files with 7 additions and 2 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java
@@ -194,8 +194,13 @@ public class LocalBluetoothAdapter {
        return mState;
    }

-    synchronized void setBluetoothStateInt(int state) {
-        mState = state;
+    void setBluetoothStateInt(int state) {
+        synchronized(this) {
+            if (mState == state) {
+                return;
+            }
+            mState = state;
+        }

        if (state == BluetoothAdapter.STATE_ON) {
            // if mProfileManager hasn't been constructed yet, it will