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

Commit efa8b2d4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9397138 from a41e293a to tm-qpr2-release 

Change-Id: Ia6eb90e76c575bcbf803816687655fc83ab0ecdf
parents faeefc61 a41e293a

android/app/jni/com_android_bluetooth_gatt.cpp

+0 −1
Original line number Diff line number Diff line
@@ -2024,7 +2024,6 @@ static void gattServerSendResponseNative(JNIEnv* env, jobject object, 
    if (env->GetArrayLength(val) < BTGATT_MAX_ATTR_LEN) {

      response.attr_value.len = (uint16_t)env->GetArrayLength(val);

    } else {

      android_errorWriteLog(0x534e4554, "78787521");

      response.attr_value.len = BTGATT_MAX_ATTR_LEN;

    }

android/app/jni/com_android_bluetooth_hfp.cpp

+0 −3
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ class JniHeadsetCallbacks : bluetooth::headset::Callbacks { 


    char null_str[] = "";

    if (!sCallbackEnv.isValidUtf(number)) {

      android_errorWriteLog(0x534e4554, "109838537");

      ALOGE("%s: number is not a valid UTF string.", __func__);

      number = null_str;

    }
@@ -325,7 +324,6 @@ class JniHeadsetCallbacks : bluetooth::headset::Callbacks { 


    char null_str[] = "";

    if (!sCallbackEnv.isValidUtf(at_string)) {

      android_errorWriteLog(0x534e4554, "109838537");

      ALOGE("%s: at_string is not a valid UTF string.", __func__);

      at_string = null_str;

    }
@@ -361,7 +359,6 @@ class JniHeadsetCallbacks : bluetooth::headset::Callbacks { 


    char null_str[] = "";

    if (!sCallbackEnv.isValidUtf(at_string)) {

      android_errorWriteLog(0x534e4554, "109838537");

      ALOGE("%s: at_string is not a valid UTF string.", __func__);

      at_string = null_str;

    }

android/app/jni/com_android_bluetooth_hfpclient.cpp

+0 −6
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static void current_operator_cb(const RawAddress* bd_addr, const char* name) { 


  const char null_str[] = "";

  if (!sCallbackEnv.isValidUtf(name)) {

    android_errorWriteLog(0x534e4554, "109838537");

    ALOGE("%s: name is not a valid UTF string.", __func__);

    name = null_str;

  }
@@ -246,7 +245,6 @@ static void clip_cb(const RawAddress* bd_addr, const char* number) { 


  const char null_str[] = "";

  if (!sCallbackEnv.isValidUtf(number)) {

    android_errorWriteLog(0x534e4554, "109838537");

    ALOGE("%s: number is not a valid UTF string.", __func__);

    number = null_str;

  }
@@ -267,7 +265,6 @@ static void call_waiting_cb(const RawAddress* bd_addr, const char* number) { 


  const char null_str[] = "";

  if (!sCallbackEnv.isValidUtf(number)) {

    android_errorWriteLog(0x534e4554, "109838537");

    ALOGE("%s: number is not a valid UTF string.", __func__);

    number = null_str;

  }
@@ -292,7 +289,6 @@ static void current_calls_cb(const RawAddress* bd_addr, int index, 


  const char null_str[] = "";

  if (!sCallbackEnv.isValidUtf(number)) {

    android_errorWriteLog(0x534e4554, "109838537");

    ALOGE("%s: number is not a valid UTF string.", __func__);

    number = null_str;

  }
@@ -338,7 +334,6 @@ static void subscriber_info_cb(const RawAddress* bd_addr, const char* name, 


  const char null_str[] = "";

  if (!sCallbackEnv.isValidUtf(name)) {

    android_errorWriteLog(0x534e4554, "109838537");

    ALOGE("%s: name is not a valid UTF string.", __func__);

    name = null_str;

  }
@@ -372,7 +367,6 @@ static void last_voice_tag_number_cb(const RawAddress* bd_addr, 


  const char null_str[] = "";

  if (!sCallbackEnv.isValidUtf(number)) {

    android_errorWriteLog(0x534e4554, "109838537");

    ALOGE("%s: number is not a valid UTF string.", __func__);

    number = null_str;

  }

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ class ActiveDeviceManager { 
                                    setA2dpActiveDevice(null);

                                }

                            } else {

                                mA2dpActiveDevice = null;

                                setA2dpActiveDevice(null);

                            }

                        }

                    }
@@ -366,7 +366,7 @@ class ActiveDeviceManager { 
                                    setHfpActiveDevice(null);

                                }

                            } else {

                                mHfpActiveDevice = null;

                                setHfpActiveDevice(null);

                            }

                        }

                    }

android/app/src/com/android/bluetooth/map/BluetoothMapContentObserver.java

+5 −2
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import com.android.bluetooth.map.BluetoothMapUtils.TYPE; 
import com.android.bluetooth.map.BluetoothMapbMessageMime.MimePart;

import com.android.bluetooth.mapapi.BluetoothMapContract;

import com.android.bluetooth.mapapi.BluetoothMapContract.MessageColumns;

import com.android.internal.annotations.VisibleForTesting;

import com.android.obex.ResponseCodes;



import com.google.android.mms.pdu.PduHeaders;
@@ -587,7 +588,8 @@ public class BluetoothMapContentObserver { 
        }

    }



    private class Event {

    @VisibleForTesting

    class Event {

        public String eventType;

        public long handle;

        public String folder = null;
@@ -608,7 +610,8 @@ public class BluetoothMapContentObserver { 


        static final String PATH = "telecom/msg/";



        private void setFolderPath(String name, TYPE type) {

        @VisibleForTesting

        void setFolderPath(String name, TYPE type) {

            if (name != null) {

                if (type == TYPE.EMAIL || type == TYPE.IM) {

                    this.folder = name;