Revert "Bumble Java Android Headtracker Test Infra Changes"

Revert submission 3283939

Reason for revert: b/372518178

Reverted changes: /q/submissionid:3283939

Change-Id: I33951cb4b79b0c442ad87b6f0c1c348e803060cd

2 files changed, 14 insertions, 43 deletions

diff --git a/pandora/interfaces/pandora_experimental/hid.proto b/pandora/interfaces/pandora_experimental/hid.proto
index a153dc41d8..709d1577ff 100644
--- a/pandora/interfaces/pandora_experimental/hid.proto
+++ b/pandora/interfaces/pandora_experimental/hid.proto
@@ -7,8 +7,6 @@ option java_outer_classname = "HidProto";
 import "google/protobuf/empty.proto";
 
 service HID {
-  // Register service
-  rpc RegisterService(ServiceRequest) returns (google.protobuf.Empty);
   // Connect HID Host
   rpc ConnectHost(google.protobuf.Empty) returns (google.protobuf.Empty);
   // Disconnect HID Host
@@ -41,15 +39,6 @@ enum HidReportId {
   HID_INVALID_RPT_ID = 3;
 }
 
-enum HidServiceType {
-  SERVICE_TYPE_HID = 0;
-  SERVICE_TYPE_HOGP = 1;
-  SERVICE_TYPE_BOTH = 2;
-}
-
-message ServiceRequest {
-  HidServiceType service_type = 1;
-}
 message SendHostReportRequest {
   bytes address = 1;
   HidReportType report_type = 2;
diff --git a/pandora/server/bumble_experimental/hid.py b/pandora/server/bumble_experimental/hid.py
index c209e933ee..0b2f6867e2 100644
--- a/pandora/server/bumble_experimental/hid.py
+++ b/pandora/server/bumble_experimental/hid.py
@@ -18,8 +18,6 @@ from pandora_experimental.hid_pb2 import (
     PROTOCOL_REPORT_MODE,
     PROTOCOL_BOOT_MODE,
     PROTOCOL_UNSUPPORTED_MODE,
-    SERVICE_TYPE_HID,
-    SERVICE_TYPE_HOGP,
 )
 
 from bumble.core import (
@@ -704,45 +702,29 @@ def on_virtual_cable_unplug_cb():
 
 
 hid_protoMode_queue = None
-hid_device = None
-
-
-def register_hid(self) -> None:
-    self.device.sdp_service_records.update(sdp_records())
-    global hid_device
-    hid_device = HID_Device(self.device)
-    # Register for  call backs
-    hid_device.register_get_report_cb(on_get_report_cb)
-    hid_device.register_set_report_cb(on_set_report_cb)
-    hid_device.register_get_protocol_cb(on_get_protocol_cb)
-    hid_device.register_set_protocol_cb(on_set_protocol_cb)
-    # Register for virtual cable unplug call back
-    hid_device.on('virtual_cable_unplug', on_virtual_cable_unplug_cb)
 
 
 # This class implements the Hid Pandora interface.
 class HIDService(HIDServicer):
 
+    hid_device = None
+
     def __init__(self, device: Device) -> None:
         super().__init__()
         self.device = device
+        self.device.sdp_service_records.update(sdp_records())
         self.event_queue: Optional[asyncio.Queue[ProtocolModeEvent]] = None
-
-    @utils.rpc
-    async def RegisterService(self, request: empty_pb2.Empty, context: grpc.ServicerContext) -> empty_pb2.Empty:
-
-        if request.service_type == SERVICE_TYPE_HID:
-            logging.info(f'Registering HID')
-            register_hid(self)
-        elif request.service_type == SERVICE_TYPE_HOGP:
-            logging.info(f'Registering HOGP')
-            hogp_device(self.device)
-        else:
-            logging.info(f'Registering both HID and HOGP')
-            register_hid(self)
-            hogp_device(self.device)
-
-        return empty_pb2.Empty()
+        hogp_device(self.device)
+        logging.info(f'Hid device register: ')
+        global hid_device
+        hid_device = HID_Device(self.device)
+        # Register for  call backs
+        hid_device.register_get_report_cb(on_get_report_cb)
+        hid_device.register_set_report_cb(on_set_report_cb)
+        hid_device.register_get_protocol_cb(on_get_protocol_cb)
+        hid_device.register_set_protocol_cb(on_set_protocol_cb)
+        # Register for virtual cable unplug call back
+        hid_device.on('virtual_cable_unplug', on_virtual_cable_unplug_cb)
 
     @utils.rpc
     async def ConnectHost(self, request: empty_pb2.Empty, context: grpc.ServicerContext) -> empty_pb2.Empty: