Commit Graph

8247 Commits

Author SHA1 Message Date
Jaewan Kim
3603385896 Clean up unused codes around the RemoteUserInfo
RemoteUserInfo doesn't require IBinder for finer grained identification
among MediaControllers in the same process/package. So extra information
don't need to be shared across the processes.

Bug: 146815343
Test: Build
Change-Id: I6935c9c43b5fdfa0c608c753779e17b6cf0d341e
2019-12-27 17:08:37 +09:00
TreeHugger Robot
9d3954ff77 Merge "getFrontendStatus and Frontend status class" 2019-12-26 23:11:20 +00:00
TreeHugger Robot
a82eca78b0 Merge "Complete descrambler APIs" 2019-12-26 22:43:36 +00:00
TreeHugger Robot
3f7103e312 Merge "Filter Event classes" 2019-12-26 22:05:42 +00:00
TreeHugger Robot
ef0d5e9c13 Merge "Add result constants" 2019-12-26 21:55:28 +00:00
shubang
1512ec10e9 getFrontendStatus and Frontend status class
Test: make
Change-Id: I77e8446d7d3a6efce66a992e93eccdc963ae2bda
2019-12-26 13:04:28 -08:00
Kyunglyul Hyun
e6b623842f MediaRouter: move controlHints into RouteSessionInfo
Since RouteSessionInfo and controlHints are passed
simultaenously, move controlHints into the session info
for simplicity.

Test: atest mediaroutertest

Change-Id: Id99e4d71744ab438e8fcd99101895c28e2585662
2019-12-26 20:22:31 +09:00
Hyundo Moon
63a0540597 MediaRouter2: Add requestCreateSession
Bug: 146471105
Test: atest mediaroutertest
Change-Id: I80d5b4eeb20544898d61401c72cafc16ebfdd51f
2019-12-26 16:44:28 +09:00
TreeHugger Robot
338bb0d715 Merge "MediaRouter: Add missing info to MediaRoute2Info" 2019-12-24 05:33:11 +00:00
Kyunglyul Hyun
3aeabe0e29 MediaRouter: Add missing info to MediaRoute2Info
This CL adds
 - connectionState : whether the route is connected/disconnected
 - mIconUri : uri of the icon of the route
 - deviceType : type of the route (BT, speaker, tv)
into MediaRoute2Info and corresponding tests

Bug: 146605788
Test: atest mediaroutertest

Change-Id: I8b3f33967478fd66d5a380bf5d069579f006b890
2019-12-24 13:01:25 +09:00
TreeHugger Robot
6848be180f Merge "Add Scan to tuner" 2019-12-23 20:27:34 +00:00
shubang
d5b845f537 Add Scan to tuner
Test: make;
Change-Id: Ia7d971a13be89865eb3a6426024cfd88ecc394c7
2019-12-23 10:48:36 -08:00
Automerger Merge Worker
9908f0473e Merge "Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs" am: dcb8aa7cba am: 21984f9031 am: 98b09fda03
Change-Id: I5c67a499fb6d5028cd09bf95c6bcca91018b17ec
2019-12-23 18:48:10 +00:00
Automerger Merge Worker
98b09fda03 Merge "Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs" am: dcb8aa7cba am: 21984f9031
Change-Id: I1e0e5b57ff169354c33ac4c22bc5db83d87f19a3
2019-12-23 18:30:25 +00:00
Treehugger Robot
dcb8aa7cba Merge "Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs" 2019-12-23 18:03:35 +00:00
Automerger Merge Worker
d56dcd2f71 Merge "Add OPUS encoding to the framework" am: 7252ee13be am: dfe9af14d3 am: 5a1fd6750b
Change-Id: Iad78f4366d0c2311a472aadcf0cf07227d3d71e7
2019-12-23 10:41:28 +00:00
Automerger Merge Worker
5a1fd6750b Merge "Add OPUS encoding to the framework" am: 7252ee13be am: dfe9af14d3
Change-Id: Id49eb5581d46a855bd89f2c6485f2b5d5962d5e7
2019-12-23 10:24:45 +00:00
Kyunglyul Hyun
7ec3d498ae Merge "MediaRouter: Add session-releated APIs to route provider" 2019-12-23 06:30:51 +00:00
Kyunglyul Hyun
24cc66f946 MediaRouter: Add session-releated APIs to route provider
This CL introduces "session" into MediaRouterProviderService.
When a client wants to use a route of a provider, it should
request the provider to create a new session and then,
the client will control the session instead of a route.

