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

Commit e7aaad8a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Un-include btsnoop[_mem]" am: 22c1d198 am: 6bd1f528 am: 1f5bce7f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1914584

Change-Id: I76cdd8fbdaf4e5d26357ccd2deea79f9d8ccb909
parents 20c8ebe6 1f5bce7f

system/btif/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ cc_defaults { 
        "src/btif_config_transcode.cc",

        "src/btif_core.cc",

        "src/btif_csis_client.cc",

        "src/btif_debug_btsnoop.cc",

        "src/btif_debug_conn.cc",

        "src/btif_dm.cc",

        "src/btif_gatt.cc",

system/btif/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ static_library("btif") { 
    "src/btif_config_cache.cc",

    "src/btif_config_transcode.cc",

    "src/btif_core.cc",

    "src/btif_debug_btsnoop.cc",

    "src/btif_debug_conn.cc",

    "src/btif_dm.cc",

    "src/btif_gatt.cc",

system/btif/src/bluetooth.cc

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
#include "btif_av.h"

#include "btif_bqr.h"

#include "btif_config.h"

#include "btif_debug_btsnoop.h"

#include "btif_debug_conn.h"

#include "btif_hf.h"

#include "btif_keystore.h"

system/btif/src/btif_debug_btsnoop.cc

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <resolv.h>

#include <zlib.h>



#include "btif/include/btif_debug_btsnoop.h"

#include "hci/include/btsnoop_mem.h"

#include "internal_include/bt_target.h"

#include "osi/include/properties.h"

#include "osi/include/ringbuffer.h"

system/test/mock/mock_hci_btsnoop_mem.cc

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

 * Copyright 2021 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.

 */



/*

 * Generated mock file from original source file

 *   Functions generated:3

 */



#include <map>

#include <string>



extern std::map<std::string, int> mock_function_count_map;



#include <base/logging.h>

#include "gd/common/init_flags.h"

#include "hci/include/btsnoop_mem.h"



#ifndef UNUSED_ATTR

#define UNUSED_ATTR

#endif



void activity_attribution_set_callback(activity_attribution_cb cb) {

  mock_function_count_map[__func__]++;

}

void btsnoop_mem_capture(const BT_HDR* packet, uint64_t timestamp_us) {

  mock_function_count_map[__func__]++;

}

void btsnoop_mem_set_callback(btsnoop_data_cb cb) {

  mock_function_count_map[__func__]++;

}