PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up disable_bonding_cancellation_for_orientation_change as it's enabled in prod

Browse Source 
Flag: EXEMPT flag cleanup
Test: N/A
Bug: 389008619

Change-Id: I9fa18e73429e93adc501dc89e0f5ade7d8a2be22
This commit is contained in:
yqian
2025-01-10 17:11:04 +08:00
committed by Yuanru Qian
parent e5e015199c
commit 6bcf4a3ddd
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aconfig/settings_bluetooth_declarations.aconfig
View File

@@ -25,16 +25,6 @@ flag {
bug: "343317785" 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 { flag {
name: "enable_bluetooth_key_missing_dialog" name: "enable_bluetooth_key_missing_dialog"
namespace: "cross_device_experiences" namespace: "cross_device_experiences"

5
src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
View File

@@ -41,7 +41,6 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment; 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 * 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 /* Cancel pairing unless 1) explicitly accepted by user 2) the event is triggered by
* orientation change. */ * orientation change. */
boolean shouldCancelPairing = boolean shouldCancelPairing =
Flags.disableBondingCancellationForOrientationChange() !mPositiveClicked && !getActivity().isChangingConfigurations();
? !mPositiveClicked && !getActivity().isChangingConfigurations()
: !mPositiveClicked;
if (mPairingController.getDialogType() != BluetoothPairingController.DISPLAY_PASSKEY_DIALOG if (mPairingController.getDialogType() != BluetoothPairingController.DISPLAY_PASSKEY_DIALOG
&& shouldCancelPairing) { && shouldCancelPairing) {
mPairingController.onCancel(); mPairingController.onCancel();