Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 24183 into eclair

Browse Source 
* changes:
  Fix b/2105945 - Windowshade not closed when device locked.
This commit is contained in:
Android (Google) Code Review
2009-09-08 13:30:19 -07:00
parent 7452d29259 f9e0e6bd5e
commit c19efc4acb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/status/StatusBarService.java
View File

@@ -322,6 +322,7 @@ public class StatusBarService extends IStatusBar.Stub
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED); filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
filter.addAction(Intent.ACTION_SCREEN_OFF);
filter.addAction(Telephony.Intents.SPN_STRINGS_UPDATED_ACTION); filter.addAction(Telephony.Intents.SPN_STRINGS_UPDATED_ACTION);
context.registerReceiver(mBroadcastReceiver, filter); context.registerReceiver(mBroadcastReceiver, filter);
} }
@@ -1672,7 +1673,8 @@ public class StatusBarService extends IStatusBar.Stub
private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); 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(); deactivate();
} }
else if (Telephony.Intents.SPN_STRINGS_UPDATED_ACTION.equals(action)) { else if (Telephony.Intents.SPN_STRINGS_UPDATED_ACTION.equals(action)) {