From f7f7cde49dbdfddd8b4dbb240d0bc87f4002c4b3 Mon Sep 17 00:00:00 2001
From: Sundong Ahn <sundongahn@google.com>
Date: Thu, 23 Apr 2020 21:43:55 +0900
Subject: Change to using sysprop for vrflinger_test

The configstore service was deprecated. So change to use sysprop
instead of configstore.

Bug: 124531214
Test: m -j
Change-Id: I5367b5715c797facd37736eee84651addbaa230d
Merged-In: I5367b5715c797facd37736eee84651addbaa230d
(cherry picked from commit 8e852f5231d34b80a19aa5cceb0c8fec06fb3236)
---
 libs/vr/libvrflinger/tests/Android.bp         | 2 ++
 libs/vr/libvrflinger/tests/vrflinger_test.cpp | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/vr/libvrflinger/tests/Android.bp b/libs/vr/libvrflinger/tests/Android.bp
index 410e2344ce..7fafd3bf50 100644
--- a/libs/vr/libvrflinger/tests/Android.bp
+++ b/libs/vr/libvrflinger/tests/Android.bp
@@ -11,6 +11,7 @@ shared_libs = [
     "libutils",
     "libnativewindow",
     "libpdx_default_transport",
+    "libSurfaceFlingerProp",
 ]
 
 static_libs = [
@@ -32,5 +33,6 @@ cc_test {
         "-Wall",
         "-Werror",
     ],
+    header_libs: ["libsurfaceflinger_headers"],
     name: "vrflinger_test",
 }
diff --git a/libs/vr/libvrflinger/tests/vrflinger_test.cpp b/libs/vr/libvrflinger/tests/vrflinger_test.cpp
index 7075e88267..efd6d1dcd7 100644
--- a/libs/vr/libvrflinger/tests/vrflinger_test.cpp
+++ b/libs/vr/libvrflinger/tests/vrflinger_test.cpp
@@ -1,3 +1,4 @@
+#include <SurfaceFlingerProperties.h>
 #include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>
 #include <android/hardware/configstore/1.1/types.h>
 #include <android/hardware_buffer.h>
@@ -147,9 +148,7 @@ TEST(VrFlingerTest, ActivateDeactivate) {
   // Exit immediately if the device doesn't support vr flinger. This ConfigStore
   // check is the same mechanism used by surface flinger to decide if it should
   // initialize vr flinger.
-  bool vr_flinger_enabled =
-      getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::useVrFlinger>(
-          false);
+  bool vr_flinger_enabled = android::sysprop::use_vr_flinger(false);
   if (!vr_flinger_enabled) {
     return;
   }
-- 
cgit v1.2.3-59-g8ed1b