Snap for 9867398 from b4e636ad25025e46b37fe44c417883ba3da61859 to udc-d1-releaseandroid-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-release

Change-Id: Id91a288d615ec3dcac3b3168975cb724ca94e75f

4 files changed, 8 insertions, 48 deletions

diff --git a/Android.bp b/Android.bp
index 607194c..13e9591 100644
--- a/Android.bp
+++ b/Android.bp
@@ -69,7 +69,6 @@ java_library {
 filegroup {
     name: "pandora-protos",
     srcs: [
-        "pandora/asha.proto",
         "pandora/host.proto",
         "pandora/security.proto",
     ],
diff --git a/pandora/asha.proto b/pandora/asha.proto
deleted file mode 100644
index 4fafc5b..0000000
--- a/pandora/asha.proto
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-option java_outer_classname = "ASHAProto";
-
-package pandora;
-
-import "google/protobuf/empty.proto";
-
-// Service to trigger Audio Streaming for Hearing Aid (ASHA) procedures.
-// ASHA uses connection-oriented L2CAP channels (CoC) and GATT.
-service ASHA {
-  // Register ASHA Service.
-  rpc Register(RegisterRequest) returns (google.protobuf.Empty);
-}
-
-// Request of the `Register` method.
-message RegisterRequest {
-  uint32 capability = 1; // left or right device, monaural or binaural device.
-  repeated uint32 hisyncid = 2; // id identifying two hearing aids as one pair.
-}
diff --git a/python/Android.bp b/python/Android.bp
index 6fdca66..00d99d4 100644
--- a/python/Android.bp
+++ b/python/Android.bp
@@ -38,10 +38,6 @@ genrule {
         "pandora/py.typed",
         "pandora/__init__.py",
         "pandora/_utils.py",
-        "pandora/asha_grpc.py",
-        "pandora/asha_grpc_aio.py",
-        "pandora/asha_pb2.py",
-        "pandora/asha_pb2.pyi",
         "pandora/host_grpc.py",
         "pandora/host_grpc_aio.py",
         "pandora/host_pb2.py",
@@ -67,7 +63,6 @@ filegroup {
     name: "pandora-python-stubs",
     srcs: [
         ":pandora-python-gen-src{pandora/py.typed}",
-        ":pandora-python-gen-src{pandora/asha_pb2.pyi}",
         ":pandora-python-gen-src{pandora/host_pb2.pyi}",
         ":pandora-python-gen-src{pandora/security_pb2.pyi}",
     ],
diff --git a/python/_build/protoc-gen-custom_grpc b/python/_build/protoc-gen-custom_grpc
index 37b31b7..7f6a381 100755
--- a/python/_build/protoc-gen-custom_grpc
+++ b/python/_build/protoc-gen-custom_grpc
@@ -273,19 +273,19 @@ def generate_service_method(imports: List[str], file: FileDescriptorProto, servi
         if input_mode == 'stream':
             output_type_hint = f'StreamStream[{input_type}, {output_type}]'
             if sync:
-                add_import(imports, f'from {file.package}._utils import Sender')
-                add_import(imports, f'from {file.package}._utils import Stream')
-                add_import(imports, f'from {file.package}._utils import StreamStream')
+                add_import(imports, f'from ._utils import Sender')
+                add_import(imports, f'from ._utils import Stream')
+                add_import(imports, f'from ._utils import StreamStream')
             else:
-                add_import(imports, f'from {file.package}._utils import AioSender as Sender')
-                add_import(imports, f'from {file.package}._utils import AioStream as Stream')
-                add_import(imports, f'from {file.package}._utils import AioStreamStream as StreamStream')
+                add_import(imports, f'from ._utils import AioSender as Sender')
+                add_import(imports, f'from ._utils import AioStream as Stream')
+                add_import(imports, f'from ._utils import AioStreamStream as StreamStream')
         else:
             output_type_hint = f'Stream[{output_type}]'
             if sync:
-                add_import(imports, f'from {file.package}._utils import Stream')
+                add_import(imports, f'from ._utils import Stream')
             else:
-                add_import(imports, f'from {file.package}._utils import AioStream as Stream')
+                add_import(imports, f'from ._utils import AioStream as Stream')
     else:
         output_type_hint = output_type if sync else f'Awaitable[{output_type}]'
         if not sync: add_import(imports, f'from typing import Awaitable')