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

Commit af962424 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Merge "Fix NPE crash while removeBatch" am: e441f165 

am: de7b8193

* commit 'de7b8193':
  Fix NPE crash while removeBatch
parents ebdf1a3d de7b8193

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();

                        }