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

Commit 437874cb authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Run screenshot scroll capture even if type is PROVIDED_IMAGE" into main

parents 90eba776 16124ee0

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.kt

+1 −4
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.util.Log 
import android.view.Display

import android.view.ScrollCaptureResponse

import android.view.ViewRootImpl.ActivityConfigCallback

import android.view.WindowManager

import android.view.WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE

import android.widget.Toast

import android.window.WindowContext
@@ -218,9 +217,7 @@ internal constructor( 
        window.setFocusable(true)

        viewProxy.requestFocus()



        if (screenshot.type != WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE) {

        enqueueScrollCaptureRequest(requestId, screenshot.userHandle)

        }



        window.attachWindow()

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotCrossProfileService.kt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class ScreenshotCrossProfileService : Service() { 


    private val mBinder: IBinder =

        object : ICrossProfileService.Stub() {

            override fun launchIntent(intent: Intent, bundle: Bundle) {

            override fun launchIntent(intent: Intent, bundle: Bundle?) {

                startActivity(intent, bundle)

            }

        }