Merge "Remove flag api_get_connection_state_using_identity_address" into main

2 files changed, 6 insertions, 16 deletions

diff --git a/android/app/src/com/android/bluetooth/btservice/AdapterService.java b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
index e9202c4f6c..182e75cceb 100644
--- a/android/app/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
@@ -3106,16 +3106,13 @@ public class AdapterService extends Service {
 
     public int getConnectionState(BluetoothDevice device) {
         final String address = device.getAddress();
-        if (Flags.apiGetConnectionStateUsingIdentityAddress()) {
-            int connectionState = mNativeInterface.getConnectionState(getBytesFromAddress(address));
-            final String identityAddress = getIdentityAddress(address);
-            if (identityAddress != null) {
-                connectionState |=
-                        mNativeInterface.getConnectionState(getBytesFromAddress(identityAddress));
-            }
-            return connectionState;
+        int connectionState = mNativeInterface.getConnectionState(getBytesFromAddress(address));
+        final String identityAddress = getIdentityAddress(address);
+        if (identityAddress != null) {
+            connectionState |=
+                    mNativeInterface.getConnectionState(getBytesFromAddress(identityAddress));
         }
-        return mNativeInterface.getConnectionState(getBytesFromAddress(address));
+        return connectionState;
     }
 
     int getConnectionHandle(BluetoothDevice device, int transport) {
diff --git a/flags/connectivity.aconfig b/flags/connectivity.aconfig
index 35af7382ec..c9b3c4c352 100644
--- a/flags/connectivity.aconfig
+++ b/flags/connectivity.aconfig
@@ -2,13 +2,6 @@ package: "com.android.bluetooth.flags"
 container: "com.android.bt"
 
 flag {
-    name: "api_get_connection_state_using_identity_address"
-    namespace: "bluetooth"
-    description: "Use identity address to check current connection state"
-    bug: "319471537"
-}
-
-flag {
     name: "use_le_shim_connection_map_guard"
     namespace: "bluetooth"
     description: "Guard the le shim connection map with a mutex"