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

Commit 94723ed3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in AdapterService.onUserBondResponse" into main am: 05584917 

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



Change-Id: Ie3616592cbfae752bc94aa74494724bcfa959729
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 967adf9d 05584917

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

+3 −1
Original line number Diff line number Diff line
@@ -2700,7 +2700,9 @@ public class AdapterService extends Service { 
            }

            service.logUserBondResponse(device, false, source);

            service.mBondAttemptCallerInfo.remove(device.getAddress());

            if (service.mPhonePolicy != null) {

                service.mPhonePolicy.onRemoveBondRequest(device);

            }

            deviceProp.setBondingInitiatedLocally(false);



            Message msg = service.mBondStateMachine.obtainMessage(BondStateMachine.REMOVE_BOND);