From f9e0e6bd5e070d4c213e0237fa2fb8d4bb558bcb Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Tue, 8 Sep 2009 16:24:36 -0400
Subject: [PATCH] Fix b/2105945 - Windowshade not closed when device locked.

---
 services/java/com/android/server/status/StatusBarService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java
index b44168abdc915..d680b8a5ba05f 100644
--- a/services/java/com/android/server/status/StatusBarService.java
+++ b/services/java/com/android/server/status/StatusBarService.java
@@ -322,6 +322,7 @@ public class StatusBarService extends IStatusBar.Stub
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
         filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+        filter.addAction(Intent.ACTION_SCREEN_OFF);
         filter.addAction(Telephony.Intents.SPN_STRINGS_UPDATED_ACTION);
         context.registerReceiver(mBroadcastReceiver, filter);
     }
@@ -1672,7 +1673,8 @@ public class StatusBarService extends IStatusBar.Stub
     private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {
+            if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)
+                    || Intent.ACTION_SCREEN_OFF.equals(action)) {
                 deactivate();
             }
             else if (Telephony.Intents.SPN_STRINGS_UPDATED_ACTION.equals(action)) {