Merge "Re-enable NonPhoneDependencyTest"

import com.android.systemui.statusbar.policy.HeadsUpManager;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

@SmallTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

@Ignore("b/118400112")

public class NonPhoneDependencyTest extends SysuiTestCase {

    @Mock private NotificationPresenter mPresenter;

    @Mock private NotificationListContainer mListContainer;

    }

    @Test

    @Ignore("b/118400112")

    public void testNotificationManagementCodeHasNoDependencyOnStatusBarWindowManager() {

        mDependency.injectMockDependency(ShadeController.class);

        NotificationEntryManager entryManager = Dependency.get(NotificationEntryManager.class);