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

am: 44eb66dfd1

Change-Id: I70765d699021094604facdcdd221c2d8cd75a154
This commit is contained in:
Selim Cinek
2019-06-11 08:31:22 -07:00
committed by android-build-merger

View File

@@ -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());
}