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

Commit f3175761 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove the usage of BearerData in Bluetooth" am: 53ddc7e2 am: 8cf60c63 

Change-Id: Ibddb93e0928a6a6f722af9e094200428c704a03f
parents aba9b2ca 8cf60c63

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

+6 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.util.Log; 


import com.android.bluetooth.util.GsmAlphabet;

import com.android.internal.telephony.SmsConstants;

import com.android.internal.telephony.cdma.sms.BearerData;



import java.io.ByteArrayInputStream;

import java.io.ByteArrayOutputStream;
@@ -52,6 +51,11 @@ public class BluetoothMapSmsPdu { 
    private static final int ELT_ID_NATIONAL_LANGUAGE_SINGLE_SHIFT     = 0x24;

    private static final int ELT_ID_NATIONAL_LANGUAGE_LOCKING_SHIFT    = 0x25;



    /**

     * Supported message types for CDMA SMS messages

     * (See 3GPP2 C.S0015-B, v2.0, table 4.5.1-1)

     */

    private static final int MESSAGE_TYPE_DELIVER = 0x01;



    /* We need to handle the SC-address mentioned in errata 4335.

     * Since the definition could be read in three different ways, I have asked
@@ -266,7 +270,7 @@ public class BluetoothMapSmsPdu { 
                // Mask out the type

                tmp &= 0x0f;

                // Set the new type

                tmp |= ((BearerData.MESSAGE_TYPE_DELIVER << 4) & 0xf0);

                tmp |= ((MESSAGE_TYPE_DELIVER << 4) & 0xf0);

                // Store the result

                mData[offset + 2] = (byte) tmp;