Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca67967f authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Remove SCREENSHOT_REQUEST_PROCESSOR Flag" into tm-qpr-dev

parents 42313920 0444d2ea

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3
Original line number Diff line number Diff line
@@ -431,9 +431,6 @@ object Flags { 
        unreleasedFlag(1206, "persist.wm.debug.predictive_back_bouncer_anim", teamfood = true)



    // 1300 - screenshots

    // TODO(b/254512719): Tracking Bug

    @JvmField val SCREENSHOT_REQUEST_PROCESSOR = releasedFlag(1300, "screenshot_request_processor")



    // TODO(b/254513155): Tracking Bug

    @JvmField

    val SCREENSHOT_WORK_PROFILE_POLICY =

packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java

+2 −10
Original line number Diff line number Diff line
@@ -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_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.screenshot.LogConfig.DEBUG_CALLBACK;

import static com.android.systemui.screenshot.LogConfig.DEBUG_DISMISS;
@@ -122,7 +121,6 @@ public class TakeScreenshotService extends Service { 
        mContext = context;

        mBgExecutor = bgExecutor;

        mFeatureFlags = featureFlags;

        mFeatureFlags.addListener(SCREENSHOT_REQUEST_PROCESSOR, FlagEvent::requestNoRestart);

        mFeatureFlags.addListener(SCREENSHOT_WORK_PROFILE_POLICY, FlagEvent::requestNoRestart);

        mProcessor = processor;

    }
@@ -224,14 +222,8 @@ public class TakeScreenshotService extends Service { 
            return;

        }



        if (mFeatureFlags.isEnabled(SCREENSHOT_REQUEST_PROCESSOR)) {

            Log.d(TAG, "handleMessage: Using request processor");

        mProcessor.processAsync(request,

                (r) -> dispatchToController(r, onSaved, callback));

            return;

        }



        dispatchToController(request, onSaved, callback);

    }



    private void dispatchToController(ScreenshotHelper.ScreenshotRequest request,

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

+0 −27
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.internal.util.ScreenshotHelper 
import com.android.internal.util.ScreenshotHelper.ScreenshotRequest

import com.android.systemui.SysuiTestCase

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.screenshot.ScreenshotEvent.SCREENSHOT_REQUESTED_KEY_CHORD

import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_REQUESTED_OVERVIEW
@@ -101,7 +100,6 @@ class TakeScreenshotServiceTest : SysuiTestCase() { 
        }.`when`(requestProcessor).processAsync(/* request= */ any(), /* callback= */ any())



        // Flipped in selected test cases

        flags.set(SCREENSHOT_REQUEST_PROCESSOR, false)

        flags.set(SCREENSHOT_WORK_PROFILE_POLICY, false)



        service.attach(
@@ -148,31 +146,6 @@ class TakeScreenshotServiceTest : SysuiTestCase() { 
            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

    fun takeScreenshotProvidedImage() {

        val bounds = Rect(50, 50, 150, 150)