Clients can add/remove routes into/from the session
(a.k.a. dynamic grouping) and transfer media to the other
route in a provider with less delay.

RouteSessionInfo holds information about a session and
MediaRoute2ProviderService must set session info and implement
abstract methods.

Bug: 142762829
Test: atest mediaroutertest

Change-Id: Iaf668d9a2c360cd9c7dbc5f1766d14e0d81bb3e3
2019-12-23 10:29:30 +09:00
TreeHugger Robot
d3ab322a12 Merge "Create a utils class and handle filter subtypes" 2019-12-21 02:58:21 +00:00
shubang
99c8992ab3 Complete descrambler APIs
Test: make;
Change-Id: I41a660aaf0213b4966274cd512537b581ffc95d5
2019-12-20 17:48:53 -08:00
shubang
1c53a33968 Create a utils class and handle filter subtypes
Also move checkPermission to Utils

Test: make;
Change-Id: I2958ca9fa39c822f50e8b998def4fd3233512673
2019-12-20 16:49:07 -08:00
Rahul Sabnis
eeef865a2a Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs
Bug: 141947725
Test: Manual
Change-Id: Ia95776cda3408c321d94494cb25b9cd85cb8662a
2019-12-20 14:48:57 -08:00
shubang
e65b686cdf Complete frontend APIs
Test: make;
Change-Id: I576df2ee27809b50c9797a6bc80ebf3dc771a83e
2019-12-20 14:27:37 -08:00
Kevin Rocard
3ae06329dc Add OPUS encoding to the framework
Audio offload support was added to AudioTrack in Q,
but only a few encoding were exposed (MP3 & AAC).

This patch adds only Opus support.
For R we probably want to expose all format that the framework supports.

Bug: 146540917
Test: AudioTrackOffloadTest AudioFormatTest
Change-Id: I2ca57d45081668f76f8d9e153f66d1fd41209685
Signed-off-by: Kevin Rocard <krocard@google.com>
2019-12-20 19:30:18 +00:00
TreeHugger Robot
b9a35bbaff Merge "MediaRouter2: add MRM.getActiveRoutes" 2019-12-20 10:18:42 +00:00
TreeHugger Robot
9b3d0531a5 Merge "MediaRouter: Renames supportControlCategory as supportControlCategories" 2019-12-20 10:03:53 +00:00
Kyunglyul Hyun
86998f446b MediaRouter2: add MRM.getActiveRoutes
This method will list up routes that are actively used
by some applications.

Once dynamic grouping is implemented, it will return
sessions instead of routes.

Bug: 146604082
Test: atest mediaroutertest

Change-Id: Ic013d3c2ded47b7ebca0b4cf99d2a7ea75045dc1
2019-12-20 17:45:24 +09:00
Kyunglyul Hyun
5c9a55ea9a MediaRouter: Renames supportControlCategory as supportControlCategories
Also adds a supportControlCategory that checks a single category.

Test: atest mediaroutertest
Change-Id: If878aa7df89fb61b38b52abad0adedccacb6df21
2019-12-20 17:29:59 +09:00
TreeHugger Robot
7a8341aadc Merge "MediaMuxer:allow negative presentation timestamps" 2019-12-20 07:29:44 +00:00
TreeHugger Robot
f050259df6 Merge "Unhide Descrambler class" 2019-12-20 04:13:54 +00:00
shubang
0ce6ae1560 Unhide Descrambler class
Test: make;
Bug: 139308734

