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

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

Merge cherrypicks of [19457945, 20077612] into tm-qpr1-release. 

Change-Id: Ic2bd1aed0f8730c5a0e7289c783dc479691470ca
parents c8b74c82 86f7d641

android/app/src/com/android/bluetooth/opp/BluetoothOppUtility.java

+6 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.net.Uri; 
import android.os.Environment;

import android.os.ParcelFileDescriptor;

import android.os.SystemProperties;

import android.util.EventLog;

import android.util.Log;



import com.android.bluetooth.R;
@@ -78,7 +79,11 @@ public class BluetoothOppUtility { 
            new ConcurrentHashMap<Uri, BluetoothOppSendFileInfo>();



    public static boolean isBluetoothShareUri(Uri uri) {

        return uri.toString().startsWith(BluetoothShare.CONTENT_URI.toString());

        if (uri.toString().startsWith(BluetoothShare.CONTENT_URI.toString())

                && !uri.getAuthority().equals(BluetoothShare.CONTENT_URI.getAuthority())) {

            EventLog.writeEvent(0x534e4554, "225880741", -1, "");

        }

        return uri.getAuthority().equals(BluetoothShare.CONTENT_URI.getAuthority());

    }



    public static BluetoothOppTransferInfo queryRecord(Context context, Uri uri) {

system/stack/avdt/avdt_msg.cc

+4 −0
Original line number Diff line number Diff line
@@ -1258,6 +1258,10 @@ BT_HDR* avdt_msg_asmbl(AvdtpCcb* p_ccb, BT_HDR* p_buf) { 
      return p_ret;

    }

    p_ccb->p_rx_msg = (BT_HDR*)osi_malloc(BT_DEFAULT_BUFFER_SIZE);

    if (sizeof(BT_HDR) + p_buf->offset + p_buf->len > BT_DEFAULT_BUFFER_SIZE) {

      android_errorWriteLog(0x534e4554, "232023771");

      return NULL;

    }

    memcpy(p_ccb->p_rx_msg, p_buf, sizeof(BT_HDR) + p_buf->offset + p_buf->len);



    /* Free original buffer */