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

Commit db9acd1f authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Automerger Merge Worker
Browse files

Merge "[MediaProjection] Handle null DisplayContent when trying to set the... 

Merge "[MediaProjection] Handle null DisplayContent when trying to set the session" into udc-dev am: 9a50b8ad am: 1d46aedb

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



Change-Id: I8bf57eefe1d858388167a20687a5b1055b9cef2a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1abf0436 1d46aedb

data/etc/services.core.protolog.json

+6 −0
Original line number Diff line number Diff line
@@ -2059,6 +2059,12 @@ 
      "group": "WM_DEBUG_CONFIGURATION",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "-233530384": {

      "message": "Content Recording: Incoming session on display %d can't be set since it is already null; the corresponding VirtualDisplay must have already been removed.",

      "level": "VERBOSE",

      "group": "WM_DEBUG_CONTENT_RECORDING",

      "at": "com\/android\/server\/wm\/ContentRecordingController.java"

    },

    "-230587670": {

      "message": "SyncGroup %d:  Unfinished container: %s",

      "level": "VERBOSE",

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

+7 −0
Original line number Diff line number Diff line
@@ -98,6 +98,13 @@ final class ContentRecordingController { 
                    mSession == null ? null : mSession.getVirtualDisplayId());

            incomingDisplayContent = wmService.mRoot.getDisplayContentOrCreate(

                    incomingSession.getVirtualDisplayId());

            if (incomingDisplayContent == null) {

                ProtoLog.v(WM_DEBUG_CONTENT_RECORDING,

                        "Content Recording: Incoming session on display %d can't be set since it "

                                + "is already null; the corresponding VirtualDisplay must have "

                                + "already been removed.", incomingSession.getVirtualDisplayId());

                return;

            }

            incomingDisplayContent.setContentRecordingSession(incomingSession);

            // TODO(b/270118861): When user grants consent to re-use, explicitly ask ContentRecorder

            //  to update, since no config/display change arrives. Mark recording as black.