From d3e6914ceaafebaee09b0095aad6d001b75e787a Mon Sep 17 00:00:00 2001
From: Michael Lentine <mlentine@google.com>
Date: Thu, 21 Aug 2014 14:43:13 -0700
Subject: [PATCH] Update currentConfig variable when active display is changed.

Bug: 17182607
Change-Id: I8631c105a9e0fa402a7d9670717becc9857af935
---
 services/surfaceflinger/DisplayHardware/HWComposer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 53409d106..e67b2e78d 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -780,6 +780,8 @@ status_t HWComposer::setPowerMode(int disp, int mode) {
 
 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 {