Commit Graph
100 Commits
Author SHA1 Message Date
Santiago Seifert 34e086f3ce Ensure non-empty selected routes in session
This is a partial revert of
I0c12d2b63b0c3969c91e0082f7821e342360b724, which allows a race
condition where the available routes don't include the selected
route, because both collections are obtained without holding the
lock that guards both collections.

While this change doesn't ensure the transferable and selectable
routes of the session are consistent, it does prevent an exception
due to empty selectable routes.

Bug: b/416911854
Test: atest CtsMediaRouterTestCases
Test: Manual using a BT device and a wired headset.
Flag: EXEMPT BUGFIX
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:d1b3245c261cabcc936af263e3f71b79c9aeecc5
Merged-In: I6a022c6098daf8282e6085bb671173f574e63a4f
Change-Id: I6a022c6098daf8282e6085bb671173f574e63a4f
2025-10-02 05:27:43 -07:00
Santiago Seifert 0878ed30c4 Prevent null entries in mDeviceSuggestions
Bug: 444456059
Flag: EXEMPT BUGFIX
Test: Presubmit (NPE fix)
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:054a7e13ac902ac374d71c7040f0cbc153bb12c0
Merged-In: I8be949bc421d3e0d87f3e85824fc780f3eef664c
Change-Id: I8be949bc421d3e0d87f3e85824fc780f3eef664c
2025-09-18 20:08:56 -07:00
Santiago Seifert 11b8cb226b Merge "Add BeTo owners to mediarouterservicetest" into main 2025-09-11 10:01:49 -07:00
Santiago Seifert 74b04a02d6 Add BeTo owners to mediarouterservicetest
Bug: 205124386
Test: n/a
Flag: EXEMPT OWNERS only
Change-Id: I5640cc7d01f6f67324f8e31b887670490010563b
2025-09-11 13:19:57 +00:00
Santiago Seifert f577dab2ea Make MediaSessions listen for system media session overrides
This enables the sys ui volume slider to show up for volume adjustment
events in mirroring sessions. We still need to change routing session
updates to only show the slider as a result of a hardware volume key
press.

Bug: b/396394220
Test: atest CtsMediaRouterTestCases
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I1fccb4cf3891a1c61c92ea3dad9e97f7b7fc27ce
2025-08-27 16:57:29 +00:00
Santiago Seifert 7641e0a7d5 Merge "Add getter for system session overrides" into main 2025-08-26 03:42:48 -07:00
Santiago Seifert c0ff8c94b4 Add getter for system session overrides
This is necessary in case SysUI crashes and needs to restart while a
mirroring session is already ongoing.

Bug: b/396394220
Test: atest CtsMediaRouterTestCases
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: Ic3866066124f5b4c63dd4569e419a0c1415c702b
2025-08-25 15:51:36 +00:00
Santiago Seifert bb96039b0f Merge "Flag session changes that happen after a volume key press" into main 2025-08-25 08:33:46 -07:00
Santiago Seifert f28693b0e3 Flag session changes that happen after a volume key press
This change makes session updates that happen right after a volume key
press include shouldShowVolumeUi = true.

Bug: b/396394220
Test: atest CtsMediaRouterTestCases
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: Id7154794171e4dc3447c734a3bb7041b080d09e2
2025-08-25 10:48:22 +00:00
Santiago Seifert 9d784f9e68 Add flag to show a slider UI for routing session volume changes
This change is a non-functional refactor that enables the routing
framework to flag that a UI slider should be associated with a given
session update. The purpose of this change is to show the SysUI volume
slider when a mirroring session's volume changes as a result of a
hardware volume key press.

This change only adds the plumbing. The actual functional change to
populate the flag to true comes in a later change.

The approach used in this change mimics the approach used by
AudioManager#FLAG_SHOW_UI and MediaSessionManager#RemoteSessionCallback.

Bug: b/396394220
Test: atest CtsMediaRouterTestCases
Flag: EXEMPT refactor
Change-Id: I594c110e55eab0b77a7a1e685c55023c5704a9da
2025-08-21 18:17:18 +00:00
Santiago Seifert dad23386b8 Merge changes I582e1297,Ia1fda27b into main
* changes:
  Make misc parcelable performance improvements
  Add MR2 listener for the list of apps with system session overrides
