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

Commit 5f73e882 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove code related to Health Device Profile and MCAP Protocol"

parents cecb3c2e 8e5dff56

BUILD.gn

+0 −7
Original line number Diff line number Diff line
@@ -39,10 +39,3 @@ group("bluetooth_tests") { 
    "//device:net_test_device",

  ]

}
 


group("test_tools") {

  testonly = true

  deps = [

    "//tools/mcap_tool:mcap_tool"

  ]

}

system/binder/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ cc_library_shared { 
        "android/bluetooth/IBluetoothProfileServiceConnection.aidl",

        "android/bluetooth/IBluetoothHeadset.aidl",

        "android/bluetooth/IBluetoothHeadsetPhone.aidl",

        "android/bluetooth/IBluetoothHealth.aidl",

        "android/bluetooth/IBluetoothHealthCallback.aidl",

        "android/bluetooth/IBluetoothHearingAid.aidl",

        "android/bluetooth/IBluetoothHidHost.aidl",

        "android/bluetooth/IBluetoothPan.aidl",
@@ -95,8 +93,6 @@ filegroup { 
        "android/bluetooth/IBluetoothProfileServiceConnection.aidl",

        "android/bluetooth/IBluetoothHeadset.aidl",

        "android/bluetooth/IBluetoothHeadsetPhone.aidl",

        "android/bluetooth/IBluetoothHealth.aidl",

        "android/bluetooth/IBluetoothHealthCallback.aidl",

        "android/bluetooth/IBluetoothHearingAid.aidl",

        "android/bluetooth/IBluetoothHidHost.aidl",

        "android/bluetooth/IBluetoothPan.aidl",

system/binder/android/bluetooth/BluetoothHealthAppConfiguration.aidl

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

** Copyright 2011, 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;



parcelable BluetoothHealthAppConfiguration;

system/binder/android/bluetooth/IBluetoothHealth.aidl

deleted100644 → 0
+0 −42
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;



import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHealthAppConfiguration;

import android.bluetooth.IBluetoothHealthCallback;

import android.os.ParcelFileDescriptor;



/**

 * API for Bluetooth Health service

 *

 * {@hide}

 */

interface IBluetoothHealth

{

    boolean registerAppConfiguration(in BluetoothHealthAppConfiguration config,

        in IBluetoothHealthCallback callback);

    boolean unregisterAppConfiguration(in BluetoothHealthAppConfiguration config);

    boolean connectChannelToSource(in BluetoothDevice device, in BluetoothHealthAppConfiguration config);

    boolean connectChannelToSink(in BluetoothDevice device, in BluetoothHealthAppConfiguration config,

        int channelType);

    boolean disconnectChannel(in BluetoothDevice device, in BluetoothHealthAppConfiguration config, int id);

    ParcelFileDescriptor getMainChannelFd(in BluetoothDevice device, in BluetoothHealthAppConfiguration config);

    List<BluetoothDevice> getConnectedHealthDevices();

    List<BluetoothDevice> getHealthDevicesMatchingConnectionStates(in int[] states);

    int getHealthDeviceConnectionState(in BluetoothDevice device);

}

system/binder/android/bluetooth/IBluetoothHealthCallback.aidl

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright 2011, 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;



import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHealthAppConfiguration;

import android.os.ParcelFileDescriptor;



/**

 *@hide

 */

interface IBluetoothHealthCallback

{

    void onHealthAppConfigurationStatusChange(in BluetoothHealthAppConfiguration config, int status);

    void onHealthChannelStateChange(in BluetoothHealthAppConfiguration config,

        in BluetoothDevice device, int prevState, int newState, in

        ParcelFileDescriptor fd, int id);

}