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

4ce70799

Commit 4ce70799 authored 1 year ago by Fiona Campbell Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "DisplayConfig: Add flag-protected option to select Fusion Proximity sensor." into main

parents f788d809 a6c764c7

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

services/core/java/com/android/server/display/DisplayDeviceConfig.java 1 addition, 1 deletion

.../java/com/android/server/display/DisplayDeviceConfig.java
services/core/java/com/android/server/display/config/SensorData.java 36 additions, 11 deletions

...re/java/com/android/server/display/config/SensorData.java
services/core/java/com/android/server/display/feature/DisplayManagerFlags.java 17 additions, 1 deletion

...m/android/server/display/feature/DisplayManagerFlags.java
services/core/java/com/android/server/display/feature/display_flags.aconfig 8 additions, 0 deletions

.../com/android/server/display/feature/display_flags.aconfig
services/core/xsd/display-device-config/display-device-config.xsd 2 additions, 1 deletion

.../core/xsd/display-device-config/display-device-config.xsd
services/core/xsd/display-device-config/schema/current.txt 3 additions, 2 deletions

services/core/xsd/display-device-config/schema/current.txt

with 67 additions and 16 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