Merge "Fix local tests that were failing on eng builds because of Log.wtf" into main (0ab6b25f) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1767,7 +1767,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		*/
		public ExpandableNotificationRow(Context context, AttributeSet attrs) {
		this(context, attrs, context);
		Log.wtf(TAG, "This constructor shouldn't be called");
		Log.e(TAG, "This constructor shouldn't be called");
		}

		/**

+5 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.testing.AndroidTestingRunner
		import android.util.StatsEvent
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.log.assertLogsWtf
		import com.android.systemui.shared.system.SysUiStatsLog
		import com.android.systemui.statusbar.notification.collection.NotifPipeline
		import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder
		@@ -133,9 +134,11 @@ class NotificationMemoryLoggerTest : SysuiTestCase() {
		val pipeline: NotifPipeline = mock()
		whenever(pipeline.allNotifs).thenThrow(RuntimeException("Something broke!"))
		val logger = NotificationMemoryLogger(pipeline, statsManager, immediate, bgExecutor)
		assertLogsWtf {
		assertThat(logger.onPullAtom(SysUiStatsLog.NOTIFICATION_MEMORY_USE, mutableListOf()))
		.isEqualTo(StatsManager.PULL_SKIP)
		}
		}

		@Test
		fun aggregateMemoryUsageData_returnsCorrectlyAggregatedSamePackageData() {