Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 22055 into eclair

Browse Source 
* changes:
  Improve Obex compatibility
This commit is contained in:
Android (Google) Code Review
2009-08-19 21:09:45 -07:00
parent ef408cdbea 0b309d6ee4
commit f5d493a54b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
obex/javax/obex/ObexHelper.java
View File

@@ -897,6 +897,11 @@ public final class ObexHelper {
if (lower < 0) { if (lower < 0) {
lower += 256; 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); c[i] = (char)((upper << 8) | lower);
} }

2
obex/javax/obex/ServerSession.java
View File

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