Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6703cc5 authored by Gurpreet Ghai's avatar Gurpreet Ghai Committed by android-build-merger
Browse files

Merge "Fix ANR due to long wait for synchronization lock" am: 9193014e am: ad4e3c5d 

am: a36539cf

Change-Id: I4818ea8641ab937dbefb4a39810c97c3bbf5c262
parents dd98087d a36539cf

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java

100755 → 100644
+7 −2
Original line number Diff line number Diff line
@@ -194,8 +194,13 @@ public class LocalBluetoothAdapter { 
        return mState;

    }



    synchronized void setBluetoothStateInt(int 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