From 05de0b9ac3d431f2079d3fc46b2c315a4c11f2cd Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Fri, 28 Aug 2020 16:27:22 -0700 Subject: [PATCH] Remove unreferenced mce file & headers Bug: 159815595 Tag: #refactor Test: compile & verify basic functions working Change-Id: I5f9a8ff41e9905298fc955c1fcf5fb0018f52760 --- btif/Android.bp | 1 - btif/BUILD.gn | 1 - btif/include/btif_mce.h | 31 --------------------------- btif/src/btif_mce.cc | 45 --------------------------------------- include/hardware/bt_mce.h | 54 ----------------------------------------------- 5 files changed, 132 deletions(-) delete mode 100644 btif/include/btif_mce.h delete mode 100644 btif/src/btif_mce.cc delete mode 100644 include/hardware/bt_mce.h diff --git a/btif/Android.bp b/btif/Android.bp index dd2412139..fde708902 100755 --- a/btif/Android.bp +++ b/btif/Android.bp @@ -72,7 +72,6 @@ cc_library_static { "src/btif_hf_client.cc", "src/btif_hh.cc", "src/btif_hd.cc", - "src/btif_mce.cc", "src/btif_pan.cc", "src/btif_profile_queue.cc", "src/btif_rc.cc", diff --git a/btif/BUILD.gn b/btif/BUILD.gn index 5e78d7da2..0efd55a61 100644 --- a/btif/BUILD.gn +++ b/btif/BUILD.gn @@ -48,7 +48,6 @@ static_library("btif") { "src/btif_hf_client.cc", "src/btif_hh.cc", "src/btif_hd.cc", - "src/btif_mce.cc", "src/btif_pan.cc", "src/btif_profile_queue.cc", "src/btif_rc.cc", diff --git a/btif/include/btif_mce.h b/btif/include/btif_mce.h deleted file mode 100644 index 85a085dfa..000000000 --- a/btif/include/btif_mce.h +++ /dev/null @@ -1,31 +0,0 @@ -/****************************************************************************** - * - * Copyright 2014 The Android Open Source Project - * Copyright 2009-2012 Broadcom Corporation - * - * 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. - * - ******************************************************************************/ - -/******************************************************************************* - * - * Filename: btif_mce.h - * - * Description: Bluetooth MCE Interface - * - ******************************************************************************/ - -#ifndef BTIF_MCE_H -#define BTIF_MCE_H - -#endif diff --git a/btif/src/btif_mce.cc b/btif/src/btif_mce.cc deleted file mode 100644 index f7136cc8f..000000000 --- a/btif/src/btif_mce.cc +++ /dev/null @@ -1,45 +0,0 @@ -/****************************************************************************** - * - * Copyright 2014 The Android Open Source Project - * Copyright 2009-2012 Broadcom Corporation - * - * 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. - * - ******************************************************************************/ - -/******************************************************************************* - * - * Filename: btif_mce.c - * - * Description: Message Access Profile (MCE role) Bluetooth Interface - * - * - ******************************************************************************/ - -#define LOG_TAG "bt_btif_mce" - -#include -#include - -#include -#include - -#include "bt_types.h" -#include "bta_api.h" -#include "btif_common.h" -#include "btif_util.h" - -/***************************************************************************** - * Static variables - *****************************************************************************/ - diff --git a/include/hardware/bt_mce.h b/include/hardware/bt_mce.h deleted file mode 100644 index 0bb15d40d..000000000 --- a/include/hardware/bt_mce.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2014 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. - */ - -#ifndef ANDROID_INCLUDE_BT_MCE_H -#define ANDROID_INCLUDE_BT_MCE_H - -__BEGIN_DECLS - -/** MAS instance description */ -typedef struct { - int id; - int scn; - int msg_types; - char* p_name; -} btmce_mas_instance_t; - -/** callback for get_remote_mas_instances */ -typedef void (*btmce_remote_mas_instances_callback)( - bt_status_t status, RawAddress* bd_addr, int num_instances, - btmce_mas_instance_t* instances); - -typedef struct { - /** set to sizeof(btmce_callbacks_t) */ - size_t size; - btmce_remote_mas_instances_callback remote_mas_instances_cb; -} btmce_callbacks_t; - -typedef struct { - /** set to size of this struct */ - size_t size; - - /** register BT MCE callbacks */ - bt_status_t (*init)(btmce_callbacks_t* callbacks); - - /** search for MAS instances on remote device */ - bt_status_t (*get_remote_mas_instances)(RawAddress* bd_addr); -} btmce_interface_t; - -__END_DECLS - -#endif /* ANDROID_INCLUDE_BT_MCE_H */ -- 2.11.0