Update the error codes to be compatible with PBAP spec.

Catch IndexOutOfBoundsException and NullPointerException in Opp sendFile().

1 files changed, 12 insertions, 4 deletions

diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
index 0b240f1c5..6efac93de 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
@@ -483,10 +483,11 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession {
                     }
                 }
             } catch (IOException e) {
-                status = BluetoothShare.STATUS_OBEX_DATA_ERROR;
-                Log.e(TAG, "Error when sending file");
-                Constants.updateShareStatus(mContext1, mInfo.mId, status);
-                mCallback.removeMessages(BluetoothOppObexSession.MSG_CONNECT_TIMEOUT);
+                handleSendException(e.toString());
+            } catch (NullPointerException e) {
+                handleSendException(e.toString());
+            } catch (IndexOutOfBoundsException e) {
+                handleSendException(e.toString());
             } finally {
                 try {
                     fileInfo.mInputStream.close();
@@ -526,6 +527,13 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession {
             return status;
         }
 
+        private void handleSendException(String exception) {
+            Log.e(TAG, "Error when sending file: " + exception);
+            int status = BluetoothShare.STATUS_OBEX_DATA_ERROR;
+            Constants.updateShareStatus(mContext1, mInfo.mId, status);
+            mCallback.removeMessages(BluetoothOppObexSession.MSG_CONNECT_TIMEOUT);
+        }
+
         @Override
         public void interrupt() {
             super.interrupt();