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
This commit is contained in:
Treehugger Robot
2018-02-07 01:26:09 +00:00
committed by Gerrit Code Review
parent 1a535ba4b9 64ece0e582
commit 9193014ee6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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) {
mState = state; synchronized(this) {
if (mState == state) {
return;
}
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