am f5d493a5: Merge change 22055 into eclair

Merge commit 'f5d493a54b2320efecfb47d9c8b51092a7fe171f'

* commit 'f5d493a54b2320efecfb47d9c8b51092a7fe171f':
  Improve Obex compatibility

obex/javax/obex/ObexHelper.java

@@ -897,6 +897,11 @@ public final class ObexHelper {
             if (lower < 0) {
                 lower += 256;
             }
+            // If upper and lower both equal 0, it should be the end of string.
+            // Ignore left bytes from array to avoid potential issues
+            if (upper == 0 && lower == 0) {
+                return new String(c, 0, i);
+            }
 
             c[i] = (char)((upper << 8) | lower);
         }

obex/javax/obex/ServerSession.java

@@ -168,7 +168,7 @@ public final class ServerSession extends ObexSession implements Runnable {
             } else {
                 response = validateResponseCode(mListener.onPut(op));
             }
-            if (response != ResponseCodes.OBEX_HTTP_OK) {
+            if (response != ResponseCodes.OBEX_HTTP_OK && !op.isAborted) {
                 op.sendReply(response);
             } else if (!op.isAborted) {
                 // wait for the final bit