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

Commit 38d13f43 authored by Luca Stefani's avatar Luca Stefani Committed by Sam Mortimer
Browse files

StatusBar: Fix NPEs when we don't have a navigation bar 

* mNavigationBar is never initilized if hasNavigationBar is false
  -> Add missing null checks

Change-Id: I93248c6af30b10f81fd721696fb54b3c348a3b1b
parent 954d3516

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

+4 −2
Original line number Diff line number Diff line
@@ -3840,8 +3840,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
    }



    public void onKeyguardOccludedChanged(boolean keyguardOccluded) {

        if (mNavigationBar != null) {

            mNavigationBar.onKeyguardOccludedChanged(keyguardOccluded);

        }

    }



    // State logging
@@ -4631,7 +4633,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


    // TODO: Figure out way to remove this.

    public NavigationBarView getNavigationBarView() {

        return (NavigationBarView) mNavigationBar.getView();

        return mNavigationBar != null ? (NavigationBarView) mNavigationBar.getView() : null;

    }



    // ---------------------- DragDownHelper.OnDragDownListener ------------------------------------