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

Commit 306e6fa5 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master

parents 3076bc6a 1b7e3d48

TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
      "host" : true

    },

    {

      "name" : "net_test_stack_a2dp_native",

      "name" : "net_test_stack_gatt_native",

      "host" : true

    },

    {

system/binder/android/bluetooth/IBluetoothManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -56,5 +56,7 @@ interface IBluetoothManager 
    boolean disableBle(String packageName, IBinder b);

    boolean isBleAppPresent();

    boolean isHearingAidProfileSupported();



    List<String> getSystemConfigEnabledProfilesForPackage(String packageName);

}

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -815,8 +815,8 @@ static void btif_dm_pin_req_evt(tBTA_DM_PIN_REQ* p_pin_req) { 
 ******************************************************************************/

static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ* p_ssp_cfm_req) {

  bt_bdname_t bd_name;

  uint32_t cod;

  bool is_incoming = !(pairing_cb.state == BT_BOND_STATE_BONDING);

  uint32_t cod;

  int dev_type;



  BTIF_TRACE_DEBUG("%s", __func__);

system/btif/src/btif_storage.cc

+2 −1
Original line number Diff line number Diff line
@@ -889,7 +889,8 @@ static void remove_devices_with_sample_ltk() { 


  for (RawAddress address : bad_ltk) {

    android_errorWriteLog(0x534e4554, "128437297");

    LOG(ERROR) << __func__ << ": removing bond to device using test TLK: " << address;

    LOG(ERROR) << __func__

               << ": removing bond to device using test TLK: " << address;



    btif_storage_remove_bonded_device(&address);

  }

system/embdrv/sbc/decoder/include/oi_bitstream.h

+7 −6
Original line number Diff line number Diff line
@@ -78,17 +78,18 @@ PRIVATE void OI_BITSTREAM_Write2xUINT4Aligned(OI_BITSTREAM* bs, uint8_t datum1, 
#define OI_BITSTREAM_READUINT(result, bits, ptr, value, bitPtr) \

  do {                                                          \

    OI_ASSERT((bits) <= 16);                                    \

    OI_ASSERT((bitPtr) < 16);                                   \

    OI_ASSERT((bitPtr) >= 8);                                   \

    OI_ASSERT((bitPtr) < 32);                                   \

    OI_ASSERT((bitPtr) >= 0);                                   \

                                                                \

    while ((bitPtr + bits) > 32) {                              \

      (value) = ((value) << 8) | *(ptr)++;                      \

      (bitPtr) -= 8;                                            \

    }                                                           \

                                                                \

    (result) = (value) << (bitPtr);                             \

    (result) >>= 32 - (bits);                                   \

                                                                \

    (bitPtr) += (bits);                                         \

    while ((bitPtr) >= 16) {                                    \

      (value) = ((value) << 8) | *(ptr)++;                      \

      (bitPtr) -= 8;                                            \

    }                                                           \

    OI_ASSERT(((bits) == 0) || ((result) < (1u << (bits))));    \

  } while (0)