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

Merge "Allow getResponseCode to block if response hasn't been received from remote" am: 834e5ce170

Browse Source 
am: b987832918

Change-Id: Ie688a54c9774b269b90cd96aecfc7ef6a621bf86
This commit is contained in:
Ajay Panicker
2016-08-22 20:57:26 +00:00
committed by android-build-merger
parent a4b49bf99c b987832918
commit 3cc3bd3f93
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,7 +207,6 @@ public final class ClientOperation implements Operation, BaseStream {
* object * object
*/ */
public synchronized int getResponseCode() throws IOException { public synchronized int getResponseCode() throws IOException {
//avoid dup validateConnection
if ((mReplyHeader.responseCode == -1) if ((mReplyHeader.responseCode == -1)
|| (mReplyHeader.responseCode == ResponseCodes.OBEX_HTTP_CONTINUE)) { || (mReplyHeader.responseCode == ResponseCodes.OBEX_HTTP_CONTINUE)) {
validateConnection(); validateConnection();
@@ -423,8 +422,9 @@ public final class ClientOperation implements Operation, BaseStream {
private void validateConnection() throws IOException { private void validateConnection() throws IOException {
ensureOpen(); ensureOpen();
// to sure only one privateInput object exist. // Make sure that a response has been recieved from remote
if (mPrivateInput == null) { // before continuing
if (mPrivateInput == null || mReplyHeader.responseCode == -1) {
startProcessing(); startProcessing();
} }
} }