commit eb21986df0429d63f5e9678741730f07f17dcbad
author Michael Lentine <mlentine@google.com> Fri Aug 22 16:34:13 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 22 16:34:14 2014 +0000
tree 56c08b54c9d2a7958d5518bff77fcc59acc80ce4
parent c597b6dd895dbb2b28c757ce7a2651b3cdc9b00c
parent d3e6914ceaafebaee09b0095aad6d001b75e787a

Merge "Update currentConfig variable when active display is changed." into lmp-dev

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index bd07d24..a8dcf98 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -780,6 +780,8 @@
 
 status_t HWComposer::setActiveConfig(int disp, int mode) {
     LOG_FATAL_IF(disp >= VIRTUAL_DISPLAY_ID_BASE);
+    DisplayData& dd(mDisplayData[disp]);
+    dd.currentConfig = mode;
     if (mHwc && hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_4)) {
         return (status_t)mHwc->setActiveConfig(mHwc, disp, mode);
     } else {