OPP: Support OPP1.2 Features over L2CAP.

Support OPP1.2 features. OBEX over L2CAP , SRM and SRMP.
Use javax.btobex lib instead of javax.obex for OBEX OPP,
MAP and PBAP profiles.

CRs-Fixed: 639499

Conflicts:
	src/com/android/bluetooth/opp/BluetoothOppTransfer.java
src/com/android/bluetooth/map/BluetoothMapService.java

Conflicts:
	Android.mk
	src/com/android/bluetooth/map/BluetoothMapAuthenticator.java
	src/com/android/bluetooth/map/BluetoothMapService.java
	src/com/android/bluetooth/map/BluetoothMnsObexClient.java

Change-Id: I9b4e64dcc4eae44252334547d5478a12f5b9bef5

5 files changed, 13 insertions, 12 deletions

diff --git a/src/com/android/bluetooth/map/BluetoothMapObexServer.java b/src/com/android/bluetooth/map/BluetoothMapObexServer.java
index 9a092ef03..ddd67b865 100644
--- a/src/com/android/bluetooth/map/BluetoothMapObexServer.java
+++ b/src/com/android/bluetooth/map/BluetoothMapObexServer.java
@@ -37,10 +37,10 @@ import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Calendar;
 
-import javax.obex.HeaderSet;
-import javax.obex.Operation;
-import javax.obex.ResponseCodes;
-import javax.obex.ServerRequestHandler;
+import javax.btobex.HeaderSet;
+import javax.btobex.Operation;
+import javax.btobex.ResponseCodes;
+import javax.btobex.ServerRequestHandler;
 
 
 public class BluetoothMapObexServer extends ServerRequestHandler {
diff --git a/src/com/android/bluetooth/map/BluetoothMapRfcommTransport.java b/src/com/android/bluetooth/map/BluetoothMapRfcommTransport.java
index 90437d8f7..dabdd87b4 100644
--- a/src/com/android/bluetooth/map/BluetoothMapRfcommTransport.java
+++ b/src/com/android/bluetooth/map/BluetoothMapRfcommTransport.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import javax.obex.ObexTransport;
+import javax.btobex.ObexTransport;
 
 public class BluetoothMapRfcommTransport implements ObexTransport {
     private BluetoothSocket mSocket = null;
diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java
index f016fb162..9d06bd037 100644
--- a/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -23,9 +23,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Set;
 
-import javax.obex.ServerSession;
 
 import android.app.AlarmManager;
+import javax.btobex.ServerSession;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
diff --git a/src/com/android/bluetooth/map/BluetoothMnsObexClient.java b/src/com/android/bluetooth/map/BluetoothMnsObexClient.java
index 1e2c1839a..7d9124e1f 100644
--- a/src/com/android/bluetooth/map/BluetoothMnsObexClient.java
+++ b/src/com/android/bluetooth/map/BluetoothMnsObexClient.java
@@ -27,11 +27,12 @@ import android.util.SparseBooleanArray;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import javax.obex.ClientOperation;
-import javax.obex.ClientSession;
-import javax.obex.HeaderSet;
-import javax.obex.ObexTransport;
-import javax.obex.ResponseCodes;
+import javax.btobex.ApplicationParameter;
+import javax.btobex.ClientOperation;
+import javax.btobex.ClientSession;
+import javax.btobex.HeaderSet;
+import javax.btobex.ObexTransport;
+import javax.btobex.ResponseCodes;
 
 /**
  * The Message Notification Service class runs its own message handler thread,
diff --git a/src/com/android/bluetooth/map/BluetoothMnsRfcommTransport.java b/src/com/android/bluetooth/map/BluetoothMnsRfcommTransport.java
index fc5d54a5d..4fe3d1644 100644
--- a/src/com/android/bluetooth/map/BluetoothMnsRfcommTransport.java
+++ b/src/com/android/bluetooth/map/BluetoothMnsRfcommTransport.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import javax.obex.ObexTransport;
+import javax.btobex.ObexTransport;
 
 public class BluetoothMnsRfcommTransport implements ObexTransport {