From 9b2e5991ce773c7e3ecfd12aff31e246fb70d119 Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Thu, 6 Oct 2022 15:26:49 +0000 Subject: [PATCH] Switch mixed-up ScreenshotRequest parameters They often happened to be the same number (e.g. in unit test), so we missed that they were switched. Modified test to fail if they're swapped. Bug: 251438230 Test: atest RequestProcessorTest Test: adb shell input keyevent SYSRQ (with screenshot processor and work profile flags enabled) Change-Id: I0b4bc8e4007f0a78a033f9266f5189739f0a295d --- .../src/com/android/systemui/screenshot/RequestProcessor.kt | 2 +- .../com/android/systemui/screenshot/RequestProcessorTest.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/RequestProcessor.kt b/packages/SystemUI/src/com/android/systemui/screenshot/RequestProcessor.kt index 309059fdb9ad2..95cc0dcadfb44 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/RequestProcessor.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/RequestProcessor.kt @@ -76,7 +76,7 @@ class RequestProcessor @Inject constructor( ) } else { // Create a new request of the same type which includes the top component - ScreenshotRequest(request.source, request.type, info.component) + ScreenshotRequest(request.type, request.source, info.component) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt index 5cb27a47d384c..46a502acba168 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt @@ -99,13 +99,14 @@ class RequestProcessorTest { policy.getDefaultDisplayId(), DisplayContentInfo(component, bounds, UserHandle.of(USER_ID), TASK_ID)) - val request = ScreenshotRequest(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_CHORD) + val request = ScreenshotRequest(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_OTHER) val processor = RequestProcessor(imageCapture, policy, flags, scope) val processedRequest = processor.process(request) // Request has topComponent added, but otherwise unchanged. assertThat(processedRequest.type).isEqualTo(TAKE_SCREENSHOT_FULLSCREEN) + assertThat(processedRequest.source).isEqualTo(SCREENSHOT_OTHER) assertThat(processedRequest.topComponent).isEqualTo(component) }