commit 314fa53035f47a741e6b15ea10d897c6cee904e0
author Linux Build Service Account <lnxbuild@localhost> Sat Mar 14 12:40:45 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Mar 14 12:40:45 2015 -0700
tree 81708a14acef93c519652d3a9fb39ce22e91ff97
parent 7fc521f0e594c86fe572eab13c311b365fe89ab5
parent 6dd8398911b744a0d1c5d73d19cb889543bad207

Merge "hwc: Handle DOZE_SUSPEND properly"

libhwcomposer/hwc.cpp

diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index b7a9a00..f3b34c3 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -469,7 +469,13 @@
             value = FB_BLANK_POWERDOWN;
             break;
         case HWC_POWER_MODE_DOZE:
+            // FB_BLANK_NORMAL is being used here to map to doze mode
+            // This definition is specific to our fbdev implementation
+            value = FB_BLANK_NORMAL;
+            break;
         case HWC_POWER_MODE_DOZE_SUSPEND:
+            // FB_BLANK_VSYNC_SUSPEND is being used here to map to doze_suspend
+            // This definition is specific to our fbdev implementation
             value = FB_BLANK_VSYNC_SUSPEND;
             break;
         case HWC_POWER_MODE_NORMAL:
@@ -505,7 +511,8 @@
                 ctx->mHPDEnabled = true;
             }
 
-            ctx->dpyAttr[dpy].isActive = not(mode == HWC_POWER_MODE_OFF);
+            ctx->dpyAttr[dpy].isActive = not(mode == HWC_POWER_MODE_OFF ||
+                    mode == HWC_POWER_MODE_DOZE_SUSPEND);
         }
         //Deliberate fall through since there is no explicit power mode for
         //virtual displays.