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

Commit 89a8b112 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "MAP: Add MAP Server Email type and instance support."

parents fe11d55e a44ee746

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ LOCAL_CERTIFICATE := platform 
LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_jni

LOCAL_JAVA_LIBRARIES := javax.obex telephony-common mms-common

LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard

LOCAL_STATIC_JAVA_LIBRARIES += com.android.emailcommon



LOCAL_REQUIRED_MODULES := libbluetooth_jni bluetooth.default

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ 
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

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



<uses-permission android:name="com.android.email.permission.ACCESS_PROVIDER"/>

    <uses-permission android:name="com.android.email.permission.READ_ATTACHMENT"/>





    <!-- For PBAP Owner Vcard Info -->

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

    <application

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

+3 −0
Original line number Diff line number Diff line
@@ -165,6 +165,9 @@ public class BluetoothMapAppParams { 
        while (i < appParams.length) {

            tagId = appParams[i++] & 0xff;     // Convert to unsigned to support values above 127

            tagLength = appParams[i++] & 0xff; // Convert to unsigned to support values above 127

            Log.d(TAG, "tagId is "+ tagId );

            Log.d(TAG, "tagLength is "+ tagLength );

            Log.d(TAG, "appParams[i] is "+ appParams[i]);

            switch (tagId) {

            case MAX_LIST_COUNT:

                if (tagLength != MAX_LIST_COUNT_LEN) {

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

+738 −10

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+596 −0

File added.

Preview size limit exceeded, changes collapsed.