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" into nyc-mr1-dev

Browse Source
This commit is contained in:
Pankaj Kanwar
2016-08-29 23:35:10 +00:00
committed by Android (Google) Code Review
parent 23f6f13eab c3ae4db069
commit 8a4db04893
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
*/
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();
}
}