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

Commit 2e7ae09f authored by Mingguang Xu's avatar Mingguang Xu
Browse files

BTAA: propagate app uid and package name to BTAA module 



Tag: #feature

Bug: 202527952
Bug: 172501038

Test: mmma -j packages/modules/Bluetooth

Signed-off-by: default avatarMingguang Xu <mingguangxu@google.com>
Change-Id: I0da56b8648ac1218497f3d89555bd9db488e712c
parent f5028672

system/gd/btaa/activity_attribution.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ class ActivityAttribution : public bluetooth::Module { 
  void OnWakelockReleased();

  void OnWakeup();

  void RegisterActivityAttributionCallback(ActivityAttributionCallback* callback);

  void NotifyActivityAttributionInfo(int uid, const std::string& package_name, const std::string& device_address);



  static const ModuleFactory Factory;

system/gd/btaa/android/activity_attribution.cc

+9 −0
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ struct ActivityAttribution::impl { 
    callback_ = callback;

  }



  void notify_activity_attribution_info(int uid, const std::string& package_name, const std::string& device_address) {

    attribution_processor_.NotifyActivityAttributionInfo(uid, package_name, device_address);

  }



  void Dump(

      std::promise<flatbuffers::Offset<ActivityAttributionData>> promise, flatbuffers::FlatBufferBuilder* fb_builder) {

    attribution_processor_.Dump(std::move(promise), fb_builder);
@@ -212,6 +216,11 @@ void ActivityAttribution::RegisterActivityAttributionCallback(ActivityAttributio 
  CallOn(pimpl_.get(), &impl::register_callback, callback);

}



void ActivityAttribution::NotifyActivityAttributionInfo(

    int uid, const std::string& package_name, const std::string& device_address) {

  CallOn(pimpl_.get(), &impl::notify_activity_attribution_info, uid, package_name, device_address);

}



std::string ActivityAttribution::ToString() const {

  return "Btaa Module";

}

system/gd/btaa/attribution_processor.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ class AttributionProcessor { 
  void OnBtaaPackets(std::vector<BtaaHciPacket> btaa_packets);

  void OnWakelockReleased(uint32_t duration_ms);

  void OnWakeup();

  void NotifyActivityAttributionInfo(int uid, const std::string& package_name, const std::string& device_address);

  void Dump(

      std::promise<flatbuffers::Offset<ActivityAttributionData>> promise, flatbuffers::FlatBufferBuilder* fb_builder);

system/gd/btaa/host/activity_attribution.cc

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ void ActivityAttribution::OnWakeup() {} 


void ActivityAttribution::RegisterActivityAttributionCallback(ActivityAttributionCallback* callback) {}



void ActivityAttribution::NotifyActivityAttributionInfo(

    int uid, const std::string& package_name, const std::string& device_address) {}



std::string ActivityAttribution::ToString() const {

  return "Btaa Module";

}

system/gd/btaa/linux/activity_attribution.cc

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ void ActivityAttribution::Capture(const hal::HciPacket& packet, hal::SnoopLogger 


void ActivityAttribution::RegisterActivityAttributionCallback(ActivityAttributionCallback* callback) {}



void ActivityAttribution::NotifyActivityAttributionInfo(

    int uid, const std::string& package_name, const std::string& device_address) {}



std::string ActivityAttribution::ToString() const {

  return "Btaa Module";

}