Fix NPE crash while removeBatch

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

Change-Id: I7b4fbd0f291250deebdeaea4bf2d2f540fe233dc

diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java
index f952bec..edec7c8 100755 (executable)
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -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();
                         }