Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove SCREENSHOT_REQUEST_PROCESSOR Flag" into tm-qpr-dev am: ca67967fbc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20763607

Change-Id: I35ac0df7eca48974e9eddb75d41ce6f10245a58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Casey
2023-01-10 14:29:29 +00:00
committed by Automerger Merge Worker
parent d2118f71e5 ca67967fbc
commit 1ec8eadc25
3 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -431,9 +431,6 @@ object Flags {
unreleasedFlag(1206, "persist.wm.debug.predictive_back_bouncer_anim", teamfood = true) unreleasedFlag(1206, "persist.wm.debug.predictive_back_bouncer_anim", teamfood = true)
// 1300 - screenshots // 1300 - screenshots
// TODO(b/254512719): Tracking Bug
@JvmField val SCREENSHOT_REQUEST_PROCESSOR = releasedFlag(1300, "screenshot_request_processor")
// TODO(b/254513155): Tracking Bug // TODO(b/254513155): Tracking Bug
@JvmField @JvmField
val SCREENSHOT_WORK_PROFILE_POLICY = val SCREENSHOT_WORK_PROFILE_POLICY =

8
packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java
View File

@@ -21,7 +21,6 @@ import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS;
import static com.android.internal.util.ScreenshotHelper.SCREENSHOT_MSG_PROCESS_COMPLETE; import static com.android.internal.util.ScreenshotHelper.SCREENSHOT_MSG_PROCESS_COMPLETE;
import static com.android.internal.util.ScreenshotHelper.SCREENSHOT_MSG_URI; import static com.android.internal.util.ScreenshotHelper.SCREENSHOT_MSG_URI;
import static com.android.systemui.flags.Flags.SCREENSHOT_REQUEST_PROCESSOR;
import static com.android.systemui.flags.Flags.SCREENSHOT_WORK_PROFILE_POLICY; import static com.android.systemui.flags.Flags.SCREENSHOT_WORK_PROFILE_POLICY;
import static com.android.systemui.screenshot.LogConfig.DEBUG_CALLBACK; import static com.android.systemui.screenshot.LogConfig.DEBUG_CALLBACK;
import static com.android.systemui.screenshot.LogConfig.DEBUG_DISMISS; import static com.android.systemui.screenshot.LogConfig.DEBUG_DISMISS;
@@ -122,7 +121,6 @@ public class TakeScreenshotService extends Service {
mContext = context; mContext = context;
mBgExecutor = bgExecutor; mBgExecutor = bgExecutor;
mFeatureFlags = featureFlags; mFeatureFlags = featureFlags;
mFeatureFlags.addListener(SCREENSHOT_REQUEST_PROCESSOR, FlagEvent::requestNoRestart);
mFeatureFlags.addListener(SCREENSHOT_WORK_PROFILE_POLICY, FlagEvent::requestNoRestart); mFeatureFlags.addListener(SCREENSHOT_WORK_PROFILE_POLICY, FlagEvent::requestNoRestart);
mProcessor = processor; mProcessor = processor;
} }
@@ -224,14 +222,8 @@ public class TakeScreenshotService extends Service {
return; return;
} }
if (mFeatureFlags.isEnabled(SCREENSHOT_REQUEST_PROCESSOR)) {
Log.d(TAG, "handleMessage: Using request processor");
mProcessor.processAsync(request, mProcessor.processAsync(request,
(r) -> dispatchToController(r, onSaved, callback)); (r) -> dispatchToController(r, onSaved, callback));
return;
}
dispatchToController(request, onSaved, callback);
} }
private void dispatchToController(ScreenshotHelper.ScreenshotRequest request, private void dispatchToController(ScreenshotHelper.ScreenshotRequest request,

27
packages/SystemUI/tests/src/com/android/systemui/screenshot/TakeScreenshotServiceTest.kt
View File

@@ -39,7 +39,6 @@ import com.android.internal.util.ScreenshotHelper
import com.android.internal.util.ScreenshotHelper.ScreenshotRequest import com.android.internal.util.ScreenshotHelper.ScreenshotRequest
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.FakeFeatureFlags
import com.android.systemui.flags.Flags.SCREENSHOT_REQUEST_PROCESSOR
import com.android.systemui.flags.Flags.SCREENSHOT_WORK_PROFILE_POLICY import com.android.systemui.flags.Flags.SCREENSHOT_WORK_PROFILE_POLICY
import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_REQUESTED_KEY_CHORD import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_REQUESTED_KEY_CHORD
import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_REQUESTED_OVERVIEW import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_REQUESTED_OVERVIEW
@@ -101,7 +100,6 @@ class TakeScreenshotServiceTest : SysuiTestCase() {
}.`when`(requestProcessor).processAsync(/* request= */ any(), /* callback= */ any()) }.`when`(requestProcessor).processAsync(/* request= */ any(), /* callback= */ any())
// Flipped in selected test cases // Flipped in selected test cases
flags.set(SCREENSHOT_REQUEST_PROCESSOR, false)
flags.set(SCREENSHOT_WORK_PROFILE_POLICY, false) flags.set(SCREENSHOT_WORK_PROFILE_POLICY, false)
service.attach( service.attach(
@@ -148,31 +146,6 @@ class TakeScreenshotServiceTest : SysuiTestCase() {
topComponent.packageName, eventLogger.get(0).packageName) topComponent.packageName, eventLogger.get(0).packageName)
} }
@Test
fun takeScreenshot_requestProcessorEnabled() {
flags.set(SCREENSHOT_REQUEST_PROCESSOR, true)
val request = ScreenshotRequest(
TAKE_SCREENSHOT_FULLSCREEN,
SCREENSHOT_KEY_CHORD,
topComponent)
service.handleRequest(request, { /* onSaved */ }, callback)
verify(controller, times(1)).takeScreenshotFullscreen(
eq(topComponent),
/* onSavedListener = */ any(),
/* requestCallback = */ any())
assertEquals("Expected one UiEvent", eventLogger.numLogs(), 1)
val logEvent = eventLogger.get(0)
assertEquals("Expected SCREENSHOT_REQUESTED UiEvent",
logEvent.eventId, SCREENSHOT_REQUESTED_KEY_CHORD.id)
assertEquals("Expected supplied package name",
topComponent.packageName, eventLogger.get(0).packageName)
}
@Test @Test
fun takeScreenshotProvidedImage() { fun takeScreenshotProvidedImage() {
val bounds = Rect(50, 50, 150, 150) val bounds = Rect(50, 50, 150, 150)