Merge "SystemServer: factoryReset on main thread" into main (a678f9ef) · Commits · e / os / android_packages_modules_Bluetooth

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ class BluetoothManagerService {
		}
		}

		boolean onFactoryReset() {
		boolean onFactoryResetFromBinder() {
		// Wait for stable state if bluetooth is temporary state.
		int state = getState();
		if (state == STATE_BLE_TURNING_ON
		@@ -258,10 +258,13 @@ class BluetoothManagerService {
		return false;
		}
		}
		return postAndWait(() -> onFactoryReset());
		}

		boolean onFactoryReset() {
		// Clear registered LE apps to force shut-off Bluetooth
		clearBleApps();
		state = getState();
		int state = getState();
		mAdapterLock.readLock().lock();
		try {
		if (mAdapter == null) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -232,7 +232,7 @@ class BluetoothServiceBinder extends IBluetoothManager.Stub {
		return false;
		}

		return mBluetoothManagerService.onFactoryReset();
		return mBluetoothManagerService.onFactoryResetFromBinder();
		}

		@Override

+1 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ public class BluetoothServiceBinderTest {
		.adoptShellPermissionIdentity(BLUETOOTH_PRIVILEGED, BLUETOOTH_CONNECT);

		assertThat(mBinder.onFactoryReset(mSource)).isFalse();
		verify(mManagerService).onFactoryReset();
		verify(mManagerService).onFactoryResetFromBinder();
		verifyMock();
		}