2025-08-20 07:33:17 -07:00
Santiago Seifert d6d0af2ad2 Remove notifyDiscoveryPreferenceChangedToManager
It's not needed: manager.notifyDiscoveryPreferenceChanged is equivalent
and equally simple

Bug: 360129098
Test: Manual simple casting flow using routing demo app
Flag: EXEMPT refactor
Change-Id: I15452142e8f1a3bd41ad02e656296410282ca636
2025-08-20 05:58:51 -07:00
Santiago Seifert d417e53bcb Fix spammy logging for route discovery prefs notifications
This change is a (mostly) non-functional change to improve logging
when the binder transaction to notify a manager of a route discovery
preference change.

Bug: 360129098
Test: Manual simple casting flow using routing demo app
Flag: EXEMPT refactor

Change-Id: Ibee1a2431c2c937bc0aaefb9fc1e451b97dd8148
2025-08-20 05:58:21 -07:00
Santiago Seifert 2b272ac517 Make misc parcelable performance improvements
Bug: b/396394220
Test: atest CtsMediaRouterTestCases
Flag: EXEMPT refactor
Change-Id: I582e1297cc4d2df483bbe18bef2bd51d2a90d56e
2025-08-20 12:51:24 +00:00
Santiago Seifert d567e435ae Add MR2 listener for the list of apps with system session overrides
A system session override is an alteration on how system media is routed
for the app with the override. Per-app dynamic audio routing policies
are an example of overrides. The new listener enables components (like
SysUI) to know which applications have a system session override. And
this, in turn, allows said components to create a Proxy MediaRouter to
control said apps system routing session.

Bug: b/396394220
Test: atest CtsMediaRouterTestCases
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: Ia1fda27b0b6402621e37e669283dbbb3763403b1
2025-08-20 12:51:16 +00:00
Santiago Seifert 111c8c7b26 Fix spammy logging for session creation notifications
This change is a (mostly) non-functional change to improve logging
when the binder transaction to notify a manager of a session
creation fails.

Bug: 360129098
Test: Manual simple casting flow using routing demo app
Flag: EXEMPT refactor
Change-Id: If9ee7c7e69254c27630a388737b44925de735d49
2025-08-19 17:17:12 +00:00
Santiago Seifert f9a3e2d340 Remove unused MediaRouter2Manager from VolumeDialogControllerImpl
It's unused.

Bug: b/205124386
Test: presubmit
Flag: EXEMPT dead code removal
Change-Id: Ifc900bd6a5ff2177a9f4e106cca9fecca5bf7a11
2025-08-19 06:35:04 -07:00
Santiago Seifert 26bc2eb368 Prevent spammy remote exception logging
This change is a (mostly) non-functional change to simplify the
notification of RLP changes to proxy routers, while also improving the
logging that occurs when the binder transaction fails.

Bug: 360129098
Test: Manual simple RLP flow using routing demo app
Flag: EXEMPT refactor
Change-Id: I7b6a0559f642a3419a2fb3e062d6ad70a93fe8f3
2025-08-19 13:18:06 +00:00
Santiago Seifert 95fae49fbb Make PackageNameUserHandlePair Parcelable
For this, we need to move into a standalone class. We are also renaming
it to AppId.

This is a preliminary refactor for the implementation of volume sliders
for "Cast mirroring" sessions.

Bug: b/396394220
Test: atest CtsMediaRouterTestCases
Flag: EXEMPT refactor
Change-Id: I19504d00240178c0f1981eca34e6172e15abea7c
2025-08-15 18:24:06 +00:00
Santiago Seifert 9caf7c53a5 Merge "Make UserHandler hold a UserHandle instead of a user id" into main 2025-08-14 11:16:30 -07:00
Santiago Seifert 3cafd329d7 Make UserHandler hold a UserHandle instead of a user id
A handle gives use some more type safety. Plus, it's generally cheaper
to convert a UserHandle to the int id than viceversa.

Bug: 396394220
Test: atest CtsMediaRouterTestCases
Flag: EXEMPT refactor
Change-Id: I587ab0c93b66af9d02990bbd0d8013c299e2b641
2025-08-13 13:32:49 +00:00
Santiago Seifert 1b71878f7a Merge "Remove flag enable_fix_for_route_visibility" into main 2025-07-14 03:23:26 -07:00
Santiago Seifert c50a7587bc Make mirroring sessions releasable
Makes Output Switcher enable the Stop Casting button while mirroring.

