Revert "libui: Load a.h.graphics.mapper passthrough service on library load"
This reverts commit 75ca86f072f82d38b21e0a13234ecbc2c24cb6ab.
avc: denied { read } name="hw" scontext=u:r:cameraserver:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:folio_daemon:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:hal_imsrtp:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:idmap:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:mediaextractor:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:mediametrics:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:webview_zygote:s0
tcontext=u:object_r:system_file:s0 tclass=dir
Bug: 62353585
Bug: 62912747
Bug: 35197529
Test: build and boot device. Launch camera, take pictures.
Change-Id: Ic6884f7235edb9191034a285414eb93aa44ac23c
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