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

Commit 63cf5baf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ContentRecorder: fix the NPE problem." into main am: e4f50b0b am: 588045ab 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3399282



Change-Id: Ia8170b071922eda9205ae2648fb96a21e07656db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c4ae85c 588045ab

services/core/java/com/android/server/wm/ContentRecorder.java

+6 −4
Original line number Diff line number Diff line
@@ -473,15 +473,17 @@ final class ContentRecorder implements WindowContainerListener { 
            case RECORD_CONTENT_TASK:

                // Given the WindowToken of the region to record, retrieve the associated

                // SurfaceControl.

                if (tokenToRecord == null) {

                final WindowContainer wc = tokenToRecord != null

                        ? WindowContainer.fromBinder(tokenToRecord) : null;

                if (wc == null) {

                    handleStartRecordingFailed();

                    ProtoLog.v(WM_DEBUG_CONTENT_RECORDING,

                            "Content Recording: Unable to start recording due to null token for "

                                    + "display %d",

                            "Content Recording: Unable to start recording due to null token or " +

                                    "null window container for " + "display %d",

                            mDisplayContent.getDisplayId());

                    return null;

                }

                Task taskToRecord = WindowContainer.fromBinder(tokenToRecord).asTask();

                final Task taskToRecord = wc.asTask();

                if (taskToRecord == null) {

                    handleStartRecordingFailed();

                    ProtoLog.v(WM_DEBUG_CONTENT_RECORDING,