Bug: b/396396416
Test: atest android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I867e0a9c767b5182819d5dd6db4f780492f8e312
2025-07-11 22:05:04 +00:00
Santiago Seifert 9bbaf778a4 Merge "Release session when apps are terminated" into main 2025-07-10 09:28:12 -07:00
Santiago Seifert 8276b06f41 Release session when apps are terminated
This change releases any sessions and resources associated to apps that
are terminated. This enables the sender to disconnect when the re-routed
(aka mirrored) application is terminated.

Bug: b/362507305
Test: CtsMediaRouterTestCases
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: Ia2cbd5ebf1b869ba61c717bdba3e86125af686ac
2025-07-09 13:54:57 +00:00
Santiago Seifert 8f7f04ef0f Remove flag enable_fix_for_route_visibility
Fixes: b/430093003
Flag: EXEMPT Flag cleanup
Test: presubmit
Change-Id: I67fa454791521d406b6d39fa61a41c296455b5ed
2025-07-09 04:15:53 -07:00
Santiago Seifert f613adca1f Merge "Avoid lock when out of process" into main 2025-07-08 03:12:56 -07:00
Santiago Seifert b46fec126b Remove weak references in MR2ServiceImpl
The MR2ServiceImpl class is a singleton, and its lifecycle is coupled to
MediaRouterService, who is also in turn a singleton whose lifecycle is
coupled to system_server's lifecycle. So, there's no value in using weak
refs for those classes, as they should never be garbage-collected.

This change gets rid of weakrefs and makes cascade simplifications
without making further invasive changes.

Fixes: b/404574505
Test: atest CtsMediaRouterTestCases CtsMediaHostTestCases
Flag: EXEMPT I don't see how we can flag this change without massive churn.
Change-Id: Ib0dbb04b0540fe4497dc2417872d29f5d9369f93
2025-07-08 10:00:16 +00:00
Santiago Seifert dc43ff3819 Merge "Implement SystemMediaRoute2Provider2#release" into main 2025-07-07 09:59:12 -07:00
Santiago Seifert b18768879d Implement SystemMediaRoute2Provider2#release
Releases system media routing (aka mirroring) resources associated with
the given session. This is relevant for the "Stop Casting" button on the
Output Switcher.

Bug: b/396396416
Test: CtsMediaRouterTestCases
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I69dc6f4f316aa3b3841e7f6b8f5ddce5e7c2643b
2025-07-07 12:31:19 +00:00
Santiago Seifert 41a7cdac13 Avoid lock when out of process
The lock protects no resources.

Test: Non-functional change.
Flag: EXEMPT Non-functional change.
Bug: 205124386
Change-Id: I6eca45990f5d521a4f95a559c9d9a08cf577ab47
2025-07-04 08:53:15 -07:00
Santiago Seifert 25c8e16701 Revert "Add support for system-wide mirroring"
This reverts commit fc62ef1c75.

Reason for revert: We don't want to support global routing for the first iteration.

Test: atest CtsMediaRouterTestCases:android.media.router.cts.SystemMediaRoutingTest
Bug: b/362507305
Bug: b/413313659
Change-Id: Ic4f1d01f630f3872634ff604fadc42bdafbf71a6
2025-07-03 15:20:21 +00:00
Santiago Seifert bfe173d49a Release audio record when mirroring ends
This change replaces stop() with release (which includes a stop under
the hood). This is necessary to ensure resources are freed.

Bug: b/362507305
Test: atest CtsMediaRouterTestCases:android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: Ia0c60fb69144a368c1c279bc4989c2b2e0f6fe6a
2025-07-03 15:10:00 +00:00
Santiago Seifert 3a01ffff14 Merge "Add SetFlagsRule to fix tests when flag off" into main 2025-06-20 04:46:18 -07:00
Santiago Seifert 3d29a80a0c Removed two unused functions
Test: presubmit
Flag: EXEMPT removed dead code
Bug: b/205124386
Change-Id: Ia75b5fd75c14d61b9859b05e94cddc31c2bacb40
2025-06-17 05:17:56 -07:00
Santiago Seifert 12ae84761f Inline "enable audio policies" flag
We cannot get rid of the flag, because it's exported. But we can assume
the value to be true, which has been the case since Android V. This
simplifies the system routing implementation considerably.

