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

Commit 2ef58094 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed an issue where test had lingering inflations" into qt-dev am:... 

Merge "Fixed an issue where test had lingering inflations" into qt-dev am: 7ac45d97 am: 44eb66df
am: 91aa420f

Change-Id: Idcc08d7fc32e2cc3b6a41a152d4c28a21cd42ec4
parents baab1789 91aa420f

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java

+3 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public class NotificationContentInflaterTest extends SysuiTestCase { 
        mNotificationInflater.setUsesIncreasedHeadsUpHeight(true);

        Notification.Builder builder = spy(mBuilder);

        mNotificationInflater.inflateNotificationViews(

                false /* inflateSynchronously */,

                true /* inflateSynchronously */,

                FLAG_CONTENT_VIEW_ALL,

                builder,

                mContext);
@@ -113,7 +113,7 @@ public class NotificationContentInflaterTest extends SysuiTestCase { 
        mNotificationInflater.setUsesIncreasedHeight(true);

        Notification.Builder builder = spy(mBuilder);

        mNotificationInflater.inflateNotificationViews(

                false /* inflateSynchronously */,

                true /* inflateSynchronously */,

                FLAG_CONTENT_VIEW_ALL,

                builder,

                mContext);
@@ -161,6 +161,7 @@ public class NotificationContentInflaterTest extends SysuiTestCase { 
    @Test

    public void testRemovedNotInflated() throws Exception {

        mRow.setRemoved();

        mNotificationInflater.setInflateSynchronously(true);

        mNotificationInflater.inflateNotificationViews();

        Assert.assertNull(mRow.getEntry().getRunningTask());

    }