Commit 64ece0e5 authored Aug 10, 2016 by Gurpreet Ghai Committed by Andre Eisenbach Jan 30, 2018

Fix ANR due to long wait for synchronization lock

Use Case: Repeated BT ON/OFF

Failure: ANR occurs due to UI wait for long time waiting
to acquire thread lock.

Steps: Repeated BT ON/OFF

Root Cause: The synchronized function that updates state
also read paired devices as an additional operation. When
the number of devices is cached list is large, the block
time for other threads waiting for same lock tends to
increase causing ANR.

Fix: Limited the synchronized block to the part where
actual update of local state takes place.

Test: SNS Testing

Bug: 35412140

Change-Id: I69ff9f8a032b3772bf3d048d8db70181319ad31d

parent 04e5e633

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

100755 → 100644

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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