This change is expected to be completely non-functional.

Bug: b/391325457
Test: atest CtsMediaRouterTestCases
Test: atest MediaRouterServiceTests
Flag: EXEMPT code cleanup
Change-Id: I0c12d2b63b0c3969c91e0082f7821e342360b724
2025-05-29 19:02:43 +00:00
Santiago Seifert 0bc54ab827 Merge "Add builder javadoc" into main 2025-05-22 06:13:32 -07:00
Santiago Seifert 047d093aa1 Add builder javadoc
Test: presubmit
Flag: EXEMPT javadoc only
Bug: b/409118670
Change-Id: I8a4e4a0a3de11575206dd683a2524c9850c183c2
2025-05-22 03:09:11 -07:00
Santiago Seifert 09853ad3f2 Clean up enable_fix_for_empty_system_routes_crash
Test: built locally
Flag: EXEMPT flag cleanup
Bug: b/414460716
Change-Id: Ia1246aa381607e6639dfedefcd56ee7660adc660
2025-05-21 11:25:39 -07:00
Santiago Seifert 09c4c9df97 Merge "Change the bug id of hide_bt_address_from_apps_without_bt_permission" into main 2025-05-20 10:27:33 -07:00
Santiago Seifert ee995362c0 Make the default system session non-releasable
The default session is what we show to unprivileged apps as the current
"system output". For example, the built-in speaker, BT, HDMI, etc. By
definition, it's what we show to apps with no privilege, and hence the
release type is always going to be "non-releasable".

Also use RELEASE_UNSUPPORTED if the personal audio sharing flag is
disabled.

Test: Manually using the AndroidX sample routing app.
Bug: 385672684
Flag: com.android.media.flags.enable_output_switcher_personal_audio_sharing
Change-Id: I454082dd44a78d38f2836e97861a13174b5a3fbe
2025-05-20 14:10:28 +00:00
Santiago Seifert 8321e9e8a0 Change the bug id of hide_bt_address_from_apps_without_bt_permission
The old bug id was a spotify-specific component to which gantry has no
access.

Bug: b/410871506
Bug: b/418245099
Test: EXEMPT aconfig update
Flag: com.android.media.flags.hide_bt_address_from_apps_without_bt_permission
Change-Id: I730d262e442032460274a9a1236bd61f95336799
2025-05-20 06:25:41 -07:00
Santiago Seifert 8e4b252c2d Hide the BT address from apps that don't have BT permission
Bug: b/373646834
Test: atest CtsMediaRouterTestCases
Flag: com.android.media.flags.hide_bt_address_from_apps_without_bt_permission
Change-Id: I743bd72a2b6a5ec0e1b80d1d35100624a5fc38e4
2025-05-16 07:34:03 -07:00
Santiago Seifert 1b35895908 Fix route visibility enforcement for proxy routers
Test: atest CtsMediaRouterTestCases
Test: atest CtsMediaHostTestCases
Test: Manually using media routing demo app and 3rd party media app
Bug: b/416436531
Flag: com.android.media.flags.enable_fix_for_route_visibility
Change-Id: I81c1e7faabf2483aba57352795994cb1f7f8de00
2025-05-16 04:04:15 -07:00
Santiago Seifert 752e85bbd3 Add flag to enable per-app mirroring in MR2
Bug: b/413313659
Test: build (no functional change)
Flag: com.android.media.flags.enable_per_app_mirroring_in_media_router_2
Change-Id: I7c4ce5885b9ae2a95ca518fb70d97bb0698c8e44
2025-04-24 06:26:01 -07:00
Santiago Seifert a58673f6b0 Merge "Fix lack of client package name after system session updates" into main 2025-04-21 11:48:00 -07:00
Santiago Seifert ecac7bb192 Fix lack of client package name after system session updates
This fixes an issue that already existed before mirroring, but was
surfaced as a result of mirroring changes because mirroring triggers
updates in the system session.

The system session (which is populated with AudioManager routes) is
created in system_server without a package name, and then each router
takes care of populating the package name. There was a gap in this
"ensuring the client package name is populated" for system session
updates. But those are uncommon in CTS because they depend on an
AudioManager event, which doesn't happen during CTS. With mirroring,
system session updates become more frequent. This changes fixes the gap.

