Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c19efc4a authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24183 into eclair 

* changes:
  Fix b/2105945 - Windowshade not closed when device locked.
parents 7452d292 f9e0e6bd

services/java/com/android/server/status/StatusBarService.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -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)) {