Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always updateRecording in ContentRecordingController#setContentRecordingSession" into udc-qpr-dev

Browse Source
This commit is contained in:
Daniel Akinola
2023-08-10 14:58:42 +00:00
committed by Android (Google) Code Review
parent e729480efe 6fc8f3282f
commit 6f72903711
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/ContentRecordingController.java
View File

@@ -117,10 +117,11 @@ final class ContentRecordingController {
}
incomingDisplayContent.setContentRecordingSession(incomingSession);
// Updating scenario: Explicitly ask ContentRecorder to update, since no config or
// display change will trigger an update from the DisplayContent.
if (hasSessionUpdatedWithConsent) {
incomingDisplayContent.updateRecording();
}
// display change will trigger an update from the DisplayContent. There exists a
// scenario where a DisplayContent is created, but it's ContentRecordingSession hasn't
// been set yet due to a race condition. On creation, updateRecording fails to start
// recording, so now this call guarantees recording will be started from somewhere.
incomingDisplayContent.updateRecording();
}
// Takeover and stopping scenario: stop recording on the pre-existing session.
if (mSession != null && !hasSessionUpdatedWithConsent) {

3
services/tests/wmtests/src/com/android/server/wm/ContentRecordingControllerTests.java
View File

@@ -123,6 +123,7 @@ public class ContentRecordingControllerTests extends WindowTestsBase {
controller.setContentRecordingSessionLocked(mWaitingDisplaySession, mWm);
verify(mVirtualDisplayContent, atLeastOnce()).setContentRecordingSession(
mWaitingDisplaySession);
verify(mVirtualDisplayContent).updateRecording();
// WHEN updating the session on the same display, so no longer waiting to record.
ContentRecordingSession sessionUpdate = ContentRecordingSession.createTaskSession(
@@ -135,7 +136,7 @@ public class ContentRecordingControllerTests extends WindowTestsBase {
// THEN the session was accepted.
assertThat(resultingSession).isEqualTo(sessionUpdate);
verify(mVirtualDisplayContent, atLeastOnce()).setContentRecordingSession(sessionUpdate);
verify(mVirtualDisplayContent).updateRecording();
verify(mVirtualDisplayContent, atLeastOnce()).updateRecording();
}
@Test