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

Commit d7fb6bcc authored by Vinit Deshpande's avatar Vinit Deshpande
Browse files

am eb8bf9eb..8dfb7fcb from mirror-m-wireless-internal-release 

8dfb7fcb MAP: Errata service release 8 changes
d08e64e3 Update to Bluetooth MAP 1.2 (server)
010fc6ae MAP: fix exception when Email in SMS list request
5af2ff57 Merge "Handle response to AT+NREC command" into m-wireless-dev
a7c3b8a7 Add UUIDs to SDP JNI
040381f1 Handle response to AT+NREC command

Change-Id: If24e414fe3fd0c2f47147f2535296b92e8066d76
parents 5331227a 8dfb7fcb

android/app/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ LOCAL_SRC_FILES := \ 
        $(call all-java-files-under, lib/mapapi)



LOCAL_MODULE := bluetooth.mapsapi



include $(BUILD_JAVA_LIBRARY)

LOCAL_MULTILIB := 32

include $(BUILD_STATIC_JAVA_LIBRARY)



include $(CLEAR_VARS)
@@ -21,8 +21,8 @@ LOCAL_PACKAGE_NAME := Bluetooth 
LOCAL_CERTIFICATE := platform



LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_jni

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

LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard

LOCAL_JAVA_LIBRARIES := javax.obex telephony-common

LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard  bluetooth.mapsapi



LOCAL_REQUIRED_MODULES := bluetooth.default

LOCAL_MULTILIB := 32

android/app/AndroidManifest.xml

+5 −3
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <!-- WRITE_CONTACTS is used for test cases only -->

    <uses-permission android:name="android.permission.WRITE_CONTACTS" />

    <uses-permission android:name="android.permission.READ_CALL_LOG" />

    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
@@ -226,13 +228,13 @@ 
            android:enabled="@bool/profile_supported_map" >

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothMap" />

                <action android:name="android.btmap.intent.action.SHOW_MAPS_EMAIL_SETTINGS" />

                <action android:name="android.btmap.intent.action.SHOW_MAPS_SETTINGS" />

                <action android:name="com.android.bluetooth.map.USER_CONFIRM_TIMEOUT"/>

            </intent-filter>

        </service>

         <activity android:name=".map.BluetoothMapEmailSettings"

         <activity android:name=".map.BluetoothMapSettings"

                  android:process="@string/process"

                  android:label="@string/bluetooth_map_email_settings_title"

                  android:label="@string/bluetooth_map_settings_title"

                  android:excludeFromRecents="true"

                  android:configChanges="orientation|keyboardHidden"

                  android:enabled="@bool/profile_supported_map">

android/app/jni/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ LOCAL_SRC_FILES:= \ 
    com_android_bluetooth_hid.cpp \

    com_android_bluetooth_hdp.cpp \

    com_android_bluetooth_pan.cpp \

    com_android_bluetooth_gatt.cpp

    com_android_bluetooth_gatt.cpp \

    com_android_bluetooth_sdp.cpp



LOCAL_C_INCLUDES += \

    $(JNI_H_INCLUDE) \

android/app/jni/com_android_bluetooth.h

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ int register_com_android_bluetooth_pan(JNIEnv* env); 


int register_com_android_bluetooth_gatt (JNIEnv* env);



int register_com_android_bluetooth_sdp (JNIEnv* env);



}



#endif /* COM_ANDROID_BLUETOOTH_H */

android/app/jni/com_android_bluetooth_avrcp.cpp

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ static void btavrcp_remote_features_callback(bt_bdaddr_t* bd_addr, btrc_remote_f 
    sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte*) bd_addr);

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_getRcFeatures, addr, (jint)features);

    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

    sCallbackEnv->DeleteLocalRef(addr);

    /* TODO: I think we leak the addr object, we should add a

     * sCallbackEnv->DeleteLocalRef(addr) */

}



static void btavrcp_get_play_status_callback() {