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

Commit 00475741 authored by Hemant Gupta's avatar Hemant Gupta Committed by Linux Build Service Account
Browse files

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
parent e281f0f3

Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ LOCAL_PACKAGE_NAME := Bluetooth 
LOCAL_CERTIFICATE := platform



LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_jni

LOCAL_JAVA_LIBRARIES := javax.obex telephony-common bluetooth.mapsapi

LOCAL_JAVA_LIBRARIES := bluetooth.mapsapi

LOCAL_JAVA_LIBRARIES += javax.btobex

LOCAL_JAVA_LIBRARIES += telephony-common

LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard



LOCAL_REQUIRED_MODULES := bluetooth.default

AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -64,7 +64,10 @@ 
        android:icon="@drawable/bt_share"

        android:persistent="false"

        android:label="@string/app_name">

        <uses-library android:name="javax.obex" />

        <uses-library

            android:name="javax.btobex"></uses-library>





        <provider android:name=".opp.BluetoothOppProvider"

            android:authorities="com.android.bluetooth.opp"

            android:exported="true"

AndroidManifest_test.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <application

        android:icon="@drawable/bt_share"

        android:label="@string/app_name">

        <uses-library android:name="javax.obex" />

        <uses-library android:name="javax.btobex" />

        <activity android:name=".opp.TestActivity" android:label="@string/app_name">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

src/com/android/bluetooth/map/BluetoothMapObexServer.java

+4 −4
Original line number Diff line number Diff line
@@ -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 {

src/com/android/bluetooth/map/BluetoothMapRfcommTransport.java

+1 −1
Original line number Diff line number Diff line
@@ -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;