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

Commit b17407db authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Remove calls to CentralSurfacesImpl.getNotificationShadeWindowView am: 451e1ce2 am: bfd1e624 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475818



Change-Id: I9d27adbf90deaf35e3241fc998a19ff54e67862f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6246db7 bfd1e624

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));

                    }
@@ -3051,9 +3052,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;

    }

    /**