Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a198d4a authored Dec 12, 2022 by Hyundo Moon

Merge two ObexAppParameters classes

This CL merges two same classes:
 - android.bluetooth.mapclient.ObexAppParameters
 - android.bluetooth.pbapclient.ObexAppParameters

Bug: 237467631
Test: Built bluetooth module && atest ObexAppParametersTest
Change-Id: Ib89e4485758d9f5b3f780a1b7a867c9086b3e176

parent 8abb1245

android/app/src/com/android/bluetooth/mapclient/obex/ObexAppParameters.java→android/app/src/com/android/bluetooth/ObexAppParameters.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.bluetooth.mapclient;		package com.android.bluetooth;

	import com.android.obex.HeaderSet;		import com.android.obex.HeaderSet;

android/app/src/com/android/bluetooth/mapclient/MasClient.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ import android.os.Message;
	import android.util.Log;		import android.util.Log;

	import com.android.bluetooth.BluetoothObexTransport;		import com.android.bluetooth.BluetoothObexTransport;
			import com.android.bluetooth.ObexAppParameters;
	import com.android.internal.util.StateMachine;		import com.android.internal.util.StateMachine;
	import com.android.obex.ClientSession;		import com.android.obex.ClientSession;
	import com.android.obex.HeaderSet;		import com.android.obex.HeaderSet;

android/app/src/com/android/bluetooth/mapclient/MnsObexServer.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package com.android.bluetooth.mapclient;

	import android.util.Log;		import android.util.Log;

			import com.android.bluetooth.ObexAppParameters;
	import com.android.bluetooth.ObexServerSockets;		import com.android.bluetooth.ObexServerSockets;
	import com.android.obex.HeaderSet;		import com.android.obex.HeaderSet;
	import com.android.obex.Operation;		import com.android.obex.Operation;

android/app/src/com/android/bluetooth/mapclient/obex/RequestGetFolderListing.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package com.android.bluetooth.mapclient;		package com.android.bluetooth.mapclient;

			import com.android.bluetooth.ObexAppParameters;
	import com.android.obex.ClientSession;		import com.android.obex.ClientSession;
	import com.android.obex.HeaderSet;		import com.android.obex.HeaderSet;

android/app/src/com/android/bluetooth/mapclient/obex/RequestGetMessage.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@ import android.bluetooth.client.map.utils.ObexAppParameters;

	import android.util.Log;		import android.util.Log;

			import com.android.bluetooth.ObexAppParameters;
	import com.android.obex.ClientSession;		import com.android.obex.ClientSession;
	import com.android.obex.HeaderSet;		import com.android.obex.HeaderSet;
	import com.android.obex.ResponseCodes;		import com.android.obex.ResponseCodes;