This gap was detected through MediaRouter2Test#testMediaRouter2ReturnsRoutingSessionInfoWithNonEmptyClientName.

Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases:android.media.router.cts.SystemMediaRoutingTest
Test: atest CtsMediaRouterTestCases:MediaRouter2Test
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I7995d3ba09379f034a43dcb837db58e8efaa9942
2025-04-17 13:26:07 +00:00
Santiago Seifert 62d60d7471 Clean up enable_prevention_of_manager_scans_when_no_apps_scan
Test: Build platform and relevant tests
Flag: EXEMPT flag cleanup
Bug: b/409605944
Change-Id: I44df2fda06d60216cbc24e016620978b19bdf069
2025-04-11 11:34:01 +00:00
Santiago Seifert d48c43e7e7 Merge "Route volume key presses to mirroring sessions while mirroring" into main 2025-04-07 06:34:46 -07:00
Santiago Seifert bd1ccc9748 Route volume key presses to mirroring sessions while mirroring
This change doesn't implement the system ui changes, which will come in
a follow up CL.

Bug: b/362507305
Bug: b/396394220
Test: atest CtsMediaBetterTogetherTestCases:android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: Icd9b1fa299093dded1ebcd52d31ada6d764be022
2025-04-04 18:35:39 +00:00
Santiago Seifert e773faa0f9 Add better_together_OWNERS to frameworks/base/media
Bug: b/205124386
Flag: EXEMPT OWNERS only change.
Test: N/A. OWNERS only change.
Change-Id: Ia38d778e6fe67beee0073d90550d2af738de1899
2025-04-02 04:25:45 -07:00
Santiago Seifert 2c4b90aaa5 Merge "Fix "null or empty system routes" crash in SysUI" into main 2025-03-21 09:32:28 -07:00
Santiago Seifert ac24d089e2 Fix "null or empty system routes" crash in SysUI
This can happen when the media strategy is not available during startup,
so a legacy device route controller is instantiated, instead of the
"correct" audio manager route controller. This change fixes an
implementaiton issue in the legacy route controller, causing it to
return an empty collection of available routes, which is in turn used to
populate the provider info. This change makes the available routes
include the currently selected route.

Longer term, we want to get rid of the legacy route controller but, in
the meantime, this bugfix prevents a crash in sys ui.

Bug: b/357468728
Test: Manually by "forcing" a null media strat.
Test: atest LegacyDeviceRouteControllerTest
Flag: com.android.media.flags.enable_fix_for_empty_system_routes_crash
Change-Id: I5f84bbc9f1102b3df8966be27c7754cd05b53b6b
2025-03-20 11:59:58 -07:00
Santiago Seifert 542955e897 Merge "[Media Router Metrics] Log Scanning Start/Stopped events" into main 2025-03-20 07:54:22 -07:00
Santiago Seifert dabe371231 Merge "Make dedup id mandatory for multiple routing type support" into main 2025-03-03 05:05:29 -08:00
Santiago Seifert 919bed66ce Make dedup id mandatory for multiple routing type support
This enables identifying a mirroring MR2Info object and the
corresponding "remote one" as the same physical receiver device.

Bug: b/396403760
Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases:android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I54bf41ff9d5f6d87191a9862069fd9e3781ff152
2025-02-27 18:49:58 +00:00
Santiago Seifert 3a8ab66c1c Address API council feedback
Bug: b/396229325
Bug: b/362507305
Test: Presubmit (javadoc only)
Flag: EXEMPT javadocs only
Change-Id: I153795c4d935acb998a88919cadf10b5cf915632
2025-02-19 12:23:29 +00:00
Santiago Seifert 9735ce4c9f Merge "Fix incorrect thread access to mLastNotifiedRoutesToPrivilegedRouters" into main 2025-02-13 03:11:08 -08:00
Santiago Seifert c91305226c Fix incorrect thread access to mLastNotifiedRoutesToPrivilegedRouters
This change is a partial revert of the change with id
Iba0897590d0129ffb0eaf8e152713d582be1fd1f.