Change-Id: I78f8fda2f83786cd46a9293949c50fc43f5cafd6
2019-12-19 16:29:56 -08:00
Mikhail Naganov
8dfb438b52 Merge "Add audio stream and usage for virtual assistant" 2019-12-20 00:08:22 +00:00
Shubang Lu
74c4faa398 Merge "Mark frontend APIs @SystemApi" 2019-12-19 23:20:59 +00:00
Kim Baekgyeong
b64fac77b5 Add audio stream and usage for virtual assistant
New stream type: AUDIO_STREAM_ASSISTANT
This is intended to be used by a virtual assistant like
Google Assistant, Bixby, etc.

The audio stream has own volume alias and the volume
does not change by volume changes of other streams.

Bug: 123745215
Test: make
Change-Id: Iad07d9f0b25ea35c6d565be677af7815bf2f6bd7
2019-12-19 21:35:34 +00:00
Automerger Merge Worker
90dc909c3a Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f am: f6253ef435
Change-Id: Id33f64eb9c8aa7d68cc52f7359b4f0a3d2675d8a
2019-12-19 12:13:32 +00:00
Automerger Merge Worker
f6253ef435 Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f
Change-Id: I48d12a1de59ea56b9423dc4100dfe464f093c083
2019-12-19 11:17:48 +00:00
Hyundo Moon
c979fbf68c Merge "Revert "MediaRouter2: Create MediaRouter2A.java for rewriting MediaRouter2"" 2019-12-19 09:14:02 +00:00
Hyundo Moon
fca05e050b Revert "MediaRouter2: Create MediaRouter2A.java for rewriting MediaRouter2"
This reverts commit 3d60c71a2a.

Reason for revert: Decided to work on current MediaRouter2.

Change-Id: Iff87c027ab2ae5b1b331aa743b5d2447a44d7e69
2019-12-19 09:11:41 +00:00
TreeHugger Robot
0463387020 Merge "Use new UnsupportedAppUsage annotation." 2019-12-19 08:02:12 +00:00
Austin Wang
a63a2c0130 Revert "Use new UnsupportedAppUsage annotation."
This reverts commit a5264903e2.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk&lkgb=6083299&lkbb=6085371&fkbb=6083313, bug b/146533269

Change-Id: Ie5b031d7b277cf0e09b0a9776b26bf74f5f69e70
2019-12-19 06:38:19 +00:00
Kyunglyul Hyun
a8b129b470 Merge "MediaRouter: add route session info" 2019-12-19 05:13:32 +00:00
Hyundo Moon
8d3a08c4fd Merge "MediaRouter2: Create MediaRouter2A.java for rewriting MediaRouter2" 2019-12-19 05:09:27 +00:00
TreeHugger Robot
92f2b0da89 Merge "Make MediaController.getTag public" 2019-12-19 03:01:05 +00:00
Sungsoo Lim
46effee5ee Make MediaController.getTag public
Bug: 146527402
Test: build
Change-Id: Iff105885aec205422d34f19fcf51340c6b6cdc71
2019-12-19 03:00:37 +00:00
Automerger Merge Worker
757ed29038 Merge "AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING" into qt-qpr1-dev am: a2bfc8ce91
Change-Id: I199f8957c0df1d3efeb85cbe8e561e31045ee409
2019-12-19 00:42:17 +00:00
Jean-Michel Trivi
5e851cf9d8 AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING
Require MODIFY_AUDIO_ROUTING system permission to exercise
hidden (non-SDK, non-SystemApi) method setMasterMute

Bug: 141622311
Test: see bug for POC app
Change-Id: I4ee93276daa1285c55c4c838e2b43833135d76f6
2019-12-18 13:24:16 -08:00
Automerger Merge Worker
277353090c Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d am: c7f44bacbe
Change-Id: I30839db2fe99ba4670ec1b39d5e64540fdd15f69
2019-12-18 16:31:41 +00:00
Automerger Merge Worker
c7f44bacbe Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d
Change-Id: Ibad1c39310722d99f2de6bb0d9fad64caa5dbba1
2019-12-18 16:21:37 +00:00
Artur Satayev
53fe96661b Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I4bc8c9482e4bb1af21363f951affff7ee3fefeab
2019-12-18 15:42:06 +00:00