summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-09-07 03:03:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-07 03:03:44 +0000
commit4e9b309ea39ed24f06870aff100a1f665ddd209b (patch)
treebc6be46a30cff4c3f67e5d2c225ad8a0f3a64b60
parent6b6df8dc45da0577009ab5a507177ebbaef4e6a7 (diff)
parentb6aaf84246a082ce8680fc28a126b3e3b39efe97 (diff)
Fix runtime kotlin nullable error in ScreenshotDetectionControllerTest am: b6aaf84246
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24588598 Change-Id: Ib61a1c6fc51e56fb28e712807f98008160f8948d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotDetectionControllerTest.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotDetectionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotDetectionControllerTest.kt
index 08b5d2bdc31c..16091b2633aa 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotDetectionControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotDetectionControllerTest.kt
@@ -170,8 +170,8 @@ class ScreenshotDetectionControllerTest {
private class ComponentInfoFlagMatcher(
@PackageManager.ComponentInfoFlagsBits val mask: Int, val value: Int
): ArgumentMatcher<PackageManager.ComponentInfoFlags> {
- override fun matches(flags: PackageManager.ComponentInfoFlags): Boolean {
- return (mask.toLong() and flags.value) == value.toLong()
+ override fun matches(flags: PackageManager.ComponentInfoFlags?): Boolean {
+ return flags != null && (mask.toLong() and flags.value) == value.toLong()
}
override fun toString(): String{