Revert "CRAS: Add ResendBatteryLevel method"

This reverts commit 8d1d6e4b4ed255ca82e63eb40deeaa1a48c65e7d.

The BluetoothBatteryChanged signal and ResendBluetoothBattery are no
longer needed since battery reporting has been consolidated to BlueZ.

BUG=b:172361090
TEST=Tested with GID6B that battery reporting works via BlueZ Battery
Provider API.

Change-Id: I4e7f3eb98ecd40a1799c1fb40f7477614948cf9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/2593234
Reviewed-by: Hsinyu Chao <hychao@chromium.org>
Commit-Queue: Sonny Sasaka <sonnysasaka@chromium.org>
Tested-by: Sonny Sasaka <sonnysasaka@chromium.org>

5 files changed, 0 insertions, 43 deletions

diff --git a/cras/src/server/cras_dbus_control.c b/cras/src/server/cras_dbus_control.c
index 5c5ed155..528d1755 100644
--- a/cras/src/server/cras_dbus_control.c
+++ b/cras/src/server/cras_dbus_control.c
@@ -137,8 +137,6 @@
 	"    <method name=\"SetPlayerMetadata\">\n"                             \
 	"      <arg name=\"metadata\" type=\"a{sv}\" direction=\"in\"/>\n"      \
 	"    </method>\n"                                                       \
-	"    <method name=\"ResendBluetoothBattery\">\n"                        \
-	"    </method>\n"                                                       \
 	"  </interface>\n"                                                      \
 	"  <interface name=\"" DBUS_INTERFACE_INTROSPECTABLE "\">\n"            \
 	"    <method name=\"Introspect\">\n"                                    \
@@ -1060,17 +1058,6 @@ static DBusHandlerResult handle_set_player_metadata(DBusConnection *conn,
 	return DBUS_HANDLER_RESULT_HANDLED;
 }
 
-static DBusHandlerResult handle_resend_bluetooth_battery(DBusConnection *conn,
-							 DBusMessage *message,
-							 void *arg)
-{
-	cras_hfp_ag_resend_device_battery_level();
-
-	send_empty_reply(conn, message);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
 /* Handle incoming messages. */
 static DBusHandlerResult handle_control_message(DBusConnection *conn,
 						DBusMessage *message, void *arg)
@@ -1210,9 +1197,6 @@ static DBusHandlerResult handle_control_message(DBusConnection *conn,
 	} else if (dbus_message_is_method_call(message, CRAS_CONTROL_INTERFACE,
 					       "SetPlayerMetadata")) {
 		return handle_set_player_metadata(conn, message, arg);
-	} else if (dbus_message_is_method_call(message, CRAS_CONTROL_INTERFACE,
-					       "ResendBluetoothBattery")) {
-		return handle_resend_bluetooth_battery(conn, message, arg);
 	}
 
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
diff --git a/cras/src/server/cras_hfp_ag_profile.c b/cras/src/server/cras_hfp_ag_profile.c
index 9d59d40e..b5fcecc3 100644
--- a/cras/src/server/cras_hfp_ag_profile.c
+++ b/cras/src/server/cras_hfp_ag_profile.c
@@ -20,7 +20,6 @@
 #include "cras_server_metrics.h"
 #include "cras_system_state.h"
 #include "cras_iodev_list.h"
-#include "cras_observer.h"
 #include "utlist.h"
 #include "packet_status_logger.h"
 
@@ -461,19 +460,6 @@ struct packet_status_logger *cras_hfp_ag_get_wbs_logger()
 	return &wbs_logger;
 }
 
-void cras_hfp_ag_resend_device_battery_level()
-{
-	struct audio_gateway *ag;
-	int level;
-	DL_FOREACH (connected_ags, ag) {
-		level = hfp_slc_get_hf_battery_level(ag->slc_handle);
-		if (level >= 0 && level <= 100)
-			cras_observer_notify_bt_battery_changed(
-				cras_bt_device_address(ag->device),
-				(uint32_t)(level));
-	}
-}
-
 int cras_hsp_ag_profile_create(DBusConnection *conn)
 {
 	return cras_bt_add_profile(conn, &cras_hsp_ag_profile);
diff --git a/cras/src/server/cras_hfp_ag_profile.h b/cras/src/server/cras_hfp_ag_profile.h
index 50d27e05..3de56184 100644
--- a/cras/src/server/cras_hfp_ag_profile.h
+++ b/cras/src/server/cras_hfp_ag_profile.h
@@ -56,8 +56,4 @@ struct hfp_slc_handle *cras_hfp_ag_get_slc(struct cras_bt_device *device);
 /* Gets the logger for WBS packet status. */
 struct packet_status_logger *cras_hfp_ag_get_wbs_logger();
 
-/* Iterate all possible AGs (theoratically only one) and signal its battery
- * level */
-void cras_hfp_ag_resend_device_battery_level();
-
 #endif /* CRAS_HFP_AG_PROFILE_H_ */
diff --git a/cras/src/server/cras_hfp_slc.c b/cras/src/server/cras_hfp_slc.c
index e4f0127d..11c89bec 100644
--- a/cras/src/server/cras_hfp_slc.c
+++ b/cras/src/server/cras_hfp_slc.c
@@ -1314,8 +1314,3 @@ int hfp_slc_get_hf_supports_battery_indicator(struct hfp_slc_handle *handle)
 {
 	return handle->hf_supports_battery_indicator;
 }
-
-int hfp_slc_get_hf_battery_level(struct hfp_slc_handle *handle)
-{
-	return handle->hf_battery;
-}
diff --git a/cras/src/server/cras_hfp_slc.h b/cras/src/server/cras_hfp_slc.h
index c3cdc117..90c1e79f 100644
--- a/cras/src/server/cras_hfp_slc.h
+++ b/cras/src/server/cras_hfp_slc.h
@@ -145,10 +145,6 @@ int hfp_slc_get_ag_codec_negotiation_supported(struct hfp_slc_handle *handle);
  * Apple, HFP, none, or both. */
 int hfp_slc_get_hf_supports_battery_indicator(struct hfp_slc_handle *handle);
 
-/* Gets the battery level for the HF. The data ranges 0 ~ 100. Use -1 for no
- * battery level reported.*/
-int hfp_slc_get_hf_battery_level(struct hfp_slc_handle *handle);
-
 /* Init the codec negotiation process if needed. */
 int hfp_slc_codec_connection_setup(struct hfp_slc_handle *handle);