From 06f5fc5de0e2b49b11e7526f579035855ff2394e Mon Sep 17 00:00:00 2001
From: chapin <chapin@google.com>
Date: Thu, 7 Jan 2021 17:00:29 +0000
Subject: [PATCH] Revert "Updateability: Remove IBluetoothHeadsetPhone aidl"

Revert submission 1311861-BluetoothInCallService

Reason for revert: Bug: 176883407
Reverted Changes:
Ie3a5ceda5:UpdateAbility: Implement BluetoothInCallService an...
I2e3bc64eb:Updateability: Remove IBluetoothHeadsetPhone aidl
If26bab4ad:Bluetooth updateability: Move BluetoothPhoneServic...

Change-Id: Ia301026b4ce2cadd5e27c878f74f91c504be014f
---
 binder/Android.bp                                  |  2 ++
 .../android/bluetooth/IBluetoothHeadsetPhone.aidl  | 39 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 binder/android/bluetooth/IBluetoothHeadsetPhone.aidl

diff --git a/binder/Android.bp b/binder/Android.bp
index 095405923..74edefbcd 100644
--- a/binder/Android.bp
+++ b/binder/Android.bp
@@ -18,6 +18,7 @@ cc_library_shared {
         "android/bluetooth/IBluetoothCallback.aidl",
         "android/bluetooth/IBluetoothProfileServiceConnection.aidl",
         "android/bluetooth/IBluetoothHeadset.aidl",
+        "android/bluetooth/IBluetoothHeadsetPhone.aidl",
         "android/bluetooth/IBluetoothHearingAid.aidl",
         "android/bluetooth/IBluetoothHidHost.aidl",
         "android/bluetooth/IBluetoothPan.aidl",
@@ -92,6 +93,7 @@ filegroup {
         "android/bluetooth/IBluetoothCallback.aidl",
         "android/bluetooth/IBluetoothProfileServiceConnection.aidl",
         "android/bluetooth/IBluetoothHeadset.aidl",
+        "android/bluetooth/IBluetoothHeadsetPhone.aidl",
         "android/bluetooth/IBluetoothHearingAid.aidl",
         "android/bluetooth/IBluetoothHidHost.aidl",
         "android/bluetooth/IBluetoothLeAudio.aidl",
diff --git a/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl b/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl
new file mode 100644
index 000000000..830978065
--- /dev/null
+++ b/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2012 The Android Open Source Project
+ *
+ * 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
+ *
+ *      http://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.
+ */
+
+package android.bluetooth;
+
+/**
+ * API for Bluetooth Headset Phone Service in phone app
+ *
+ * {@hide}
+ */
+interface IBluetoothHeadsetPhone {
+  // Internal functions, not be made public
+  boolean answerCall();
+  boolean hangupCall();
+  boolean sendDtmf(int dtmf);
+  boolean processChld(int chld);
+  String getNetworkOperator();
+  String getSubscriberNumber();
+  boolean listCurrentCalls();
+  boolean queryPhoneState();
+
+  // Internal for phone app to call
+  void updateBtHandsfreeAfterRadioTechnologyChange();
+  void cdmaSwapSecondCallState();
+  void cdmaSetSecondCallState(boolean state);
+}
-- 
2.11.0