Bug: b/379788233
Test: Manually.
Test: atest CtsMediaRouterTestCases
Flag: EXEMPT bugfix
Change-Id: I690f2966aa35cad54cbd1e70de62637f01de530c
2025-02-12 11:58:34 +00:00
Santiago Seifert a3172500e8 Publish MR2 system media session APIs
Also, pass parameters in a dedicated Params class, to enable future
extensibility without adding overloads, which will presumably be needed
for video.

Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases:android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I0936feefb4c92fe46212ad6bd71ed2b544286cbd
2025-02-11 20:50:13 +00:00
Santiago Seifert 8d98da09b3 Merge "Hide MediaSession details from MediaSessions clients" into main 2025-02-10 04:54:54 -08:00
Santiago Seifert 5e2ebbd73f Hide MediaSession details from MediaSessions clients
This will enable us to use MediaSessions for other streams that also
support volume adjustment (e.g. mirroring sessions), and not just media
sessions. We can later consider renaming the MediaSessions class to
something like VolumeSessions.

Bug: b/362507305
Test: Presubmit, build and verifying regular volume adjustment
Test: funcionality while casting.
Test: adb shell dumpsys activity service SystemUI | grep -A 100 "VolumeDialogControllerImpl state:"
Flag: EXEMPT Non-functional change
Change-Id: I51739d930d7cdb5b93c58394c699d4b6c3c8567c
2025-02-07 19:22:53 +00:00
Santiago Seifert 5029b011d7 Merge "Implement stream expansion support for mirroring sessions" into main 2025-02-07 09:58:51 -08:00
Santiago Seifert 361c0c9af4 Implement stream expansion support for mirroring sessions
Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases:android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I04352c35e53adb3a358b2e9c1d8b7a45d1d93c85
2025-02-06 17:29:52 +00:00
Santiago Seifert 976910dcaa Merge "Migrate the MediaSessions file to kotlin" into main 2025-02-04 09:06:07 -08:00
Santiago Seifert 1f01fadbfc Migrate the MediaSessions file to kotlin
This is in preparation for a refactor related to handling volume events
from system media routing sessions (aka mirroring sessions).

Bug: b/362507305
Test: Presubmit, build and verifying regular volume adjustment
Test: funcionality while casting.
Test: adb shell dumpsys activity service SystemUI | grep -A 100 "VolumeDialogControllerImpl state:"
Flag: EXEMPT Non-functional change
Change-Id: I5116a651c8710507b32eb4c25d1b47be8bc0ce86
2025-02-04 14:36:46 +00:00
Santiago Seifert b65dccce83 Merge "Fix ambiguous nullability documentation" into main 2025-02-04 02:02:37 -08:00
Santiago Seifert 8edf3d7e1d Fix ambiguous nullability documentation
Bug: b/205124386
Change-Id: Ic386e504c2dcc222600ce340b00e30782b87a93c
Test: presubmit
Flag: EXEMPT javadocs only
2025-02-03 12:24:06 -08:00
Santiago Seifert cc8b75ef40 Merge "Add support for system-wide mirroring" into main 2025-02-01 10:18:09 -08:00
Santiago Seifert fc62ef1c75 Add support for system-wide mirroring
This change also disables per-app mirroring, because it's not really
supported by the rest of the android system:
- Audio focus prevents two apps from playing at the same time.
- Volume key routing needs substantial changes.
- Volume sliders don't support per-app routing either.

With this change, we can focus on implementing mirroring for the MEDIA
stream across the entire system, and on top of that, start iterating
over towards per-app routing.

Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases:android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I18f86f9f6246498b1b7007efdfafa286e645d7c2
2025-01-30 21:18:32 +00:00
Santiago Seifert 77c65e71ef Add support for system media session volume adjustment
Also change the separate to be an underscore. The dot is already used
for the package name, which is part of the generated original id.

Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases:android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I6b078b80bfc970e8b9e4c0822cc460fccd45659d
2025-01-30 15:01:10 +00:00
Santiago Seifert d4d2aa0854 Rename routing session info mId field to mOriginalId
The naming is confusing when dealing with both the original id and the
unique id.

