Remove le_scan_use_address_type flag

Bug: 342127181
Test: m -j;
Change-Id: Ibccb5e15e23610ed3bf803cc5aaea2e5d47c98e0

3 files changed, 4 insertions, 22 deletions

diff --git a/android/app/src/com/android/bluetooth/le_scan/TransitionalScanHelper.java b/android/app/src/com/android/bluetooth/le_scan/TransitionalScanHelper.java
index c68bf2d249..102d0d0649 100644
--- a/android/app/src/com/android/bluetooth/le_scan/TransitionalScanHelper.java
+++ b/android/app/src/com/android/bluetooth/le_scan/TransitionalScanHelper.java
@@ -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 =
-                    BluetoothAdapter.getDefaultAdapter()
-                            .getRemoteLeDevice(
-                                    trackingInfo.getAddress(), trackingInfo.getAddressType());
-        } else {
-            device =
-                    BluetoothAdapter.getDefaultAdapter().getRemoteDevice(trackingInfo.getAddress());
-        }
+        BluetoothDevice device =
+                BluetoothAdapter.getDefaultAdapter()
+                        .getRemoteLeDevice(
+                                trackingInfo.getAddress(), trackingInfo.getAddressType());
         int advertiserState = trackingInfo.getAdvState();
         ScanResult result =
                 new ScanResult(
diff --git a/android/app/tests/unit/src/com/android/bluetooth/le_scan/TransitionalScanHelperTest.java b/android/app/tests/unit/src/com/android/bluetooth/le_scan/TransitionalScanHelperTest.java
index f032abae08..e3db44b86b 100644
--- a/android/app/tests/unit/src/com/android/bluetooth/le_scan/TransitionalScanHelperTest.java
+++ b/android/app/tests/unit/src/com/android/bluetooth/le_scan/TransitionalScanHelperTest.java
@@ -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;
diff --git a/flags/gap.aconfig b/flags/gap.aconfig
index 85df1c76d3..5c27581cee 100644
--- a/flags/gap.aconfig
+++ b/flags/gap.aconfig
@@ -104,16 +104,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"
     description: "Allocate GATT clients in heap to unlimit the number of clients"