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

ff29f140

Commit ff29f140 authored 1 year ago by Eric Laurent Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge changes from topic "anon_bt_address_udc_dev" into udc-dev am: 17bc7f4b

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

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

parents c4b77d1f 17bc7f4b

No related branches found

No related tags found

No related merge requests found

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

media/java/android/media/AudioDeviceAttributes.java 25 additions, 1 deletion

media/java/android/media/AudioDeviceAttributes.java
services/core/java/com/android/server/audio/AdiDeviceState.java 10 additions, 1 deletion

...es/core/java/com/android/server/audio/AdiDeviceState.java
services/core/java/com/android/server/audio/AudioDeviceBroker.java 11 additions, 6 deletions

...core/java/com/android/server/audio/AudioDeviceBroker.java
services/core/java/com/android/server/audio/AudioDeviceInventory.java 72 additions, 28 deletions

...e/java/com/android/server/audio/AudioDeviceInventory.java
services/core/java/com/android/server/audio/AudioService.java 183 additions, 26 deletions

...ices/core/java/com/android/server/audio/AudioService.java

with 301 additions and 62 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