Merge "Improve the volume control profile log readability" (d2ff3b06) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/vc/vc.cc

+12 −15

Original line number	Diff line number	Diff line
		@@ -274,7 +274,6 @@ class VolumeControlImpl : public VolumeControl {
		STREAM_TO_UINT8(device->mute, pp);
		STREAM_TO_UINT8(device->change_counter, pp);

		LOG(INFO) << __func__ << " " << base::HexEncode(value, len);
		LOG(INFO) << __func__ << " volume " << loghex(device->volume) << " mute "
		<< loghex(device->mute) << " change_counter "
		<< loghex(device->change_counter);
		@@ -289,7 +288,6 @@ class VolumeControlImpl : public VolumeControl {
		uint8_t* value) {
		device->flags = *value;

		LOG(INFO) << __func__ << " " << base::HexEncode(value, len);
		LOG(INFO) << __func__ << " flags " << loghex(device->flags);
		}

		@@ -338,8 +336,7 @@ class VolumeControlImpl : public VolumeControl {
		return;
		}

		LOG(INFO) << __func__ << ": " << address;
		LOG(INFO) << "GAP_EVT_CONN_CLOSED: " << device->address;
		LOG(INFO) << __func__ << " GAP_EVT_CONN_CLOSED: " << device->address;
		device_cleanup_helper(device, true);
		}

		@@ -417,7 +414,7 @@ class VolumeControlImpl : public VolumeControl {
		// VerifyReady sets the device_ready flag if all remaining GATT operations
		// are completed
		if (device->VerifyReady(handle)) {
		LOG(INFO) << __func__ << "Outstanding reads completed ";
		LOG(INFO) << __func__ << " Outstanding reads completed.";

		callbacks_->OnConnectionState(ConnectionState::CONNECTED,
		device->address);
		@@ -555,7 +552,7 @@ void VolumeControl::AddFromStorage(const RawAddress& address,

		void VolumeControl::CleanUp() {
		if (!instance) {
		LOG(ERROR) << "not initialized!";
		LOG(ERROR) << "Not initialized!";
		return;
		}