directly call data loader manager service from incremental service
BUG: 150406132
Test: atest service.incremental_test
Test: atest PackageManagerShellCommandIncrementalTest
Change-Id: I2bb75d5adae58d2471478f6a4d2354058d7b0dab
diff --git a/services/incremental/ServiceWrappers.cpp b/services/incremental/ServiceWrappers.cpp
index 5d978a1c..2e31ef1 100644
--- a/services/incremental/ServiceWrappers.cpp
+++ b/services/incremental/ServiceWrappers.cpp
@@ -23,7 +23,7 @@
namespace android::os::incremental {
static constexpr auto kVoldServiceName = "vold"sv;
-static constexpr auto kIncrementalManagerName = "incremental"sv;
+static constexpr auto kDataLoaderManagerName = "dataloader_manager"sv;
RealServiceManager::RealServiceManager(sp<IServiceManager> serviceManager)
: mServiceManager(std::move(serviceManager)) {}
@@ -46,11 +46,11 @@
return nullptr;
}
-std::unique_ptr<IncrementalManagerWrapper> RealServiceManager::getIncrementalManager() {
- sp<IIncrementalManager> manager =
- RealServiceManager::getRealService<IIncrementalManager>(kIncrementalManagerName);
+std::unique_ptr<DataLoaderManagerWrapper> RealServiceManager::getDataLoaderManager() {
+ sp<IDataLoaderManager> manager =
+ RealServiceManager::getRealService<IDataLoaderManager>(kDataLoaderManagerName);
if (manager) {
- return std::make_unique<RealIncrementalManager>(manager);
+ return std::make_unique<RealDataLoaderManager>(manager);
}
return nullptr;
}