diff options
| -rw-r--r-- | android/app/src/com/android/bluetooth/pan/PanService.java | 18 | ||||
| -rw-r--r-- | flags/gap.aconfig | 10 |
2 files changed, 4 insertions, 24 deletions
diff --git a/android/app/src/com/android/bluetooth/pan/PanService.java b/android/app/src/com/android/bluetooth/pan/PanService.java index 5c2dfdf2a7..9196288928 100644 --- a/android/app/src/com/android/bluetooth/pan/PanService.java +++ b/android/app/src/com/android/bluetooth/pan/PanService.java @@ -50,7 +50,6 @@ import com.android.bluetooth.Utils; import com.android.bluetooth.btservice.AdapterService; import com.android.bluetooth.btservice.ProfileService; import com.android.bluetooth.btservice.storage.DatabaseManager; -import com.android.bluetooth.flags.Flags; import com.android.internal.annotations.VisibleForTesting; import com.android.modules.utils.HandlerExecutor; @@ -99,9 +98,7 @@ public class PanService extends ProfileService { Log.e(TAG, "Error setting up tether interface: " + error); for (BluetoothDevice device : mPanDevices.keySet()) { mNativeInterface.disconnect( - Flags.panUseIdentityAddress() - ? Utils.getByteBrEdrAddress(mAdapterService, device) - : Utils.getByteAddress(device)); + Utils.getByteBrEdrAddress(mAdapterService, device)); } mPanDevices.clear(); mIsTethering = false; @@ -212,9 +209,7 @@ public class PanService extends ProfileService { case MESSAGE_CONNECT: BluetoothDevice connectDevice = (BluetoothDevice) msg.obj; if (!mNativeInterface.connect( - Flags.identityAddressNullIfNotKnown() - ? Utils.getByteBrEdrAddress(mAdapterService, connectDevice) - : mAdapterService.getByteIdentityAddress(connectDevice))) { + Utils.getByteBrEdrAddress(mAdapterService, connectDevice))) { handlePanDeviceStateChange( connectDevice, null, @@ -232,9 +227,7 @@ public class PanService extends ProfileService { case MESSAGE_DISCONNECT: BluetoothDevice disconnectDevice = (BluetoothDevice) msg.obj; if (!mNativeInterface.disconnect( - Flags.identityAddressNullIfNotKnown() - ? Utils.getByteBrEdrAddress(mAdapterService, disconnectDevice) - : mAdapterService.getByteIdentityAddress(disconnectDevice))) { + Utils.getByteBrEdrAddress(mAdapterService, disconnectDevice))) { handlePanDeviceStateChange( disconnectDevice, mPanIfName, @@ -504,10 +497,7 @@ public class PanService extends ProfileService { "handlePanDeviceStateChange BT tethering is off/Local role" + " is PANU drop the connection"); mPanDevices.remove(device); - mNativeInterface.disconnect( - Flags.panUseIdentityAddress() - ? Utils.getByteBrEdrAddress(mAdapterService, device) - : Utils.getByteAddress(device)); + mNativeInterface.disconnect(Utils.getByteBrEdrAddress(mAdapterService, device)); return; } Log.d(TAG, "handlePanDeviceStateChange LOCAL_NAP_ROLE:REMOTE_PANU_ROLE"); diff --git a/flags/gap.aconfig b/flags/gap.aconfig index 2b833af69a..3dd968b7ef 100644 --- a/flags/gap.aconfig +++ b/flags/gap.aconfig @@ -57,16 +57,6 @@ flag { } flag { - name: "pan_use_identity_address" - namespace: "bluetooth" - description: "Use identity address when communicate with native interface" - bug: "351961492" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "android_os_identifier" namespace: "bluetooth" description: "Add a custom service to provide Android OS identifier" |