Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

fe102a34

Commit fe102a34 authored 2 years ago by Naomi Musgrave Committed by Automerger Merge Worker 2 years ago

Downloads
- Plain Diff

Merge "[Partial Screenshare] Respond to task changes" into tm-qpr-dev am: f5a7752b am: 56e0f4a6

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

Change-Id: I7b9e83f3a02fdaec1a2a11d2854a460de31a0887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b9b5ce87 56e0f4a6

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

data/etc/services.core.protolog.json 12 additions, 0 deletions

data/etc/services.core.protolog.json
services/core/java/com/android/server/display/DisplayManagerService.java 0 additions, 2 deletions

...ava/com/android/server/display/DisplayManagerService.java
services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java 9 additions, 4 deletions

...erver/media/projection/MediaProjectionManagerService.java
services/core/java/com/android/server/wm/ContentRecorder.java 81 additions, 22 deletions

...ices/core/java/com/android/server/wm/ContentRecorder.java
services/core/java/com/android/server/wm/ContentRecordingController.java 4 additions, 6 deletions

...ava/com/android/server/wm/ContentRecordingController.java
services/core/java/com/android/server/wm/DisplayContent.java 10 additions, 1 deletion

services/core/java/com/android/server/wm/DisplayContent.java
services/core/java/com/android/server/wm/WindowManagerInternal.java 3 additions, 1 deletion

...ore/java/com/android/server/wm/WindowManagerInternal.java
services/core/java/com/android/server/wm/WindowManagerService.java 6 additions, 6 deletions

...core/java/com/android/server/wm/WindowManagerService.java
services/tests/wmtests/src/com/android/server/wm/ContentRecorderTests.java 46 additions, 12 deletions

...tests/src/com/android/server/wm/ContentRecorderTests.java
services/tests/wmtests/src/com/android/server/wm/ContentRecordingControllerTests.java 1 addition, 1 deletion

...om/android/server/wm/ContentRecordingControllerTests.java

with 172 additions and 55 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment