commit 7d9a5a84f1697ff0c6fe0b55fb13491bb376b701
author Jordan Jozwiak <jjoz@google.com> Thu Jun 20 16:20:54 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 20 16:20:54 2019 -0700
tree 2dd13cba4d33eb2fff44d4dfe6ab0fbaa384827c
parent 3953d9d9a97c726da7fb94d70eae05c15f037b36
parent 26b2dc9b342dcec055f7674c10d76a3a3ca3d770

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

Change-Id: I7bde5d45b574a2b1e1c80a28d4547ec0b73990a5

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;
             }