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

1fde4358

Commit 1fde4358 authored 1 year ago by Chen Bai Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "do wom: allow DisplayOffload to block screen turning on" into main

parents 37666605 eb57142b

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/hardware/display/DisplayManagerInternal.java 17 additions, 0 deletions

...java/android/hardware/display/DisplayManagerInternal.java
services/core/java/com/android/server/display/DisplayOffloadSessionImpl.java 9 additions, 0 deletions

...com/android/server/display/DisplayOffloadSessionImpl.java
services/core/java/com/android/server/display/DisplayPowerController2.java 85 additions, 6 deletions

...a/com/android/server/display/DisplayPowerController2.java
services/tests/displayservicetests/src/com/android/server/display/DisplayOffloadSessionImplTest.java 9 additions, 0 deletions

...android/server/display/DisplayOffloadSessionImplTest.java
services/tests/displayservicetests/src/com/android/server/display/LocalDisplayAdapterTest.java 3 additions, 0 deletions

...c/com/android/server/display/LocalDisplayAdapterTest.java

with 123 additions and 6 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