Bug: b/362507305
Test: presubmit (non-functional refactor)
Flag: EXEMPT Non-functional change
Change-Id: Iefcb9f642519d890469d360963c639d891e2934d
2025-01-29 21:23:17 +00:00
Santiago Seifert fb3191c0cb Merge "Add support for system media route volume adjustment" into main 2025-01-23 08:31:24 -08:00
Santiago Seifert ac46ccdfd1 Merge "Log exception instead of swallowing it" into main 2025-01-23 04:52:08 -08:00
Santiago Seifert 1834771c32 Log exception instead of swallowing it
Bug: b/205124386
Test: presubmit
Flag: EXEMPT Logging only change
Change-Id: I00d3da0d397354ca790c41dae62e193bee762788
2025-01-23 10:47:05 +00:00
Santiago Seifert b58caeca20 Add support for system media route volume adjustment
Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases:android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I771c9fe20b0a062a44fa7244526074563dd5fde6
2025-01-20 19:27:04 +00:00
Santiago Seifert 15e6ffaf88 Merge "Implement in-session transfers for system media sessions" into main 2025-01-14 12:10:01 -08:00
Santiago Seifert 50363967f6 Implement in-session transfers for system media sessions
Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases:android.media.router.cts.SystemMediaRoutingTest
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I90aeeea6263b4c9ec4a8eaa44de8dd504e2c89c7
2025-01-14 18:03:22 +00:00
Santiago Seifert 2368dd45b4 Merge "Move calls to RemoteDisplayProviderProxy out of the main thread" into main 2025-01-14 08:56:35 -08:00
Santiago Seifert 14d102c6f0 Merge "Disable calls to setBluetoothA2dpOn()" into main 2025-01-09 04:37:48 -08:00
Santiago Seifert fa9d4bafd8 Disable calls to setBluetoothA2dpOn()
This change is intended to assertively define the role of the media
routing framework in setBTA2dpOn() bugs. In the future, we might
consider merging making this the real behavior but, until then, we can
also use this change to experiment with real usage.

Bug: b/372908448
Flag: com.android.media.flags.disable_set_bluetooth_ad2p_on_calls
Test: atest CtsMediaBetterTogetherTestCases
Test: Manually verified that regular media usecases using 1p and 3p
Test: popular apps work as expected.
Test: Also verified that MediaRouter APIs (legacy and AndroidX) work
TesT: as expected. With the exception of not calling setBTA2dpOn().
Change-Id: I286d61c585c1e6cb20531c659a09f377f72f95a6
2025-01-08 18:52:50 +00:00
Santiago Seifert 77678aa0bb Merge "Clean up remote exceptions from router operations" into main 2024-12-31 03:28:57 -08:00
Santiago Seifert 37a8fa1a59 Merge "Log swallowed session creation request" into main 2024-12-30 10:29:08 -08:00
Santiago Seifert 886e6efcf9 Clean up remote exceptions from router operations
This change streamlines the way we log router remote exceptions.
Removing some useless info (like the stacktrace) and adding useful info
(like the router package name).

Bug: b/360129098
Test: Manually by casting and force-stopping the media app.
Flag: EXEMPT Logging only
Change-Id: I887db069583f530c3b7f2f1a6b3c2d073bef6ba0
2024-12-30 18:21:31 +00:00
Santiago Seifert e0ce058da6 Log swallowed session creation request
Bug: b/385724071
Test: Presubmit. Trivial change.
Flag: EXEMPT Log only change.
Change-Id: I2425e1a502ff8b7a82951a93d1dfdf2b35fcfeea
2024-12-30 17:10:49 +00:00
Santiago Seifert 658a834619 Merge "Implement system session lifecycle callbacks" into main 2024-12-18 05:50:18 -08:00
Santiago Seifert 73c6cb3467 Implement system session lifecycle callbacks
This CL adds the concept of a global session (note that a default
session exists already), which is the session that's applicable to all
apps unless they have an overriding session (which is a session that
overrides the global session and affects one app specifically).

This means a new capability of the system provider to have one routing
session by default, and then apply specific routing sessions to specific
apps.

Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases:android.media.bettertogether.cts.SystemMediaRoutingTest --rerun-until-failure
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I6c25f75feb200c86f67e569b07cc6cbef53ac8a3
2024-12-18 11:31:15 +00:00
Santiago Seifert b46969e3b9 Merge "Implement baseline system media session management" into main 2024-12-17 10:11:12 -08:00
Santiago Seifert c9617d35ea Implement baseline system media session management
This change enables the selection of system media routes for any app,
and implements the most important bits of session management, but
doesn't cover everything (for example, this change doesn't cover stream
expansion for system media routing sessions, or routing of the entire
system).

