Automated import from //branches/donutburger/...@142722,142722
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 56f8bc1..ed8b23a 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -7799,6 +7799,7 @@
boolean blurring = false;
boolean dimming = false;
boolean covered = false;
+ boolean syswin = false;
for (i=N-1; i>=0; i--) {
WindowState w = (WindowState)mWindows.get(i);
@@ -8058,9 +8059,15 @@
if ((attrFlags&FLAG_KEEP_SCREEN_ON) != 0) {
holdScreen = w.mSession;
}
- if (w.mAttrs.screenBrightness >= 0 && screenBrightness < 0) {
+ if (!syswin && w.mAttrs.screenBrightness >= 0
+ && screenBrightness < 0) {
screenBrightness = w.mAttrs.screenBrightness;
}
+ if (attrs.type == WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG
+ || attrs.type == WindowManager.LayoutParams.TYPE_KEYGUARD
+ || attrs.type == WindowManager.LayoutParams.TYPE_SYSTEM_ERROR) {
+ syswin = true;
+ }
}
if (w.isFullscreenOpaque(dw, dh)) {
// This window completely covers everything behind it,