diff options
| author | 2018-03-28 15:29:00 -0700 | |
|---|---|---|
| committer | 2018-03-29 15:28:14 -0700 | |
| commit | fd997e0969100418b4df8b8d97d21d497afa76c3 (patch) | |
| tree | 02c194f3b987994405472e435f53ab6ae757c1bd /services/surfaceflinger/DisplayDevice.cpp | |
| parent | f228d58990fe4f2e66bf952b93dbebcf7db5ec3e (diff) | |
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
Diffstat (limited to 'services/surfaceflinger/DisplayDevice.cpp')
| -rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index fe0b30ba35..bab6a71057 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 @@ DisplayDeviceState::DisplayDeviceState(DisplayDevice::DisplayType type, bool isS viewport.makeInvalid(); frame.makeInvalid(); } + +} // namespace android |