Bug: b/374321232
Test: atest CtsMediaBetterTogetherTestCases CtsMediaHostTestCasts
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: Id43c4568350db068f929d5c6463a079ee28a3471
2024-12-17 16:21:04 +00:00
Santiago Seifert be97dd893d Merge "Expand logging in MR2ProviderWatcher" into main 2024-12-12 08:37:53 -08:00
Santiago Seifert b9c1602479 Expand logging in MR2ProviderWatcher
This change adds info about the provider being added.

Test: Manually (logging change only).
Flag: EXEMPT Logging only
Bug: b/362507305
Change-Id: Ifc9c86d7acd5d2ce56291088f81859eed99ceafd
2024-12-12 12:00:04 +00:00
Santiago Seifert 42a3c29a7e Add MR2ServiceProvider-provided system media routes
These are routes that support routing system media, and whose properties
are similar to system-provided routes (like Bluetooth, or Built-in
Speakers).

This change also adds them to the list of transferable routes of the
system routing session, but does not implement transfers in order to
simplify the review. Transfers are coming in a following CL.

Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases CtsMediaHostTestCasts
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I5950914a8387ea579d22f1bdd2c526f34b6c0758
2024-12-12 12:00:00 +00:00
Santiago Seifert 3a9a42f432 Replace privileged with proxy in MediaRouter2 javadocs
Privileged is old terminology that hasn't been used in a very
long time.

Bug: b/205124386
Change-Id: I505ef8a2f2fcda1ab55c7f1d88505c4957a5ef8e
Test: N/A javadoc only change.
Flag: EXEMPT documentation only
2024-12-11 05:39:32 -08:00
Santiago Seifert b0a6bcea15 Add factory methods for the system providers
This will allow the SystemMR2Provider2 to initialize part of the super
class state only after it has initialized its final fields. As part of
this change, we also move non-trivial initialization logic out of the
constructors.

Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases CtsMediaHostTestCasts
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I6cb572410397ce4b4b8e27a77b1e5488e660b9cf
2024-12-10 11:36:22 +00:00
Santiago Seifert 8ed415bc8f Bind to system media MR2RouteProviders for any manager scans
This changes makes the system bind to any system media route providers,
even if no route discovery preference are set. That's because system
media routing doesn't require apps to declare support for routing.
System media routing is transparent to the app.

Note that this change is non-obviously flagged. The field that indicates
whether a provider supports system media routing is flagged before it's
passed to the MR2ProviderService constructor.

Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases CtsMediaHostTestCasts
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: I329fae281ea421a81f5902ceebd8e55ecde0252a
2024-12-10 11:18:39 +00:00
Santiago Seifert 4f38c24c08 Merge changes Ia2c551cb,If1d82bf7 into main
* changes:
  Track providers' support for system media routing
  Add media stream management in MR2ProviderService
2024-12-09 10:49:20 +00:00
Santiago Seifert 3b8b2bdb29 Track providers' support for system media routing
Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases CtsMediaHostTestCasts
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: Ia2c551cbda3fa63892e9302e09bd283e43559493
2024-12-06 18:09:09 +00:00
Santiago Seifert 18da618256 Add media stream management in MR2ProviderService
Bug: b/362507305
Test: atest CtsMediaBetterTogetherTestCases CtsMediaHostTestCasts
Flag: com.android.media.flags.enable_mirroring_in_media_router_2
Change-Id: If1d82bf72a713201b5e83d4115104560c62ee803
2024-12-06 17:16:39 +00:00
Santiago Seifert 4651a74e56 Log available types when selected type not in available list
Bug: b/378691660
Test: Manually by forcing the log line to run.
Flag: EXEMPT log changes only
Change-Id: I145847ebc70d2d71b48e33e6010657f2a9874439
2024-11-29 18:42:59 +00:00
Santiago Seifert 78fd2aaac5 Remove a TODO that is no longer relevant
Change-Id: I9e3a80413368016103954e92e48afe75bf97e10e
Test: N/A
Bug: b/205124386
Flag: EXEMPT comment only change.
2024-11-28 17:40:58 +00:00