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

Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev

Browse Source
This commit is contained in:
Himanshu Rawat
2022-08-02 01:41:58 +00:00
committed by Android (Google) Code Review
parent 4a547374df c2b402bd50
commit 221c09d8df
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,10 +86,14 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
if (mPairingController.getDialogType()
!= BluetoothPairingController.DISPLAY_PASSKEY_DIALOG) {
/* Cancel pairing unless explicitly accepted by user */
if (!mPositiveClicked) { if (!mPositiveClicked) {
mPairingController.onCancel(); mPairingController.onCancel();
} }
} }
}
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { public void beforeTextChanged(CharSequence s, int start, int count, int after) {