Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

c0a7060d

Commit c0a7060d authored 5 years ago by Kyunglyul Hyun Committed by Android (Google) Code Review 5 years ago

Downloads
- Plain Diff

Merge "MediaRouter: make setControlCategories synchronous"

parents e6b206ba 484074ae

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

media/java/android/media/MediaRouter2.java 102 additions, 108 deletions

media/java/android/media/MediaRouter2.java
media/java/android/media/MediaRouter2Manager.java 39 additions, 47 deletions

media/java/android/media/MediaRouter2Manager.java
media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2Test.java 116 additions, 0 deletions

...ter/src/com/android/mediaroutertest/MediaRouter2Test.java
media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java 47 additions, 103 deletions

...c/com/android/mediaroutertest/MediaRouterManagerTest.java
services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java 6 additions, 2 deletions

...ava/com/android/server/media/MediaRouter2ServiceImpl.java

with 310 additions and 260 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