libdataloader: Don't pollute namespace with android::dataloader
* Fixes clang-tidy warnings
Test: m
Change-Id: Iab849830e979f4b430ceb20047cf850838fe77d1
diff --git a/libdataloader/DataLoaderConnector.cpp b/libdataloader/DataLoaderConnector.cpp
index 5e41f4f..dfc7853 100644
--- a/libdataloader/DataLoaderConnector.cpp
+++ b/libdataloader/DataLoaderConnector.cpp
@@ -31,9 +31,10 @@
namespace {
-using namespace android::dataloader;
using namespace std::literals;
+using ReadInfo = android::dataloader::ReadInfo;
+
using FileId = android::incfs::FileId;
using RawMetadata = android::incfs::RawMetadata;
using UniqueControl = android::incfs::UniqueControl;
@@ -229,8 +230,10 @@
struct Globals {
Globals() {
- managedDataLoaderFactory = new details::DataLoaderFactoryImpl(
- [](auto jvm, auto) { return std::make_unique<ManagedDataLoader>(jvm); });
+ managedDataLoaderFactory =
+ new android::dataloader::details::DataLoaderFactoryImpl([](auto jvm, auto) {
+ return std::make_unique<android::dataloader::ManagedDataLoader>(jvm);
+ });
}
DataLoaderFactory* managedDataLoaderFactory = nullptr;
@@ -284,7 +287,8 @@
static constexpr auto kPendingReadsBufferSize = 256;
-class DataLoaderConnector : public FilesystemConnector, public StatusListener {
+class DataLoaderConnector : public android::dataloader::FilesystemConnector,
+ public android::dataloader::StatusListener {
public:
DataLoaderConnector(JNIEnv* env, jobject service, jint storageId, UniqueControl control,
jobject serviceConnector, jobject callbackControl, jobject listener)
@@ -363,7 +367,7 @@
checkAndClearJavaException(__func__);
}
- bool onPrepareImage(const DataLoaderInstallationFiles& addedFiles) {
+ bool onPrepareImage(const android::dataloader::DataLoaderInstallationFiles& addedFiles) {
CHECK(mDataLoader);
bool result =
mDataLoader->onPrepareImage(mDataLoader, addedFiles.data(), addedFiles.size());
@@ -414,7 +418,7 @@
return android::incfs::openForSpecialOps(mControl, fid);
}
- int writeBlocks(Span<const IncFsDataBlock> blocks) const {
+ int writeBlocks(android::dataloader::Span<const IncFsDataBlock> blocks) const {
return android::incfs::writeBlocks(blocks);
}