Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e5f53c9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7071567 from c83a4c7e to sc-release 

Change-Id: Iff84864b520cb55b7d7ce46a09349a241a517d8b
parents d5c9b995 c83a4c7e

system/binder/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -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",

system/binder/android/bluetooth/IBluetoothHeadset.aidl

+3 −0
Original line number Diff line number Diff line
@@ -65,4 +65,7 @@ interface IBluetoothHeadset { 
    boolean isInbandRingingEnabled();

    boolean setPriority(in BluetoothDevice device, int connectionPolicy);

    int getPriority(in BluetoothDevice device);



    boolean isNoiseReductionSupported(in BluetoothDevice device);

    boolean isVoiceRecognitionSupported(in BluetoothDevice device);

}

system/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * 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);

}

system/bta/ag/bta_ag_cmd.cc

+1 −1
Original line number Diff line number Diff line
@@ -1448,7 +1448,7 @@ static void bta_ag_hsp_result(tBTA_AG_SCB* p_scb, 
 ******************************************************************************/

static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb,

                              const tBTA_AG_API_RESULT& result) {

  APPL_TRACE_DEBUG("bta_ag_hfp_result : res = %d", result.result);

  LOG_DEBUG("HFP connection result:%s", result.ToString().c_str());



  switch (result.result) {

    case BTA_AG_SPK_RES:

system/bta/ag/bta_ag_main.cc

+2 −0
Original line number Diff line number Diff line
@@ -503,6 +503,8 @@ void bta_ag_api_register(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features, 
 ******************************************************************************/

void bta_ag_api_result(uint16_t handle, tBTA_AG_RES result,

                       const tBTA_AG_RES_DATA& result_data) {

  LOG_DEBUG("Handle AG API result handle:0x%04x", handle);



  tBTA_AG_DATA event_data = {};

  event_data.api_result.result = result;

  event_data.api_result.data = result_data;