Merge "Remove le_scan_use_address_type flag" into main (4238e28f) · Commits · e / os / android_packages_modules_Bluetooth

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

+4 −11

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ import com.android.bluetooth.R;
		import com.android.bluetooth.Utils;
		import com.android.bluetooth.btservice.AdapterService;
		import com.android.bluetooth.btservice.BluetoothAdapterProxy;
		import com.android.bluetooth.flags.Flags;
		import com.android.bluetooth.gatt.GattServiceConfig;
		import com.android.bluetooth.util.NumberUtils;
		import com.android.internal.annotations.VisibleForTesting;
		@@ -962,16 +961,10 @@ public class TransitionalScanHelper {
		return;
		}

		BluetoothDevice device;
		if (Flags.leScanUseAddressType()) {
		device =
		BluetoothDevice device =
		BluetoothAdapter.getDefaultAdapter()
		.getRemoteLeDevice(
		trackingInfo.getAddress(), trackingInfo.getAddressType());
		} else {
		device =
		BluetoothAdapter.getDefaultAdapter().getRemoteDevice(trackingInfo.getAddress());
		}
		int advertiserState = trackingInfo.getAdvState();
		ScanResult result =
		new ScanResult(

+0 −1

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

		@Test
		@EnableFlags(Flags.FLAG_LE_SCAN_USE_ADDRESS_TYPE)
		public void onTrackAdvFoundLost() throws Exception {
		int scannerId = 1;
		int advPktLen = 1;

+0 −10

Original line number	Diff line number	Diff line
		@@ -103,16 +103,6 @@ flag {
		}
		}

		flag {
		name: "le_scan_use_address_type"
		namespace: "bluetooth"
		description: "Fix an issue that le scanner omits address type for MATCH_FIRST scan"
		bug: "342127181"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "gatt_client_dynamic_allocation"
		namespace: "bluetooth"