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

Commit 9e3ba6f7 authored by Mark Renouf's avatar Mark Renouf
Browse files

Assign screenshot to default user when no policy applied 

When no policy is applied, the screenshot should be assigned
the owner should be the current primary user [Process.myUserHandle]

Bug: 342560727
Test: PolicyRequestProcessorTest
Flag: EXEMPT bugfix
Change-Id: I97d2a5d01205bf75c9af7255273bbdfb5daf7baa
parent f1c08c50

packages/SystemUI/src/com/android/systemui/screenshot/policy/PolicyRequestProcessor.kt

+5 −2
Original line number Diff line number Diff line
@@ -79,7 +79,10 @@ class PolicyRequestProcessor( 
    }



    /** Produce a new [ScreenshotData] using [CaptureParameters] */

    suspend fun modify(original: ScreenshotData, updates: CaptureParameters): ScreenshotData {

    private suspend fun modify(

        original: ScreenshotData,

        updates: CaptureParameters,

    ): ScreenshotData {

        // Update and apply bitmap capture depending on the parameters.

        val updated =

            when (val type = updates.type) {
@@ -117,7 +120,7 @@ class PolicyRequestProcessor( 
        return replaceWithScreenshot(

            original = original,

            componentName = topMainRootTask?.topActivity ?: defaultComponent,

            owner = topMainRootTask?.userId?.let { UserHandle.of(it) } ?: defaultOwner,

            owner = defaultOwner,

            displayId = original.displayId

        )

    }

packages/SystemUI/tests/src/com/android/systemui/screenshot/policy/PolicyRequestProcessorTest.kt

0 → 100644
+81 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui.screenshot.policy



import android.content.ComponentName

import android.graphics.Insets

import android.graphics.Rect

import android.os.UserHandle

import android.view.Display.DEFAULT_DISPLAY

import android.view.WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD

import android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN

import com.android.systemui.screenshot.ImageCapture

import com.android.systemui.screenshot.ScreenshotData

import com.android.systemui.screenshot.data.model.DisplayContentScenarios.ActivityNames.FILES

import com.android.systemui.screenshot.data.model.DisplayContentScenarios.TaskSpec

import com.android.systemui.screenshot.data.model.DisplayContentScenarios.singleFullScreen

import com.android.systemui.screenshot.data.repository.DisplayContentRepository

import com.android.systemui.screenshot.policy.TestUserIds.PERSONAL

import com.android.systemui.screenshot.policy.TestUserIds.WORK

import com.google.common.truth.Truth.assertWithMessage

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.runBlocking

import org.junit.Test



class PolicyRequestProcessorTest {



    val imageCapture = object : ImageCapture {

        override fun captureDisplay(displayId: Int, crop: Rect?) = null

        override suspend fun captureTask(taskId: Int) = null

    }



    /** Tests behavior when no policies are applied */

    @Test

    fun testProcess_defaultOwner_whenNoPolicyApplied() {

        val fullScreenWork = DisplayContentRepository {

            singleFullScreen(TaskSpec(taskId = 1001, name = FILES, userId = WORK))

        }



        val request =

            ScreenshotData(TAKE_SCREENSHOT_FULLSCREEN,

                SCREENSHOT_KEY_CHORD,

                null,

                topComponent = null,

                screenBounds = Rect(0, 0, 1, 1),

                taskId = -1,

                insets = Insets.NONE,

                bitmap = null,

                displayId = DEFAULT_DISPLAY)



        /* Create a policy request processor with no capture policies */

        val requestProcessor =

            PolicyRequestProcessor(Dispatchers.Unconfined,

                imageCapture,

                policies = emptyList(),

                defaultOwner = UserHandle.of(PERSONAL),

                defaultComponent = ComponentName("default", "Component"),

                displayTasks = fullScreenWork)



        val result = runBlocking { requestProcessor.process(request) }



        assertWithMessage(

            "With no policy, the screenshot should be assigned to the default user"

        ).that(result.userHandle).isEqualTo(UserHandle.of(PERSONAL))



        assertWithMessage("The topComponent of the screenshot").that(result.topComponent)

                .isEqualTo(ComponentName.unflattenFromString(FILES))

    }

}
 
 No newline at end of file