commit b3839ad86a8c9f83d8e4aae5cdc4927e5feaaddd
author Peiyong Lin <lpy@google.com> Wed Sep 05 15:37:19 2018 -0700
committer Peiyong Lin <lpy@google.com> Thu Sep 06 09:04:15 2018 -0700
tree f8b1b838c17242cabb53412df8027ff199ad3971
parent 9b68a25f51394cba7c7411c24feceb023dc606f7

[RenderEngine] Remove ConfigStore from RenderEngine.

This patch removes ConfigStore dependency from RenderEngine.

BUG: 112585051
Test: Build, flash, boot and run display verification.
Change-Id: Ibbd0a90491fc9cd39927d15287cf4971a42df866

services/surfaceflinger/RenderEngine/RenderEngine.cpp

diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
index e94200e..f00367f 100644
--- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
@@ -18,8 +18,6 @@
 
 #include <vector>
 
-#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>
-#include <configstore/Utils.h>
 #include <log/log.h>
 #include <private/gui/SyncFeatures.h>
 #include <renderengine/Image.h>
@@ -32,8 +30,6 @@
 #include "gl/GLExtensions.h"
 #include "gl/ProgramCache.h"
 
-using namespace android::hardware::configstore;
-using namespace android::hardware::configstore::V1_0;
 using namespace android::renderengine::gl;
 
 extern "C" EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);
@@ -82,7 +78,8 @@
     contextAttributes.reserve(6);
     contextAttributes.push_back(EGL_CONTEXT_CLIENT_VERSION);
     contextAttributes.push_back(contextClientVersion);
-    bool useContextPriority = overrideUseContextPriorityFromConfig(extensions.hasContextPriority());
+    bool useContextPriority = extensions.hasContextPriority() &&
+                              (featureFlags & RenderEngine::USE_HIGH_PRIORITY_CONTEXT);
     if (useContextPriority) {
         contextAttributes.push_back(EGL_CONTEXT_PRIORITY_LEVEL_IMG);
         contextAttributes.push_back(EGL_CONTEXT_PRIORITY_HIGH_IMG);
@@ -141,16 +138,6 @@
     return engine;
 }
 
-bool RenderEngine::overrideUseContextPriorityFromConfig(bool useContextPriority) {
-    OptionalBool ret;
-    ISurfaceFlingerConfigs::getService()->useContextPriority([&ret](OptionalBool b) { ret = b; });
-    if (ret.specified) {
-        return ret.value;
-    } else {
-        return useContextPriority;
-    }
-}
-
 RenderEngine::RenderEngine(uint32_t featureFlags)
       : mEGLDisplay(EGL_NO_DISPLAY),
         mEGLConfig(nullptr),