Merge "Change NotificationListener initialization"

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

@@ -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

@@ -612,6 +612,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);
@@ -1054,7 +1055,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

@@ -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

@@ -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