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

Commit 4a7e6f84 authored by Evan Laird's avatar Evan Laird
Browse files

Remove StatusBar#getStatusBarView 

StatusBar shouldn't be handing out references to StatusBarView, since
PhoneStatusBarView doesn't have the same lifetime as StatusBar.java. All
calls to this method have been removed so we can just delete it now.

Bug: 209005990
Test: atest SytemUITests
Change-Id: Ib277941d739290445668589932fb65b1b94fb154
parent 3822f89d

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

+13 −22
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ public class StatusBar extends CoreStartable implements 
        mStatusBarWindowState =  state;

        mStatusBarWindowHidden = state == WINDOW_STATE_HIDDEN;

        mStatusBarHideIconsForBouncerManager.setStatusBarWindowHidden(mStatusBarWindowHidden);

        if (getStatusBarView() != null) {

        if (mStatusBarView != null) {

            // Should #updateHideIconsForBouncer always be called, regardless of whether we have a

            //   status bar view? If so, we can make #updateHideIconsForBouncer private.

            mStatusBarHideIconsForBouncerManager.updateHideIconsForBouncer(/* animate= */ false);
@@ -1124,11 +1124,7 @@ public class StatusBar extends CoreStartable implements 
        // Set up CollapsedStatusBarFragment and PhoneStatusBarView

        StatusBarInitializer initializer = mStatusBarComponent.getStatusBarInitializer();

        initializer.setStatusBarViewUpdatedListener(

                new StatusBarInitializer.OnStatusBarViewUpdatedListener() {

                    @Override

                    public void onStatusBarViewUpdated(

                            @NonNull PhoneStatusBarView statusBarView,

                            @NonNull PhoneStatusBarViewController statusBarViewController) {

                (statusBarView, statusBarViewController) -> {

                    mStatusBarView = statusBarView;

                    mPhoneStatusBarViewController = statusBarViewController;

                    mNotificationShadeWindowViewController.setStatusBarView(mStatusBarView);
@@ -1140,7 +1136,6 @@ public class StatusBar extends CoreStartable implements 
                    mNotificationPanelViewController.updatePanelExpansionAndVisibility();

                    setBouncerShowingForStatusBarComponents(mBouncerShowing);

                    checkBarModes();

                    }

                });

        initializer.initializeStatusBar(mStatusBarComponent);
@@ -1578,10 +1573,6 @@ public class StatusBar extends CoreStartable implements 
        Trace.endSection();

    }



    protected PhoneStatusBarView getStatusBarView() {

        return mStatusBarView;

    }



    public NotificationShadeWindowView getNotificationShadeWindowView() {

        return mNotificationShadeWindowView;

    }