commit | 26b2dc9b342dcec055f7674c10d76a3a3ca3d770 | [log] [tgz] |
---|---|---|
author | Jordan Jozwiak <jjoz@google.com> | Thu Jun 20 15:45:14 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 20 15:45:14 2019 -0700 |
tree | 2dd13cba4d33eb2fff44d4dfe6ab0fbaa384827c | |
parent | 071e9d41aff3aa99ab11c9c9157166526e6b40ce [diff] | |
parent | 40c23cf2a6d4ce9feaef7b852c2ba6cd094d8e1d [diff] |
Merge "Handle null desired value in filter" into qt-dev am: 40c23cf2a6 Change-Id: I049aeec2fc7da8de87a72e343f1c42763d3131c4
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; }