| commit | 9f034475d961892e4c10e6ff7ecee96e464be00c | [log] [tgz] |
|---|---|---|
| author | Peiyong Lin <lpy@google.com> | Wed Mar 28 15:29:00 2018 -0700 |
| committer | Peiyong Lin <lpy@google.com> | Thu Mar 29 15:04:35 2018 -0700 |
| tree | 3a15d3bb2007cab02ce82e11d0fb1c3887add301 | |
| parent | 7909a89bb1a3f5142130c2ea9208966af8a76c8e [diff] [blame] |
Add proper namespace to GraphicTypes. Renamed GraphicsTypes.h to GraphicTypes.h and added proper namespace to avoid naming conflict. BUG: 77156734 Test: Build and flash Change-Id: Ibd9f454b5b72d5f8c6d94a3869a60a1bf821f106
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index b9e5d3f..82b8bc0 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -104,6 +104,7 @@ using namespace android::hardware::configstore; using namespace android::hardware::configstore::V1_0; +using ui::ColorMode; namespace { class ConditionalLock {