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

Merge "Only cancel bonding if pair button is not pressed"

Browse Source
This commit is contained in:
Jack He
2022-05-10 21:47:29 +00:00
committed by Gerrit Code Review
parent ab8bdb2bdb 419b7fa289
commit 33a080ad7a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
private BluetoothPairingController mPairingController; private BluetoothPairingController mPairingController;
private BluetoothPairingDialog mPairingDialogActivity; private BluetoothPairingDialog mPairingDialogActivity;
private EditText mPairingView; private EditText mPairingView;
private boolean mPositiveClicked = false;
/** /**
* The interface we expect a listener to implement. Typically this should be done by * The interface we expect a listener to implement. Typically this should be done by
* the controller. * the controller.
@@ -85,7 +86,9 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
mPairingController.onCancel(); if (!mPositiveClicked) {
mPairingController.onCancel();
}
} }
@Override @Override
@@ -110,6 +113,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) { if (which == DialogInterface.BUTTON_POSITIVE) {
mPositiveClicked = true;
mPairingController.onDialogPositiveClick(this); mPairingController.onDialogPositiveClick(this);
} else if (which == DialogInterface.BUTTON_NEGATIVE) { } else if (which == DialogInterface.BUTTON_NEGATIVE) {
mPairingController.onDialogNegativeClick(this); mPairingController.onDialogNegativeClick(this);