commit 5cdeabc5fb226fea83083b05a04fed930da1f434
author Jordan Jozwiak <jjoz@google.com> Thu Jun 20 17:00:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 20 17:00:00 2019 -0700
tree e09d01d7950ce56fa79f0e7a1c5574b39d3fe4d8
parent c56cad63de41e13408ee171c4dc9db5baccfa10a
parent 7d9a5a84f1697ff0c6fe0b55fb13491bb376b701

Merge "Handle null desired value in filter" into qt-dev am: 40c23cf2a6 am: 26b2dc9b34
am: 7d9a5a84f1

Change-Id: Iedf98435c6d35bd3dad65ed2b9e65a76019bd9af

tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java

diff --git a/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java b/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
index e7c739f..4595f9e 100644
--- a/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
+++ b/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
@@ -230,8 +230,9 @@
                         + topTask.topActivity.getClassName());
                 return;
             }
-            if (!topTask.topActivity.equals(mDesiredComponent)) {
-                Log.d(TAG, "Unexpected component: " + topTask.topActivity.getClassName());
+            if (mDesiredComponent != null && !topTask.topActivity.equals(mDesiredComponent)) {
+                Log.d(TAG, String.format("Unexpected component: %s. Expected: %s",
+                        topTask.topActivity.getClassName(), mDesiredComponent));
                 return;
             }