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

Commit 7c2367f0 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Change NotificationListener initialization 

- NotificationListener doesn't need a presenter
- And the tests deefinitely don't need to register with
the live system server

Test: atest, device reboot
Change-Id: I5e12cabdffc2584c1f8e62ac4c49653aeaa80eff
Fixes: 123643503
parent 3f4d0578

packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java

+1 −5
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ public class NotificationListener extends NotificationListenerWithPlugins { 
    private final ArrayList<NotificationSettingsListener> mSettingsListeners = new ArrayList<>();

    private final Context mContext;



    protected NotificationPresenter mPresenter;



    public NotificationListener(Context context) {

        mContext = context;

    }
@@ -152,9 +150,7 @@ public class NotificationListener extends NotificationListenerWithPlugins { 
        }

    }



    public void setUpWithPresenter(NotificationPresenter presenter) {

        mPresenter = presenter;



    public void registerAsSystemService() {

        try {

            registerAsSystemService(mContext,

                    new ComponentName(mContext.getPackageName(), getClass().getCanonicalName()),

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

+1 −1
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mNotificationLogger = Dependency.get(NotificationLogger.class);

        mRemoteInputManager = Dependency.get(NotificationRemoteInputManager.class);

        mNotificationListener =  Dependency.get(NotificationListener.class);

        mNotificationListener.registerAsSystemService();

        mNetworkController = Dependency.get(NetworkController.class);

        mUserSwitcherController = Dependency.get(UserSwitcherController.class);

        mScreenLifecycle = Dependency.get(ScreenLifecycle.class);
@@ -1055,7 +1056,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
                        mDeviceProvisionedController);



        mAppOpsController.addCallback(APP_OPS, this);

        mNotificationListener.setUpWithPresenter(mPresenter);

        mNotificationShelf.setOnActivatedListener(mPresenter);

        mRemoteInputManager.getController().addCallback(mStatusBarWindowController);

packages/SystemUI/tests/src/com/android/systemui/statusbar/NonPhoneDependencyTest.java

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ public class NonPhoneDependencyTest extends SysuiTestCase { 
                mDelegate);

        lockscreenUserManager.setUpWithPresenter(mPresenter);

        viewHierarchyManager.setUpWithPresenter(mPresenter, mListContainer);

        notificationListener.setUpWithPresenter(mPresenter);



        TestableLooper.get(this).processAllMessages();

        assertFalse(mDependency.hasInstantiatedDependency(StatusBarWindowController.class));

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ public class NotificationListenerTest extends SysuiTestCase { 
        mListener = new NotificationListener(mContext);

        mSbn = new StatusBarNotification(TEST_PACKAGE_NAME, TEST_PACKAGE_NAME, 0, null, TEST_UID, 0,

                new Notification(), UserHandle.CURRENT, null, 0);



        mListener.setUpWithPresenter(mPresenter);

    }



    @Test