diff --git a/aconfig/settings_bluetooth_declarations.aconfig b/aconfig/settings_bluetooth_declarations.aconfig index 835a6378a6b..bdd317ee82a 100644 --- a/aconfig/settings_bluetooth_declarations.aconfig +++ b/aconfig/settings_bluetooth_declarations.aconfig @@ -25,16 +25,6 @@ flag { bug: "343317785" } -flag { - name: "disable_bonding_cancellation_for_orientation_change" - namespace: "cross_device_experiences" - description: "Stop cancelling bonding process when there is an orientation change" - bug: "349542301" - metadata { - purpose: PURPOSE_BUGFIX - } -} - flag { name: "enable_bluetooth_key_missing_dialog" namespace: "cross_device_experiences" diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java index e6b197c4d81..9d54b1de845 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java @@ -41,7 +41,6 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import com.android.settings.flags.Flags; /** * A dialogFragment used by {@link BluetoothPairingDialog} to create an appropriately styled dialog @@ -91,9 +90,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i /* Cancel pairing unless 1) explicitly accepted by user 2) the event is triggered by * orientation change. */ boolean shouldCancelPairing = - Flags.disableBondingCancellationForOrientationChange() - ? !mPositiveClicked && !getActivity().isChangingConfigurations() - : !mPositiveClicked; + !mPositiveClicked && !getActivity().isChangingConfigurations(); if (mPairingController.getDialogType() != BluetoothPairingController.DISPLAY_PASSKEY_DIALOG && shouldCancelPairing) { mPairingController.onCancel();