diff options
| author | 2018-03-30 04:08:26 +0000 | |
|---|---|---|
| committer | 2018-03-30 04:08:26 +0000 | |
| commit | 92f8d8b1f3818a793bce02b6c956a6a23ae7985a (patch) | |
| tree | ed6856a4b17f30d44c6c17f9cb0613f671454da4 /services/surfaceflinger/DisplayDevice.cpp | |
| parent | ad7d6911eb95b2bbb5fa2e694cad033a3ef88786 (diff) | |
| parent | fd997e0969100418b4df8b8d97d21d497afa76c3 (diff) | |
Merge "Add proper namespace to GraphicTypes." into pi-dev
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 |