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

Commit 451e1ce2 authored by Justin Weir's avatar Justin Weir
Browse files

Remove calls to CentralSurfacesImpl.getNotificationShadeWindowView 

Bug: 284332422
Test: manual
Test: run and fix affected unit tests
Change-Id: Ieac2a0d08f0021cdcc46bc93170beea6d28507ed
parent 751076f8

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

+5 −5
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    private PhoneStatusBarTransitions mStatusBarTransitions;

    private final AuthRippleController mAuthRippleController;

    @WindowVisibleState private int mStatusBarWindowState = WINDOW_STATE_SHOWING;

    protected final NotificationShadeWindowController mNotificationShadeWindowController;

    private final NotificationShadeWindowController mNotificationShadeWindowController;

    private final StatusBarInitializer mStatusBarInitializer;

    private final StatusBarWindowController mStatusBarWindowController;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
@@ -1143,7 +1143,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
                    @Override

                    public void onPluginConnected(OverlayPlugin plugin, Context pluginContext) {

                        mMainExecutor.execute(

                                () -> plugin.setup(getNotificationShadeWindowView(),

                                () -> plugin.setup(

                                        mNotificationShadeWindowController.getWindowRootView(),

                                        getNavigationBarView(),

                                        new Callback(plugin), mDozeParameters));

                    }
@@ -3062,9 +3063,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    }



    protected ViewRootImpl getViewRootImpl()  {

        NotificationShadeWindowView nswv = getNotificationShadeWindowView();

        if (nswv != null) return nswv.getViewRootImpl();



        View root = mNotificationShadeWindowController.getWindowRootView();

        if (root != null) return root.getViewRootImpl();

        return null;

    }

    /**