From f8c2ad085b5380ec226ba12b808511cf519e6ce6 Mon Sep 17 00:00:00 2001
From: Ajay Panicker <apanicke@google.com>
Date: Mon, 8 Aug 2016 17:16:50 -0700
Subject: Allow getResponseCode to block if response hasn't been received from
 remote

Bug: 30645605
Change-Id: I9854ccbe98ace6d5490cb99586ca36379f5a1db1
---
 obex/javax/obex/ClientOperation.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'obex')

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