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

Commit 64f1e604 authored by Sarvesh Kalwit's avatar Sarvesh Kalwit Committed by Gerrit Code Review
Browse files

Merge "Revert "Msft: Remove dead code from android target"" into main

parents 83be4377 cc7d9dd0

system/gd/hci/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ filegroup { 
        "le_scanning_manager.cc",

        "le_scanning_reassembler.cc",

        "link_key.cc",

        "msft.cc",

        "remote_name_request.cc",

        "uuid.cc",

    ],

system/gd/hci/msft.cc

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#if TARGET_FLOSS

#include "hci/msft.h"



#include <bluetooth/log.h>
@@ -358,4 +357,3 @@ void MsftExtensionManager::SetScanningCallback(ScanningCallback* callbacks) { 


}  // namespace hci

}  // namespace bluetooth
 
#endif

system/gd/hci/msft.h

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * limitations under the License.

 */

#pragma once

#if TARGET_FLOSS



#include "hci/hci_packets.h"

#include "hci/le_scanning_callback.h"
@@ -61,4 +60,3 @@ private: 


}  // namespace hci

}  // namespace bluetooth
 
#endif

system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc

+0 −13
Original line number Diff line number Diff line
@@ -225,8 +225,6 @@ void BleScannerIntf::ScanFilterEnable(bool enable) { 
          enable, base::Bind(&BleScannerIntf::OnEnableCallback, base::Unretained(this)));

}



#if TARGET_FLOSS



bool BleScannerIntf::IsMsftSupported() { return scanner_intf_->IsMsftSupported(); }



void BleScannerIntf::MsftAdvMonitorAdd(const RustMsftAdvMonitor& monitor) {
@@ -247,15 +245,6 @@ void BleScannerIntf::MsftAdvMonitorEnable(bool enable) { 
          base::Bind(&BleScannerIntf::OnMsftAdvMonitorEnableCallback, base::Unretained(this)));

}



#else



bool BleScannerIntf::IsMsftSupported() { return false; }

void BleScannerIntf::MsftAdvMonitorAdd(const RustMsftAdvMonitor&) {}

void BleScannerIntf::MsftAdvMonitorRemove(uint8_t) {}

void BleScannerIntf::MsftAdvMonitorEnable(bool) {}



#endif



void BleScannerIntf::SetScanParameters(uint8_t scanner_id, uint8_t scan_type,

                                       uint16_t scan_interval, uint16_t scan_window,

                                       uint8_t scan_phy) {
@@ -335,7 +324,6 @@ void BleScannerIntf::OnFilterConfigCallback(uint8_t filter_index, uint8_t filt_t 
  rusty::gdscan_filter_config_callback(filter_index, filt_type, avbl_space, action, btm_status);

}



#if TARGET_FLOSS

void BleScannerIntf::OnMsftAdvMonitorAddCallback(uint8_t monitor_handle, uint8_t status) {

  rusty::gdscan_msft_adv_monitor_add_callback(monitor_handle, status);

}
@@ -347,7 +335,6 @@ void BleScannerIntf::OnMsftAdvMonitorRemoveCallback(uint8_t status) { 
void BleScannerIntf::OnMsftAdvMonitorEnableCallback(uint8_t status) {

  rusty::gdscan_msft_adv_monitor_enable_callback(status);

}

#endif



void BleScannerIntf::OnPeriodicSyncStarted(int, uint8_t status, uint16_t sync_handle,

                                           uint8_t advertising_sid, uint8_t address_type,

system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.h

+0 −2
Original line number Diff line number Diff line
@@ -160,11 +160,9 @@ private: 
                                  uint8_t btm_status);

  void OnFilterConfigCallback(uint8_t filt_index, uint8_t filt_type, uint8_t avbl_space,

                              uint8_t action, uint8_t btm_status);

#if TARGET_FLOSS

  void OnMsftAdvMonitorAddCallback(uint8_t monitor_handle, uint8_t status);

  void OnMsftAdvMonitorRemoveCallback(uint8_t status);

  void OnMsftAdvMonitorEnableCallback(uint8_t status);

#endif



  BleScannerInterface* scanner_intf_;

};