Merge "Removes unused fields from NotificationEntryManager."

import android.app.Notification;

import android.content.Context;

import android.os.Handler;

import android.os.PowerManager;

import android.os.UserHandle;

import android.service.notification.NotificationListenerService;

import android.service.notification.StatusBarNotification;

    private Runnable mUpdateNotificationViewsCallback;

    private NotificationPresenter mPresenter;

    protected PowerManager mPowerManager;

    private NotificationListenerService.RankingMap mLatestRankingMap;

    protected HeadsUpManager mHeadsUpManager;

    protected NotificationData mNotificationData;

    protected NotificationListContainer mListContainer;

    @VisibleForTesting

    public NotificationEntryManager(Context context) {

        mContext = context;

        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

        mBubbleController.setDismissListener(this /* bubbleEventListener */);

        mNotificationData = new NotificationData();

        mDeferredNotificationViewUpdateHandler = new Handler();

            HeadsUpManager headsUpManager) {

        mPresenter = presenter;

        mUpdateNotificationViewsCallback = mPresenter::updateNotificationViews;

        mHeadsUpManager = headsUpManager;

        mNotificationData.setHeadsUpManager(mHeadsUpManager);

        mNotificationData.setHeadsUpManager(headsUpManager);

        mListContainer = listContainer;

        mDeviceProvisionedController.addCallback(mDeviceProvisionedListener);

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import android.os.Handler;

import android.os.IPowerManager;

import android.os.Looper;

import android.os.PowerManager;

import android.provider.Settings;

import android.service.dreams.IDreamManager;

import android.support.test.annotation.UiThreadTest;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

    @Mock private NotificationData mNotificationData;

    @Mock private NotificationRemoteInputManager mRemoteInputManager;

    @Mock private RemoteInputController mRemoteInputController;

    @Mock private IDreamManager mDreamManager;

    private PowerManager mPowerManager;

    private TestableNotificationEntryManager mEntryManager;

    private int mOriginalInterruptionModelSetting;

        mDependency.injectMockDependency(ShadeController.class);

        when(mRemoteInputManager.getController()).thenReturn(mRemoteInputController);

        IPowerManager powerManagerService = mock(IPowerManager.class);

        mPowerManager = new PowerManager(mContext, powerManagerService,

                Handler.createAsync(Looper.myLooper()));

        mEntryManager = new TestableNotificationEntryManager(mPowerManager,

                mContext);

        mEntryManager = new TestableNotificationEntryManager(mContext);

        mDependency.injectTestDependency(NotificationEntryManager.class, mEntryManager);

        Dependency.get(InitController.class).executePostInitTasks();

        mEntryManager.setUpForTest(mock(NotificationPresenter.class), null, mHeadsUpManager,

        mMetricsLogger = new FakeMetricsLogger();

        mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);

        mEntryManager = new TestableNotificationEntryManager(mPowerManager, mContext);

        mEntryManager = new TestableNotificationEntryManager(mContext);

        mNotificationLogger = new NotificationLogger(mNotificationListener,

                Dependency.get(UiOffloadThread.class), mEntryManager, mStatusBarStateController);

        mDependency.injectTestDependency(NotificationLogger.class, mNotificationLogger);

    public static class TestableNotificationEntryManager extends NotificationEntryManager {

        public TestableNotificationEntryManager(PowerManager powerManager, Context context) {

        public TestableNotificationEntryManager(Context context) {

            super(context);

            mPowerManager = powerManager;

        }

        public void setUpForTest(NotificationPresenter presenter,