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

Commit e15f7d3e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bluetooth-tmap" am: 0e385aee 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2144999



Change-Id: I321e4b0b2f567ba4f6df6565ec308eaa11cd7530
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9aead06 0e385aee

system/bta/le_audio/audio_set_configurations.json

+1052 −113

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/le_audio/audio_set_scenarios.json

+26 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,12 @@ 
            "configurations": [

            "configurations": [

                "DualDev_OneChanStereoSnk_48_4_Server_Preferred",

                "DualDev_OneChanStereoSnk_48_4_Server_Preferred",

                "DualDev_OneChanStereoSnk_48_4_2",

                "DualDev_OneChanStereoSnk_48_4_2",

                "DualDev_OneChanStereoSnk_48_3_Server_Preferred",

                "DualDev_OneChanStereoSnk_48_3_2",

                "DualDev_OneChanStereoSnk_48_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_48_2_2",

                "DualDev_OneChanStereoSnk_48_1_Server_Preferred",

                "DualDev_OneChanStereoSnk_48_1_2",

                "DualDev_OneChanStereoSnk_24_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_24_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_24_2_2",

                "DualDev_OneChanStereoSnk_24_2_2",

                "DualDev_OneChanStereoSnk_16_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_16_2_Server_Preferred",
@@ -110,6 +116,12 @@ 
                "DualDev_OneChanStereoSnk_16_1_2",

                "DualDev_OneChanStereoSnk_16_1_2",

                "SingleDev_OneChanStereoSnk_48_4_Server_Preferred",

                "SingleDev_OneChanStereoSnk_48_4_Server_Preferred",

                "SingleDev_OneChanStereoSnk_48_4_2",

                "SingleDev_OneChanStereoSnk_48_4_2",

                "SingleDev_OneChanStereoSnk_48_3_Server_Preferred",

                "SingleDev_OneChanStereoSnk_48_3_2",

                "SingleDev_OneChanStereoSnk_48_2_Server_Preferred",

                "SingleDev_OneChanStereoSnk_48_2_2",

                "SingleDev_OneChanStereoSnk_48_1_Server_Preferred",

                "SingleDev_OneChanStereoSnk_48_1_2",

                "SingleDev_OneChanStereoSnk_24_2_Server_Preferred",

                "SingleDev_OneChanStereoSnk_24_2_Server_Preferred",

                "SingleDev_OneChanStereoSnk_24_2_2",

                "SingleDev_OneChanStereoSnk_24_2_2",

                "SingleDev_OneChanStereoSnk_16_2_Server_Preferred",

                "SingleDev_OneChanStereoSnk_16_2_Server_Preferred",
@@ -118,6 +130,14 @@ 
                "SingleDev_OneChanStereoSnk_16_1_2",

                "SingleDev_OneChanStereoSnk_16_1_2",

                "SingleDev_TwoChanStereoSnk_48_4_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_48_4_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_48_4_2",

                "SingleDev_TwoChanStereoSnk_48_4_2",

                "SingleDev_TwoChanStereoSnk_48_4_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_48_4_2",

                "SingleDev_TwoChanStereoSnk_48_3_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_48_3_2",

                "SingleDev_TwoChanStereoSnk_48_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_48_2_2",

                "SingleDev_TwoChanStereoSnk_48_1_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_48_1_2",

                "SingleDev_TwoChanStereoSnk_24_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_24_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_24_2_2",

                "SingleDev_TwoChanStereoSnk_24_2_2",

                "SingleDev_TwoChanStereoSnk_16_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_16_2_Server_Preferred",
@@ -126,6 +146,12 @@ 
                "SingleDev_TwoChanStereoSnk_16_1_2",

                "SingleDev_TwoChanStereoSnk_16_1_2",

                "SingleDev_OneChanMonoSnk_48_4_Server_Preferred",

                "SingleDev_OneChanMonoSnk_48_4_Server_Preferred",

                "SingleDev_OneChanMonoSnk_48_4_2",

                "SingleDev_OneChanMonoSnk_48_4_2",

                "SingleDev_OneChanMonoSnk_48_3_Server_Preferred",

                "SingleDev_OneChanMonoSnk_48_3_2",

                "SingleDev_OneChanMonoSnk_48_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_48_2_2",

                "SingleDev_OneChanMonoSnk_48_1_Server_Preferred",

                "SingleDev_OneChanMonoSnk_48_1_2",

                "SingleDev_OneChanMonoSnk_24_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_24_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_24_2_2",

                "SingleDev_OneChanMonoSnk_24_2_2",

                "SingleDev_OneChanMonoSnk_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_16_2_Server_Preferred",

system/bta/le_audio/client.cc

+27 −0
Original line number Original line Diff line number Diff line
@@ -1286,6 +1286,9 @@ class LeAudioClientImpl : public LeAudioClient { 




      if (ParseAseCtpNotification(*ntf, len, value))

      if (ParseAseCtpNotification(*ntf, len, value))

        ControlPointNotificationHandler(*ntf);

        ControlPointNotificationHandler(*ntf);

    } else if (hdl == leAudioDevice->tmap_role_hdl_) {

      le_audio::client_parser::tmap::ParseTmapRole(leAudioDevice->tmap_role_,

                                                   len, value);

    } else {

    } else {

      LOG(ERROR) << __func__ << ", Unknown attribute read: " << loghex(hdl);

      LOG(ERROR) << __func__ << ", Unknown attribute read: " << loghex(hdl);

    }

    }
@@ -1581,6 +1584,7 @@ class LeAudioClientImpl : public LeAudioClient { 




    const gatt::Service* pac_svc = nullptr;

    const gatt::Service* pac_svc = nullptr;

    const gatt::Service* ase_svc = nullptr;

    const gatt::Service* ase_svc = nullptr;

    const gatt::Service* tmas_svc = nullptr;





    std::vector<uint16_t> csis_primary_handles;

    std::vector<uint16_t> csis_primary_handles;

    uint16_t cas_csis_included_handle = 0;

    uint16_t cas_csis_included_handle = 0;
@@ -1611,6 +1615,10 @@ class LeAudioClientImpl : public LeAudioClient { 
            break;

            break;

          }

          }

        }

        }

      } else if (tmp.uuid == le_audio::uuid::kTelephonyMediaAudioServiceUuid) {

        LOG_INFO(", Found Telephony and Media Audio service, handle: %04x",

                 tmp.handle);

        tmas_svc = &tmp;

      }

      }

    }

    }
