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

Merge changes Idadf8487,I84d87024 am: e489d46b7c

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

Change-Id: I4ee8583862f590206240d107d9a2a509edea03df
This commit is contained in:
Treehugger Robot
2022-02-12 12:21:09 +00:00
committed by Automerger Merge Worker
parent f859d0f15d e489d46b7c
commit 43b7ae19fb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/BluetoothPairingController.java
View File

@@ -435,7 +435,7 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
*/
public void onCancel() {
Log.d(TAG, "Pairing dialog canceled");
mDevice.cancelPairing();
mDevice.cancelBondProcess();
}
/**

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

@@ -98,7 +98,7 @@ public final class BluetoothPairingService extends Service {
} else if (action.equals(ACTION_DISMISS_PAIRING)) {
Log.d(TAG, "Notification cancel " + " (" +
mDevice.getName() + ")");
mDevice.cancelPairing();
mDevice.cancelBondProcess();
} else {
int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
BluetoothDevice.ERROR);
@@ -144,7 +144,7 @@ public final class BluetoothPairingService extends Service {
createPairingNotification(intent);
} else if (TextUtils.equals(action, ACTION_DISMISS_PAIRING)) {
Log.d(TAG, "Notification cancel " + " (" + mDevice.getName() + ")");
mDevice.cancelPairing();
mDevice.cancelBondProcess();
mNm.cancel(NOTIFICATION_ID);
stopSelf();
} else if (TextUtils.equals(action, ACTION_PAIRING_DIALOG)) {

2
tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingServiceTest.java
View File

@@ -106,7 +106,7 @@ public class BluetoothPairingServiceTest {
mBluetoothPairingService.onStartCommand(intent, /* flags */ 0, /* startId */ 0);
verify(mDevice).cancelPairing();
verify(mDevice).cancelBondProcess();
verify(mNm).cancel(mBluetoothPairingService.NOTIFICATION_ID);
}