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" am: 059ab284e7 am: 7c6a004452

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I1fa257f586e109a15aa1a26f9153ddcc6ba5b866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Himanshu Rawat
2022-07-26 03:18:47 +00:00
committed by Automerger Merge Worker
parent 7da6e7a960 7c6a004452
commit 99bbb571f3
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) {