Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 897e2ef5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move out handling of BONDING_STATE_CHANGE in StableState" am:... 

Merge "Move out handling of BONDING_STATE_CHANGE in StableState" am: acdabb1e am: ade2f33c am: 46473ddb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2015216

Change-Id: I591aa8e9ae22bcd856c0ae5083068d0dee7da6df
parents 746e8a59 46473ddb

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ final class BondStateMachine extends StateMachine { 
                    int newState = msg.arg1;

                /* if incoming pairing, transition to pending state */

                    if (newState == BluetoothDevice.BOND_BONDING) {

                        sendIntent(dev, newState, 0);

                        deferMessage(msg);

                        transitionTo(mPendingCommandState);

                    } else if (newState == BluetoothDevice.BOND_NONE) {

                    /* if the link key was deleted by the stack */