Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-11 15:10:50 +00:00
committed by Android (Google) Code Review
parent 7a84eb8de0 69d11c2e56
commit 7ac45d97cf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ public class NotificationContentInflaterTest extends SysuiTestCase {
mNotificationInflater.setUsesIncreasedHeadsUpHeight(true); mNotificationInflater.setUsesIncreasedHeadsUpHeight(true);
Notification.Builder builder = spy(mBuilder); Notification.Builder builder = spy(mBuilder);
mNotificationInflater.inflateNotificationViews( mNotificationInflater.inflateNotificationViews(
false /* inflateSynchronously */, true /* inflateSynchronously */,
FLAG_CONTENT_VIEW_ALL, FLAG_CONTENT_VIEW_ALL,
builder, builder,
mContext); mContext);
@@ -113,7 +113,7 @@ public class NotificationContentInflaterTest extends SysuiTestCase {
mNotificationInflater.setUsesIncreasedHeight(true); mNotificationInflater.setUsesIncreasedHeight(true);
Notification.Builder builder = spy(mBuilder); Notification.Builder builder = spy(mBuilder);
mNotificationInflater.inflateNotificationViews( mNotificationInflater.inflateNotificationViews(
false /* inflateSynchronously */, true /* inflateSynchronously */,
FLAG_CONTENT_VIEW_ALL, FLAG_CONTENT_VIEW_ALL,
builder, builder,
mContext); mContext);
@@ -161,6 +161,7 @@ public class NotificationContentInflaterTest extends SysuiTestCase {
@Test @Test
public void testRemovedNotInflated() throws Exception { public void testRemovedNotInflated() throws Exception {
mRow.setRemoved(); mRow.setRemoved();
mNotificationInflater.setInflateSynchronously(true);
mNotificationInflater.inflateNotificationViews(); mNotificationInflater.inflateNotificationViews();
Assert.assertNull(mRow.getEntry().getRunningTask()); Assert.assertNull(mRow.getEntry().getRunningTask());
} }