commit f60d96d6bf4c3dce367ce48436f383897c7f9719
author Priti Aghera <paghera@broadcom.com> Mon Apr 15 14:16:04 2013 -0700
committer Matthew Xie <mattx@google.com> Thu Apr 18 12:07:30 2013 -0700
tree d7eac8f8cf6105ad57b439fbd6d7cf130fea08b6
parent dbaf9cd41555de7e6101f368ac348bbeb2094809

Fixed a NPE

Bluetooth share was crashing due to NPE. Included a check for
Inputstream in BluetoothOppSendFileInfo.

bug #7924487
Change-Id: Iccceb607a46962f84538e912d62f407ad5ee2f21

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

diff --git a/src/com/android/bluetooth/opp/BluetoothOppUtility.java b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
index a3befb9..24b7606 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppUtility.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
@@ -322,7 +322,7 @@
     static void closeSendFileInfo(Uri uri) {
         if (D) Log.d(TAG, "closeSendFileInfo: uri=" + uri);
         BluetoothOppSendFileInfo info = sSendFileMap.remove(uri);
-        if (info != null) {
+        if (info != null && info.mInputStream != null) {
             try {
                 info.mInputStream.close();
             } catch (IOException ignored) {