Merge "Remove some unnecessary uses of loghex" into main (031d7cb1) · Commits · e / os / android_packages_modules_Bluetooth

system/include/hardware/avrcp/avrcp_logging_helper.h

+15 −16

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		#include <type_traits>

		#include "avrcp_common.h"
		#include "internal_include/bt_trace.h"
		#include "macros.h"

		namespace bluetooth {
		@@ -42,7 +41,7 @@ inline std::string CTypeText(const CType& type) {
		CASE_RETURN_TEXT(CType::CHANGED);
		CASE_RETURN_TEXT(CType::INTERIM);
		default:
		return "Unknown CType: " + loghex((uint8_t)type);
		return fmt::format("Unknown CType: 0x{:x}", (uint8_t)type);
		}
		}

		@@ -57,7 +56,7 @@ inline std::string OpcodeText(const Opcode& opcode) {
		CASE_RETURN_TEXT(Opcode::SUBUNIT_INFO);
		CASE_RETURN_TEXT(Opcode::PASS_THROUGH);
		default:
		return "Unknown Opcode: " + loghex((uint8_t)opcode);
		return fmt::format("Unknown Opcode: 0x{:x}", (uint8_t)opcode);
		}
		}

		@@ -79,7 +78,7 @@ inline std::string CommandPduText(const CommandPdu& pdu) {
		CASE_RETURN_TEXT(CommandPdu::SET_ADDRESSED_PLAYER);
		CASE_RETURN_TEXT(CommandPdu::PLAY_ITEM);
		default:
		return "Unknown Command PDU: " + loghex((uint8_t)pdu);
		return fmt::format("Unknown Command PDU: 0x{:x}", (uint8_t)pdu);
		}
		}

		@@ -91,7 +90,7 @@ inline std::string PacketTypeText(const PacketType& type) {
		switch (type) {
		CASE_RETURN_TEXT(PacketType::SINGLE);
		default:
		return "Unknown Packet Type: " + loghex((uint8_t)type);
		return fmt::format("Unknown Packet Type: 0x{:x}", (uint8_t)type);
		}
		}

		@@ -104,7 +103,7 @@ inline std::string CapabilityText(const Capability& cap) {
		CASE_RETURN_TEXT(Capability::COMPANY_ID);
		CASE_RETURN_TEXT(Capability::EVENTS_SUPPORTED);
		default:
		return "Unknown Capability: " + loghex((uint8_t)cap);
		return fmt::format("Unknown Capability: 0x{:x}", (uint8_t)cap);
		}
		}

		@@ -124,7 +123,7 @@ inline std::string EventText(const Event& event) {
		CASE_RETURN_TEXT(Event::UIDS_CHANGED);
		CASE_RETURN_TEXT(Event::VOLUME_CHANGED);
		default:
		return "Unknown Event: " + loghex((uint8_t)event);
		return fmt::format("Unknown Event: 0x{:x}", (uint8_t)event);
		}
		}

		@@ -143,7 +142,7 @@ inline std::string AttributeText(const Attribute& attr) {
		CASE_RETURN_TEXT(Attribute::PLAYING_TIME);
		CASE_RETURN_TEXT(Attribute::DEFAULT_COVER_ART);
		default:
		return "Unknown Attribute Value: " + loghex((uint32_t)attr);
		return fmt::format("Unknown Attribute Value: 0x{:x}", (uint32_t)attr);
		}
		}

		@@ -177,7 +176,7 @@ inline std::string StatusText(const Status& status) {
		CASE_RETURN_TEXT(Status::NO_AVAILABLE_PLAYERS);
		CASE_RETURN_TEXT(Status::ADDRESSED_PLAYER_CHANGED);
		default:
		return "Unknown Status: " + loghex((uint8_t)status);
		return fmt::format("Unknown Status: 0x{:x}", (uint8_t)status);
		}
		}

		@@ -192,7 +191,7 @@ inline std::string BrowsePduText(const BrowsePdu& pdu) {
		CASE_RETURN_TEXT(BrowsePdu::CHANGE_PATH);
		CASE_RETURN_TEXT(BrowsePdu::GET_ITEM_ATTRIBUTES);
		default:
		return "Unknown Browse PDU: " + loghex((uint8_t)pdu);
		return fmt::format("Unknown Browse PDU: 0x{:x}", (uint8_t)pdu);
		}
		}

		@@ -207,7 +206,7 @@ inline std::string ScopeText(const Scope& scope) {
		CASE_RETURN_TEXT(Scope::SEARCH);
		CASE_RETURN_TEXT(Scope::NOW_PLAYING);
		default:
		return "Unknown Scope: " + loghex((uint8_t)scope);
		return fmt::format("Unknown Scope: 0x{:x}", (uint8_t)scope);
		}
		}

		@@ -218,7 +217,7 @@ inline std::string DirectionText(const Direction& dir) {
		CASE_RETURN_TEXT(Direction::UP);
		CASE_RETURN_TEXT(Direction::DOWN);
		default:
		return "Unknown Direction: " + loghex((uint8_t)dir);
		return fmt::format("Unknown Direction: 0x{:x}", (uint8_t)dir);
		}
		}

		@@ -231,7 +230,7 @@ inline std::string KeyStateText(const KeyState& state) {
		CASE_RETURN_TEXT(KeyState::PUSHED);
		CASE_RETURN_TEXT(KeyState::RELEASED);
		default:
		return "Unknown KeyState: " + loghex((uint8_t)state);
		return fmt::format("Unknown KeyState: 0x{:x}", (uint8_t)state);
		}
		}

		@@ -246,7 +245,7 @@ inline std::string PlayerAttributeText(const PlayerAttribute& attr) {
		CASE_RETURN_TEXT(PlayerAttribute::SHUFFLE);
		CASE_RETURN_TEXT(PlayerAttribute::SCAN);
		}
		return "Unknown Player Attribute: " + loghex((uint8_t)attr);
		return fmt::format("Unknown Player Attribute: 0x{:x}", (uint8_t)attr);
		}

		inline std::ostream& operator<<(std::ostream& os, const PlayerAttribute& attr) {
		@@ -260,7 +259,7 @@ inline std::string PlayerRepeatValueText(const PlayerRepeatValue& val) {
		CASE_RETURN_TEXT(PlayerRepeatValue::ALL);
		CASE_RETURN_TEXT(PlayerRepeatValue::GROUP);
		}
		return "Unknown Player Repeat Value: " + loghex((uint8_t)val);
		return fmt::format("Unknown Player Repeat Value: 0x{:x}", (uint8_t)val);
		}

		inline std::ostream& operator<<(std::ostream& os, const PlayerRepeatValue& val) {
		@@ -273,7 +272,7 @@ inline std::string PlayerShuffleValueText(const PlayerShuffleValue& val) {
		CASE_RETURN_TEXT(PlayerShuffleValue::ALL);
		CASE_RETURN_TEXT(PlayerShuffleValue::GROUP);
		}
		return "Unknown Player Shuffle Value: " + loghex((uint8_t)val);
		return fmt::format("Unknown Player Shuffle Value: 0x{:x}", (uint8_t)val);
		}

		inline std::ostream& operator<<(std::ostream& os, const PlayerShuffleValue& val) {

system/packet/avrcp/avrcp_packet.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@
		#include <sstream>
		#include <type_traits>

		#include "internal_include/bt_trace.h"

		namespace bluetooth {
		namespace avrcp {

system/packet/avrcp/change_path.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@

		#include <base/sys_byteorder.h>

		#include "internal_include/bt_trace.h"

		namespace bluetooth {
		namespace avrcp {

system/packet/avrcp/get_current_player_application_setting_value.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		#include "get_current_player_application_setting_value.h"

		#include "internal_include/bt_trace.h"

		namespace bluetooth {
		namespace avrcp {

system/packet/avrcp/get_element_attributes_packet.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@

		#include <algorithm>

		#include "internal_include/bt_trace.h"

		namespace bluetooth {
		namespace avrcp {