From 69e510d6f7a06a9784a0d4eb24b2757a33d39873 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Sun, 13 Jul 2014 14:57:59 +0200
Subject: [PATCH] Partially fix the keyguard scrim

Currently the scrim is effectively translucent because
PWM doesn't consider it to be hiding windows behind it.
This change fixes that but the transition into the scrim
still leaks a few frames when SystemUI crashes.

Bug: 16165504
Change-Id: Id50b7a5c96df22dcae7705b4a071e7bbf64c2c5f
---
 .../com/android/internal/policy/impl/PhoneWindowManager.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index ef15a80717b8d..153384ceac79b 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1701,7 +1701,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     @Override
     public boolean isForceHiding(WindowManager.LayoutParams attrs) {
         return (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0 ||
-                (isKeyguardHostWindow(attrs) && isKeyguardSecureIncludingHidden());
+                (isKeyguardHostWindow(attrs) && isKeyguardSecureIncludingHidden()) ||
+                (attrs.type == TYPE_KEYGUARD_SCRIM);
     }
 
     @Override