Merge "Allow getResponseCode to block if response hasn't been received from remote"

am: 834e5ce170

Change-Id: I3fc5b8c49623f6054995029105c4f6712ec63674
This commit is contained in:
Ajay Panicker
2016-08-22 20:47:48 +00:00
committed by android-build-merger

View File

@@ -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();
}
}