Merge change 5894 (0326da05) · Commits · e / os / android_frameworks_base

obex/javax/obex/ClientOperation.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -347,7 +347,7 @@ public final class ClientOperation implements Operation, BaseStream {
		isClosed = true;
		inputStreamOpened = false;
		outputStreamOpened = false;
		parent.setInactive();
		parent.setRequestInactive();
		}

		/**

+140 −172

File changed.

Preview size limit exceeded, changes collapsed.

+8 −8

Original line number	Diff line number	Diff line
		@@ -62,11 +62,11 @@ public final class ObexHelper {
		* The maximum packet size for OBEX packets that this client can handle.
		* At present, this must be changed for each port.
		*
		* OPTIMIZATION: The max packet size should be the Max incoming MTU minus
		* OPTIMIZATION: L2CAP package headers and RFCOMM package headers.
		* TODO: The max packet size should be the Max incoming MTU minus
		* TODO: L2CAP package headers and RFCOMM package headers.
		*
		* OPTIMIZATION: Retrieve the max incoming MTU from
		* OPTIMIZATION: LocalDevice.getProperty().
		* TODO: Retrieve the max incoming MTU from
		* TODO: LocalDevice.getProperty().
		*/
		/** android note
		* set as 0xFFFE to match remote MPS
		@@ -293,10 +293,10 @@ public final class ObexHelper {
		/**
		* Creates the header part of OBEX packet based on the header provided.
		*
		* OPTIMIZATION: Could use getHeaderList() to get the array of headers to
		* OPTIMIZATION: include and then use the high two bits to determine the
		* OPTIMIZATION: the type of the object and construct the byte array from
		* OPTIMIZATION: that. This will make the size smaller.
		* TODO: Could use getHeaderList() to get the array of headers to
		* TODO: include and then use the high two bits to determine the
		* TODO: the type of the object and construct the byte array from
		* TODO: that. This will make the size smaller.
		*
		* @param head the header used to construct the byte array
		*

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ import java.io.IOException;
		* This object provides an input stream to the Operation objects used in this
		* package.
		*
		* OPTIMIZATION: Include the other read() methods defined in InputStream.
		* TODO: Include the other read() methods defined in InputStream.
		*
		* @hide
		*/

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,8 @@ import java.io.ByteArrayOutputStream;
		* the server receives a 0x83, the client is signalling the server that it is
		* done with its request.
		*
		* OPTIMIZATION: Extend the ClientOperation and reuse the methods defined
		* OPTIMIZATION: in that class.
		* TODO: Extend the ClientOperation and reuse the methods defined
		* TODO: in that class.
		*
		* @hide
		*/