summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2020-09-08 16:04:20 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-09-08 16:04:20 +0000
commitb770e2045ad0d4d7fa2d574db5361d1069ceb9d7 (patch)
treea83c3f7060a6c5219e290eaa454bc3593aa70cd9 /services
parent0684a51dad1b4c3768198ebc7a6085b25883a8b6 (diff)
parent56c4b15aeea82af058c2049dee4cb21c741e01d9 (diff)
Merge "Remove obsolete DONT_USE_FENCE_SYNC option"
Diffstat (limited to 'services')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 65017491b7..de99893d00 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -52,7 +52,6 @@
#include <errno.h>
#include <gui/BufferQueue.h>
#include <gui/DebugEGLImageTracker.h>
-#include <gui/GuiConfig.h>
#include <gui/IDisplayEventConnection.h>
#include <gui/IProducerListener.h>
#include <gui/LayerDebugInfo.h>
@@ -75,7 +74,6 @@
#include <ui/DisplayState.h>
#include <ui/GraphicBufferAllocator.h>
#include <ui/PixelFormat.h>
-#include <ui/UiConfig.h>
#include <utils/StopWatch.h>
#include <utils/String16.h>
#include <utils/String8.h>
@@ -4725,8 +4723,6 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, std::string& result) co
result.append("Build configuration:");
colorizer.reset(result);
appendSfConfigString(result);
- appendUiConfigString(result);
- appendGuiConfigString(result);
result.append("\n");
result.append("\nDisplay identification data:\n");