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

Commit 6725df0b authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Add mStatusBarWindowController null check on ACTION_SCREEN_OFF"

parents d7262c9c 0cfa3791

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -2852,7 +2852,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
                }

                }

            }

            }

            else if (Intent.ACTION_SCREEN_OFF.equals(action)) {

            else if (Intent.ACTION_SCREEN_OFF.equals(action)) {

                if (mStatusBarWindowController != null) {

                    mStatusBarWindowController.setNotTouchable(false);

                    mStatusBarWindowController.setNotTouchable(false);

                }

                finishBarAnimations();

                finishBarAnimations();

                resetUserExpandedStates();

                resetUserExpandedStates();

            }

            }