Merge "Remove le_scan_fix_remote_exception flag" into main (b0b94d35) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/le_scan/TransitionalScanHelper.java

+3 −21

Original line number	Diff line number	Diff line
		@@ -463,12 +463,7 @@ public class TransitionalScanHelper {
		}
		} catch (RemoteException \| PendingIntent.CanceledException e) {
		Log.e(TAG, "Exception: " + e);
		if (Flags.leScanFixRemoteException()) {
		handleDeadScanClient(client);
		} else {
		mScannerMap.remove(client.scannerId);
		mScanManager.stopScan(client.scannerId);
		}
		}
		}
		}
		@@ -772,12 +767,7 @@ public class TransitionalScanHelper {
		}
		} catch (RemoteException \| PendingIntent.CanceledException e) {
		Log.e(TAG, "Exception: " + e);
		if (Flags.leScanFixRemoteException()) {
		handleDeadScanClient(client);
		} else {
		mScannerMap.remove(client.scannerId);
		mScanManager.stopScan(client.scannerId);
		}
		}
		}

		@@ -1518,15 +1508,7 @@ public class TransitionalScanHelper {

		ScanClient client = getScanClient(mScannerId);
		if (client != null) {
		if (Flags.leScanFixRemoteException()) {
		handleDeadScanClient(client);
		} else {
		client.appDied = true;
		if (client.stats != null) {
		client.stats.isAppDead = true;
		}
		stopScanInternal(client.scannerId);
		}
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -291,7 +291,6 @@ public class TransitionalScanHelperTest {

		@Test
		public void onScanResult_remoteException_clientDied() throws Exception {
		mSetFlagsRule.enableFlags(Flags.FLAG_LE_SCAN_FIX_REMOTE_EXCEPTION);
		int scannerId = 1;

		int eventType = 0;

+0 −7

Original line number	Diff line number	Diff line
		@@ -29,13 +29,6 @@ flag {
		bug: "317128464"
		}

		flag {
		name: "le_scan_fix_remote_exception"
		namespace: "bluetooth"
		description: "Fix handling remote exception for LE scanners"
		bug: "320402249"
		}

		flag {
		name: "gatt_fix_device_busy"
		namespace: "bluetooth"