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

Commit 3c5ffc9b authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Get rid of Storage shim 

Bug: 149757450
Change-Id: I90130121c5fdf23ec8cacf19fedd4b3e154351a5
parent 1d7342c2

system/gd/facade/grpc_root_server.cc

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ 
#include "shim/l2cap.h"

#include "shim/name.h"

#include "shim/scanning.h"

#include "shim/storage.h"

#include "stack_manager.h"

#include "storage/legacy.h"



namespace bluetooth {

namespace facade {
@@ -116,7 +116,7 @@ class RootFacadeService : public ::bluetooth::facade::RootFacade::Service { 
        modules.add<::bluetooth::neighbor::PageModule>();

        modules.add<::bluetooth::shim::Scanning>();

        modules.add<::bluetooth::security::SecurityModule>();

        modules.add<::bluetooth::shim::Storage>();

        modules.add<::bluetooth::storage::LegacyModule>();

        break;

      default:

        return ::grpc::Status(::grpc::StatusCode::INVALID_ARGUMENT, "invalid module under test");

system/gd/shim/Android.bp

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

            "scanning.cc",

            "stack.cc",

            "storage.cc",

    ]

}

system/gd/shim/dumpsys.cc

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ void Dumpsys::UnregisterDumpsysFunction(const void* token) { 
      common::BindOnce(&Dumpsys::impl::UnregisterDumpsysFunction, common::Unretained(pimpl_.get()), token));

}



os::Handler* Dumpsys::GetGdShimHandler() {

  return GetHandler();

}



/**

 * Module methods

 */

system/gd/shim/dumpsys.h

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ class Dumpsys : public bluetooth::Module { 
  void RegisterDumpsysFunction(const void* token, DumpsysFunction func);

  void UnregisterDumpsysFunction(const void* token);



  /* This is not a dumpsys-specific method, we just must grab thread from of one modules */

  os::Handler* GetGdShimHandler();



  Dumpsys() = default;

  ~Dumpsys() = default;

system/gd/shim/only_include_this_file_into_legacy_stack___ever.h

+0 −1
Original line number Diff line number Diff line
@@ -38,6 +38,5 @@ class Name; 
class NameDb;

class Scanning;

class SecurityModule;

class Storage;

}  // namespace shim

}  // namespace bluetooth
 
 No newline at end of file