commit fd997e0969100418b4df8b8d97d21d497afa76c3
author Peiyong Lin <lpy@google.com> Wed Mar 28 15:29:00 2018 -0700
committer Peiyong Lin <lpy@google.com> Thu Mar 29 15:28:14 2018 -0700
tree 02c194f3b987994405472e435f53ab6ae757c1bd
parent f228d58990fe4f2e66bf952b93dbebcf7db5ec3e

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
Merged-In: Ibd9f454b5b72d5f8c6d94a3869a60a1bf821f106

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index fe0b30b..bab6a71 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -49,13 +49,12 @@
 #include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>
 #include <configstore/Utils.h>
 
-// ----------------------------------------------------------------------------
-using namespace android;
-// ----------------------------------------------------------------------------
+namespace android {
 
 // retrieve triple buffer setting from configstore
 using namespace android::hardware::configstore;
 using namespace android::hardware::configstore::V1_0;
+using android::ui::ColorMode;
 
 /*
  * Initialize the display to the specified values.
@@ -474,3 +473,5 @@
     viewport.makeInvalid();
     frame.makeInvalid();
 }
+
+}  // namespace android