Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9193014ee6

Change-Id: Ic41c34a5701658aa328a83267ad3c818d55bd522
This commit is contained in:
Gurpreet Ghai
2018-02-07 03:59:38 +00:00
committed by android-build-merger
parent 1801988051 9193014ee6
commit ad4e3c5d8b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java Executable file → Normal file
View File

@@ -194,8 +194,13 @@ public class LocalBluetoothAdapter {
return mState; return mState;
} }
synchronized void setBluetoothStateInt(int state) { void setBluetoothStateInt(int state) {
synchronized(this) {
if (mState == state) {
return;
}
mState = state; mState = state;
}
if (state == BluetoothAdapter.STATE_ON) { if (state == BluetoothAdapter.STATE_ON) {
// if mProfileManager hasn't been constructed yet, it will // if mProfileManager hasn't been constructed yet, it will