From 86020e9a599c3ceaef2a7dc9c744918e9b7f1ce4 Mon Sep 17 00:00:00 2001
From: Nitin Shivpure <nshivpur@codeaurora.org>
Date: Mon, 20 Jul 2015 13:22:28 +0530
Subject: Bluetooth: Add support for Map client over L2cap

- Adding the support for Map client(MAP1.2).
- Add support to create & remove MNS sdp records.
- Add support to enable & disable srm, Fews Message Access Profile
  opreations don't require SRM header in their pdu. Eg. UpdateInbox,
  SetMessageStatus. SetNotificationRegistration.
- If obex based profile explicitly sets GET with final flag, then
  GET should always be sent as single packet request with final flag
  set.

Change-Id: I89f51ecf8b7834f0b131d043a5f49811914e9635
CRs-Fixed: 754956
---
 obex/javax/obex/ClientOperation.java | 49 +++++++++++++++++++++++++-----------
 obex/javax/obex/ClientSession.java   |  7 +++++-
 2 files changed, 40 insertions(+), 16 deletions(-)

(limited to 'obex')

diff --git a/obex/javax/obex/ClientOperation.java b/obex/javax/obex/ClientOperation.java
index 883c8c6..eb7e280 100644
--- a/obex/javax/obex/ClientOperation.java
+++ b/obex/javax/obex/ClientOperation.java
@@ -632,21 +632,32 @@ public final class ClientOperation implements Operation, BaseStream {
 
         if (mGetOperation) {
             if (!mOperationDone) {
-                mReplyHeader.responseCode = ResponseCodes.OBEX_HTTP_CONTINUE;
-                while ((more) && (mReplyHeader.responseCode == ResponseCodes.OBEX_HTTP_CONTINUE)) {
-                    more = sendRequest(ObexHelper.OBEX_OPCODE_GET);
-                }
-                // For GET we need to loop until all headers have been sent,
-                // And then we wait for the first continue package with the
-                // reply.
-                if (mReplyHeader.responseCode == ResponseCodes.OBEX_HTTP_CONTINUE) {
-                    mParent.sendRequest(ObexHelper.OBEX_OPCODE_GET_FINAL,
-                            null, mReplyHeader, mPrivateInput, mSrmActive);
-                }
-                if (mReplyHeader.responseCode != ResponseCodes.OBEX_HTTP_CONTINUE) {
-                    mOperationDone = true;
+                if (!mGetFinalFlag) {
+                    mReplyHeader.responseCode = ResponseCodes.OBEX_HTTP_CONTINUE;
+                    while ((more) && (mReplyHeader.responseCode ==
+                            ResponseCodes.OBEX_HTTP_CONTINUE)) {
+                        more = sendRequest(ObexHelper.OBEX_OPCODE_GET);
+                    }
+                    // For GET we need to loop until all headers have been sent,
+                    // And then we wait for the first continue package with the
+                    // reply.
+                    if (mReplyHeader.responseCode == ResponseCodes.OBEX_HTTP_CONTINUE) {
+                        mParent.sendRequest(ObexHelper.OBEX_OPCODE_GET_FINAL,
+                                null, mReplyHeader, mPrivateInput, mSrmActive);
+                    }
+                    if (mReplyHeader.responseCode != ResponseCodes.OBEX_HTTP_CONTINUE) {
+                        mOperationDone = true;
+                    } else {
+                        checkForSrm();
+                    }
                 } else {
-                    checkForSrm();
+                    more = sendRequest(ObexHelper.OBEX_OPCODE_GET_FINAL);
+
+                    if (more) {
+                        throw new IOException("FINAL_GET forced, data didn't fit into one packet");
+                    }
+
+                    mOperationDone = true;
                 }
             }
         } else {
@@ -705,7 +716,15 @@ public final class ClientOperation implements Operation, BaseStream {
                 if (mPrivateInput == null) {
                     mPrivateInput = new PrivateInputStream(this);
                 }
-                sendRequest(ObexHelper.OBEX_OPCODE_GET);
+
+                if (!mGetFinalFlag) {
+                    sendRequest(ObexHelper.OBEX_OPCODE_GET);
+                } else {
+                    sendRequest(ObexHelper.OBEX_OPCODE_GET_FINAL);
+                }
+                if (mReplyHeader.responseCode != ResponseCodes.OBEX_HTTP_CONTINUE) {
+                    mOperationDone = true;
+                }
                 return true;
 
             } else if (mOperationDone) {
diff --git a/obex/javax/obex/ClientSession.java b/obex/javax/obex/ClientSession.java
index 272a920..8f7a680 100644
--- a/obex/javax/obex/ClientSession.java
+++ b/obex/javax/obex/ClientSession.java
@@ -68,7 +68,7 @@ public final class ClientSession extends ObexSession {
 
     private final OutputStream mOutput;
 
-    private final boolean mLocalSrmSupported;
+    private boolean mLocalSrmSupported;
 
     private final ObexTransport mTransport;
 
@@ -613,4 +613,9 @@ public final class ClientSession extends ObexSession {
     public boolean isSrmSupported() {
         return mLocalSrmSupported;
     }
+
+    public void setLocalSrmStatus(boolean SrmEnabled) {
+        mLocalSrmSupported = SrmEnabled;
+        Log.v(TAG, "setLocalSrmStatus: " + mLocalSrmSupported);
+    }
 }
-- 
cgit v1.1