ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove FuseBridgeLoop class."

Browse source
This commit is contained in:
Treehugger Robot 2016-11-17 04:22:27 +00:00 • committed by Gerrit Code Review
commit 5368723cf3
2 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libappfuse/FuseBridgeLoop.cc
View file

@ -20,12 +20,13 @@
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
namespace android { namespace android {
namespace fuse {
bool FuseBridgeLoop::Start( bool StartFuseBridgeLoop(
int raw_dev_fd, int raw_proxy_fd, FuseBridgeLoop::Callback* callback) { int raw_dev_fd, int raw_proxy_fd, FuseBridgeLoopCallback* callback) {
base::unique_fd dev_fd(raw_dev_fd); base::unique_fd dev_fd(raw_dev_fd);
base::unique_fd proxy_fd(raw_proxy_fd); base::unique_fd proxy_fd(raw_proxy_fd);
fuse::FuseBuffer buffer; FuseBuffer buffer;
size_t open_count = 0; size_t open_count = 0;
LOG(DEBUG) << "Start fuse loop."; 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 fuse
} // namespace android } // namespace android

21
libappfuse/include/libappfuse/FuseBridgeLoop.h
View file

@ -20,23 +20,14 @@
#include "libappfuse/FuseBuffer.h" #include "libappfuse/FuseBuffer.h"
namespace android { namespace android {
// TODO: Remove the class after switching to StartFuseBridgeLoop in the
// framework code.
class FuseBridgeLoop final {
public:
class Callback {
public:
virtual void OnMount() = 0;
virtual ~Callback() = default;
};
bool Start(int dev_fd, int proxy_fd, Callback* callback);
};
namespace fuse { namespace fuse {
class FuseBridgeLoopCallback : public FuseBridgeLoop::Callback {}; class FuseBridgeLoopCallback {
public:
virtual void OnMount() = 0;
virtual ~FuseBridgeLoopCallback() = default;
};
bool StartFuseBridgeLoop( bool StartFuseBridgeLoop(
int dev_fd, int proxy_fd, FuseBridgeLoopCallback* callback); int dev_fd, int proxy_fd, FuseBridgeLoopCallback* callback);