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

Commit 691739b3 authored by Daichi Hirono's avatar Daichi Hirono
Browse files

Remove FuseBridgeLoop class.

Bug: 32779923
Test: libappfuse_test
Change-Id: I29a76701d141ae061ec1fe32993d27460a0c694a
parent 30e68088
Loading
Loading
Loading
Loading
+4 −10
Original line number Diff line number Diff line
@@ -20,12 +20,13 @@
#include <android-base/unique_fd.h>

namespace android {
namespace fuse {

bool FuseBridgeLoop::Start(
    int raw_dev_fd, int raw_proxy_fd, FuseBridgeLoop::Callback* callback) {
bool StartFuseBridgeLoop(
    int raw_dev_fd, int raw_proxy_fd, FuseBridgeLoopCallback* callback) {
  base::unique_fd dev_fd(raw_dev_fd);
  base::unique_fd proxy_fd(raw_proxy_fd);
  fuse::FuseBuffer buffer;
  FuseBuffer buffer;
  size_t open_count = 0;

  LOG(DEBUG) << "Start fuse loop.";
@@ -96,12 +97,5 @@ bool FuseBridgeLoop::Start(
  }
}

namespace fuse {

bool StartFuseBridgeLoop(
    int raw_dev_fd, int raw_proxy_fd, FuseBridgeLoopCallback* callback) {
  return FuseBridgeLoop().Start(raw_dev_fd, raw_proxy_fd, callback);
}

}  // namespace fuse
}  // namespace android
+4 −13
Original line number Diff line number Diff line
@@ -20,23 +20,14 @@
#include "libappfuse/FuseBuffer.h"

namespace android {
namespace fuse {

// TODO: Remove the class after switching to StartFuseBridgeLoop in the
// framework code.
class FuseBridgeLoop final {
 public:
  class Callback {
class FuseBridgeLoopCallback {
 public:
  virtual void OnMount() = 0;
    virtual ~Callback() = default;
  };

  bool Start(int dev_fd, int proxy_fd, Callback* callback);
  virtual ~FuseBridgeLoopCallback() = default;
};

namespace fuse {

class FuseBridgeLoopCallback : public FuseBridgeLoop::Callback {};
bool StartFuseBridgeLoop(
    int dev_fd, int proxy_fd, FuseBridgeLoopCallback* callback);