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

Commit 9fd2069d authored by jun.x.wang's avatar jun.x.wang Committed by Andre Eisenbach
Browse files

Fix NPE crash while removeBatch 

When unpairing two devices, the BluetoothOppShareInfo
in BluetoothOppBatch may be null during transfer.

Change-Id: I7b4fbd0f291250deebdeaea4bf2d2f540fe233dc
parent a36dfa30

src/com/android/bluetooth/opp/BluetoothOppService.java

+2 −1
Original line number Diff line number Diff line
@@ -868,7 +868,8 @@ public class BluetoothOppService extends Service { 
                        mServerTransfer = new BluetoothOppTransfer(this, mPowerManager, nextBatch,

                                                                   mServerSession);

                        mServerTransfer.start();

                        if (nextBatch.getPendingShare().mConfirm ==

                        if (nextBatch.getPendingShare() != null

                            && nextBatch.getPendingShare().mConfirm ==

                                BluetoothShare.USER_CONFIRMATION_CONFIRMED) {

                            mServerTransfer.confirmStatusChanged();

                        }