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

Commit caca769d authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "Merge two ObexAppParameters classes" into tm-qpr-dev

parents 30ac6955 d16191dc

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

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

 */



package com.android.bluetooth.mapclient;

package com.android.bluetooth;



import com.android.obex.HeaderSet;

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

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



import com.android.bluetooth.BluetoothObexTransport;

import com.android.bluetooth.ObexAppParameters;

import com.android.internal.util.StateMachine;

import com.android.obex.ClientSession;

import com.android.obex.HeaderSet;

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

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


import android.util.Log;



import com.android.bluetooth.ObexAppParameters;

import com.android.bluetooth.ObexServerSockets;

import com.android.obex.HeaderSet;

import com.android.obex.Operation;

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

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.bluetooth.mapclient;



import com.android.bluetooth.ObexAppParameters;

import com.android.obex.ClientSession;

import com.android.obex.HeaderSet;

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

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


import android.util.Log;



import com.android.bluetooth.ObexAppParameters;

import com.android.obex.ClientSession;

import com.android.obex.HeaderSet;

import com.android.obex.ResponseCodes;