Merge "ContentRecorder: fix the NPE problem." into main (e4f50b0b) · Commits · e / os / android_frameworks_base

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -453,15 +453,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,