Bluetooth-OPP: Check URI of sending files before entry cleanup

Checking the URI of sending files before removing the file entry
from Hashmap. Otherwise, during BT ON/OFF scenario there is a
possibility of URI becoming NULL that will lead to BT app crash.

CRs-Fixed: 721360
Change-Id: Ic7e8966d38e30948228e14a740cd3051b345da31

1 files changed, 3 insertions, 4 deletions

diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java
index ebbbfc8a1..59ecf3599 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppManager.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppManager.java
@@ -278,14 +278,13 @@ public class BluetoothOppManager {
     public void cleanUpSendingFileInfo() {
         synchronized (BluetoothOppManager.this) {
             Uri uri;
-            if (V) Log.v(TAG, "cleanUpSendingFileInfo: mMultipleFlag = " +
-                mMultipleFlag);
-            if (!mMultipleFlag) {
+            if (V) Log.v(TAG, "cleanUpSendingFileInfo: mMultipleFlag = " + mMultipleFlag);
+            if (!mMultipleFlag && (mUriOfSendingFile != null)) {
                 uri = Uri.parse(mUriOfSendingFile);
                 if (V) Log.v(TAG, "cleanUpSendingFileInfo: " +
                     "closeSendFileInfo for uri = " + uri);
                 BluetoothOppUtility.closeSendFileInfo(uri);
-            } else {
+            } else if (mUrisOfSendingFiles != null) {
                 for (int i = 0, count = mUrisOfSendingFiles.size(); i < count; i++) {
                     uri = mUrisOfSendingFiles.get(i);
                     if (V) Log.v(TAG, "cleanUpSendingFileInfo: " +