Merge "Revert "libui: Load a.h.graphics.mapper passthrough service on library load"" into oc-dr1-dev
am: 274f72eb9b
Change-Id: Ie94b3b6d08c4ca0a13902fd4ec71e4bc7808831f
diff --git a/libs/ui/Gralloc2.cpp b/libs/ui/Gralloc2.cpp
index e149803..87dbaf4 100644
--- a/libs/ui/Gralloc2.cpp
+++ b/libs/ui/Gralloc2.cpp
@@ -16,7 +16,6 @@
#define LOG_TAG "Gralloc2"
-#include <hidl/ServiceManagement.h>
#include <hwbinder/IPCThreadState.h>
#include <ui/Gralloc2.h>
@@ -251,17 +250,4 @@
} // namespace Gralloc2
-namespace {
-// Load the IMapper implementation library when this shared library is loaded, rather than when
-// we (lazily) create the Gralloc2::Mapper instance. Since these libraries will all be needed by
-// nearly all apps, this allows us to load them in Zygote rather than on each app launch.
-class PreloadMapperImpl {
-public:
- PreloadMapperImpl() {
- android::hardware::preloadPassthroughService<hardware::graphics::mapper::V2_0::IMapper>();
- }
-};
-static PreloadMapperImpl preloadMapperImpl;
-} // namespace
-
} // namespace android