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

Commit f9fdfa97 authored by Winson Chung's avatar Winson Chung
Browse files

Add null check to work around async unregistration of receiver 

Fixes: 193890703
Test: atest SystemUITests
Change-Id: I47272513482c2ed31167574d2f2cab6094cfd590
Merged-In: I47272513482c2ed31167574d2f2cab6094cfd590
parent 50ffbb96

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+5 −0
Original line number Diff line number Diff line
@@ -1620,6 +1620,11 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            // TODO(193941146): Currently unregistering a receiver through BroadcastDispatcher is

            // async, but we've already cleared the fields. Just return early in this case.

            if (mNavigationBarView == null) {

                return;

            }

            String action = intent.getAction();

            if (Intent.ACTION_SCREEN_OFF.equals(action)

                    || Intent.ACTION_SCREEN_ON.equals(action)) {