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

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

Snap for 8464370 from 71ed7fd4 to tm-qpr1-release

Change-Id: I35acbe7865aff6cdf3cbcf0c9edb9d70a73b1056
parents ca6ac5de 71ed7fd4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1914,7 +1914,7 @@ public final class BluetoothDevice implements Parcelable, Attributable {
                    if (DBG) log("getBondState() uncached");
                    final IBluetooth service = sService;
                    final int defaultValue = BOND_NONE;
                    if (service == null || !isBluetoothEnabled()) {
                    if (service == null) {
                        Log.e(TAG, "BT not enabled. Cannot get bond state");
                        if (DBG) log(Log.getStackTraceString(new Throwable()));
                    } else {
+8 −2
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@
 *
 ******************************************************************************/

#include <base/logging.h>
#include <log/log.h>
#include <stdio.h>
#include <string.h>

@@ -37,8 +39,6 @@
#include "stack/include/bt_hdr.h"
#include "types/bluetooth/uuid.h"

#include <base/logging.h>

using base::StringPrintf;
using bluetooth::Uuid;

@@ -237,6 +237,12 @@ static tGATT_STATUS read_attr_value(tGATT_ATTR& attr16, uint16_t offset,
    uint16_t char_ext_prop =
        attr16.p_value ? attr16.p_value->char_ext_prop : 0x0000;
    *p_len = 2;

    if (mtu < *p_len) {
      android_errorWriteWithInfoLog(0x534e4554, "228078096", -1, NULL, 0);
      return GATT_NO_RESOURCES;
    }

    UINT16_TO_STREAM(p, char_ext_prop);
    *p_data = p;
    return GATT_SUCCESS;