@@ -1867,6 +1875,25 @@ class LeAudioClientImpl : public LeAudioClient { 
      }

      }

    }

    }





    if (tmas_svc) {

      for (const gatt::Characteristic& charac : tmas_svc->characteristics) {

        if (charac.uuid ==

            le_audio::uuid::kTelephonyMediaAudioProfileRoleCharacteristicUuid) {

          leAudioDevice->tmap_role_hdl_ = charac.value_handle;



          /* Obtain initial state of TMAP role */

          BtaGattQueue::ReadCharacteristic(conn_id,

                                           leAudioDevice->tmap_role_hdl_,

                                           OnGattReadRspStatic, NULL);



          LOG_INFO(

              ", Found Telephony and Media Profile characteristic, "

              "handle: %04x",

              leAudioDevice->tmap_role_hdl_);

        }

      }

    }



    leAudioDevice->known_service_handles_ = true;

    leAudioDevice->known_service_handles_ = true;

    leAudioDevice->notify_connected_after_read_ = true;

    leAudioDevice->notify_connected_after_read_ = true;

system/bta/le_audio/client_parser.cc

+21 −0
Original line number Original line Diff line number Diff line
@@ -657,5 +657,26 @@ bool ParseAvailableAudioContexts(struct acs_available_audio_contexts& contexts, 
}

}

}  // namespace pacs

}  // namespace pacs





namespace tmap {



bool ParseTmapRole(std::bitset<16>& role, uint16_t len, const uint8_t* value) {

  if (len != kTmapRoleLen) {

    LOG_ERROR(

        ", Wrong len of Telephony Media Audio Profile Role, "

        "characteristic");

    return false;

  }



  STREAM_TO_UINT16(role, value);



  LOG_INFO(

      ", Telephony Media Audio Profile Role:"

      "\n\tRole: %s",

      role.to_string().c_str());



  return true;

}

}  // namespace tmap



}  // namespace client_parser

}  // namespace client_parser

}  // namespace le_audio
 
}  // namespace le_audio

system/bta/le_audio/client_parser.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -240,5 +240,13 @@ bool ParseAvailableAudioContexts(struct acs_available_audio_contexts& rsp, 
bool ParseSupportedAudioContexts(struct acs_supported_audio_contexts& rsp,

bool ParseSupportedAudioContexts(struct acs_supported_audio_contexts& rsp,

                                 uint16_t len, const uint8_t* value);

                                 uint16_t len, const uint8_t* value);

}  // namespace pacs

}  // namespace pacs



namespace tmap {



constexpr uint16_t kTmapRoleLen = 2;



bool ParseTmapRole(std::bitset<16>& role, uint16_t len, const uint8_t* value);



}  // namespace tmap

}  // namespace client_parser

}  // namespace client_parser

}  // namespace le_audio
 
}  // namespace le_audio