Revert "Add useVrFlinger() method to SurfaceFlinger ConfigStore"
This reverts commit d78f6b34b68af98e3a59e90edcf19493fc986e12.
broke multiple builds, e.g.
https://android-build.googleplex.com/builds/submitted/3833064/test_suites_x86_64_fastbuild3d_linux/latest/logs
Change-Id: Id0dea5b63fad8896a186486d137d8505aad12c26
diff --git a/configstore/1.0/ISurfaceFlingerConfigs.hal b/configstore/1.0/ISurfaceFlingerConfigs.hal
index c7fb78b..43c96ee 100644
--- a/configstore/1.0/ISurfaceFlingerConfigs.hal
+++ b/configstore/1.0/ISurfaceFlingerConfigs.hal
@@ -96,12 +96,4 @@
* mechanism which significantly reduces buffer processing latency.
*/
hasSyncFramework() generates(OptionalBool value);
-
- /*
- * Return true if surface flinger should use vr flinger for compatible vr
- * apps, false otherwise. Devices that will never be running vr apps should
- * return false to avoid extra resource usage. Daydream ready devices must
- * return true for full vr support.
- */
- useVrFlinger() generates (OptionalBool value);
};
diff --git a/configstore/1.0/default/SurfaceFlingerConfigs.cpp b/configstore/1.0/default/SurfaceFlingerConfigs.cpp
index fc66c59..e8872e8 100644
--- a/configstore/1.0/default/SurfaceFlingerConfigs.cpp
+++ b/configstore/1.0/default/SurfaceFlingerConfigs.cpp
@@ -111,18 +111,6 @@
return Void();
}
-Return<void> SurfaceFlingerConfigs::useVrFlinger(useVrFlinger_cb _hidl_cb) {
- bool value = false;
- bool specified = false;
-#ifdef USE_VR_FLINGER
- value = true;
- specified = true;
-#endif
- _hidl_cb({specified, value});
- LOG(INFO) << "SurfaceFlinger UseVrFlinger: " << (value ? "true" : "false");
- return Void();
-}
-
// Methods from ::android::hidl::base::V1_0::IBase follow.
ISurfaceFlingerConfigs* HIDL_FETCH_ISurfaceFlingerConfigs(const char* /* name */) {
return new SurfaceFlingerConfigs();
diff --git a/configstore/1.0/default/SurfaceFlingerConfigs.h b/configstore/1.0/default/SurfaceFlingerConfigs.h
index b0aaaf8..bea1ab1 100644
--- a/configstore/1.0/default/SurfaceFlingerConfigs.h
+++ b/configstore/1.0/default/SurfaceFlingerConfigs.h
@@ -34,7 +34,6 @@
Return<void> useHwcForRGBtoYUV(useHwcForRGBtoYUV_cb _hidl_cb) override;
Return<void> maxVirtualDisplaySize(maxVirtualDisplaySize_cb _hidl_cb) override;
Return<void> hasSyncFramework(hasSyncFramework_cb _hidl_cb) override;
- Return<void> useVrFlinger(useVrFlinger_cb _hidl_cb) override;
// Methods from ::android::hidl::base::V1_0::IBase follow.
diff --git a/configstore/1.0/default/surfaceflinger.mk b/configstore/1.0/default/surfaceflinger.mk
index 7837498..6e63fdc 100644
--- a/configstore/1.0/default/surfaceflinger.mk
+++ b/configstore/1.0/default/surfaceflinger.mk
@@ -46,7 +46,3 @@
ifeq ($(TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK),true)
LOCAL_CFLAGS += -DRUNNING_WITHOUT_SYNC_FRAMEWORK
endif
-
-ifneq ($(USE_VR_FLINGER),)
- LOCAL_CFLAGS += -DUSE_VR_FLINGER
-endif