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

am e80534ff: Fix connection ID issue in Obex lib

Browse Source 
Merge commit 'e80534ff59b2e62a0ddf4359147b81f5ba10de86' into eclair-plus-aosp

* commit 'e80534ff59b2e62a0ddf4359147b81f5ba10de86':
  Fix connection ID issue in Obex lib
This commit is contained in:
Tao Liejun
2009-09-15 10:12:01 -07:00
committed by Android Git Automerger
parent 60fb7075ee e80534ff59
commit f4c60bb273
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
obex/javax/obex/ServerOperation.java
View File

@@ -169,10 +169,10 @@ public final class ServerOperation implements Operation, BaseStream {
mHasBody = true; mHasBody = true;
} }
if (requestHeader.mConnectionID != null) { if (mListener.getConnectionId() != -1 && requestHeader.mConnectionID != null) {
mListener.setConnectionId(ObexHelper.convertToLong(requestHeader.mConnectionID)); mListener.setConnectionId(ObexHelper.convertToLong(requestHeader.mConnectionID));
} else { } else {
mListener.setConnectionId(0); mListener.setConnectionId(1);
} }
if (requestHeader.mAuthResp != null) { if (requestHeader.mAuthResp != null) {
@@ -438,7 +438,7 @@ public final class ServerOperation implements Operation, BaseStream {
if (body != null) { if (body != null) {
mHasBody = true; mHasBody = true;
} }
if (requestHeader.mConnectionID != null) { if (mListener.getConnectionId() != -1 && requestHeader.mConnectionID != null) {
mListener.setConnectionId(ObexHelper mListener.setConnectionId(ObexHelper
.convertToLong(requestHeader.mConnectionID)); .convertToLong(requestHeader.mConnectionID));
} else { } else {

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

@@ -283,10 +283,10 @@ public final class ServerSession extends ObexSession implements Runnable {
ObexHelper.updateHeaderSet(request, headers); ObexHelper.updateHeaderSet(request, headers);
if (request.mConnectionID != null) { if (mListener.getConnectionId() != -1 && request.mConnectionID != null) {
mListener.setConnectionId(ObexHelper.convertToLong(request.mConnectionID)); mListener.setConnectionId(ObexHelper.convertToLong(request.mConnectionID));
} else { } else {
mListener.setConnectionId(-1); mListener.setConnectionId(1);
} }
// the Auth chan is initiated by the server, client sent back the authResp . // the Auth chan is initiated by the server, client sent back the authResp .
if (request.mAuthResp != null) { if (request.mAuthResp != null) {
@@ -405,7 +405,7 @@ public final class ServerSession extends ObexSession implements Runnable {
ObexHelper.updateHeaderSet(request, headers); ObexHelper.updateHeaderSet(request, headers);
} }
if (request.mConnectionID != null) { if (mListener.getConnectionId() != -1 && request.mConnectionID != null) {
mListener.setConnectionId(ObexHelper.convertToLong(request.mConnectionID)); mListener.setConnectionId(ObexHelper.convertToLong(request.mConnectionID));
} else { } else {
mListener.setConnectionId(1); mListener.setConnectionId(1);
@@ -527,7 +527,7 @@ public final class ServerSession extends ObexSession implements Runnable {
ObexHelper.updateHeaderSet(request, headers); ObexHelper.updateHeaderSet(request, headers);
} }
if (request.mConnectionID != null) { if (mListener.getConnectionId() != -1 && request.mConnectionID != null) {
mListener.setConnectionId(ObexHelper.convertToLong(request.mConnectionID)); mListener.setConnectionId(ObexHelper.convertToLong(request.mConnectionID));
} else { } else {
mListener.setConnectionId(1); mListener.setConnectionId(1);