Commit Graph

8482 Commits

Author SHA1 Message Date
Automerger Merge Worker
11a60a9a7e Merge "Fix equals and hashCode APIs on TvTrackInfo" am: 2e8d16f714 am: 7e6df33644 am: 08c064c6c3
Change-Id: Id27dbd4cca87a6f96fed5dfe078419d4f720bd20
2020-01-23 00:11:28 +00:00
nchalko
7e6df33644 Merge "Fix equals and hashCode APIs on TvTrackInfo"
am: 2e8d16f714

Change-Id: I3a88659ad590b1e7c62840e6d737befa4a7d4ecd
2020-01-22 15:39:05 -08:00
Andy Hung
7f75d36006 Merge "AudioTrack: Add TV Api setters and getters" 2020-01-22 23:30:51 +00:00
TreeHugger Robot
2d74e7f844 Merge "Final cleanup: Add missing fields in SectionSettings and DemuxCaps" 2020-01-22 23:18:57 +00:00
TreeHugger Robot
b44e3d7201 Merge "Use LinearBlock in MediaEvent" 2020-01-22 23:01:13 +00:00
Henry Fang
7b312488e1 Merge "Add Media Format key for Tuner" 2020-01-22 22:15:27 +00:00
Andy Hung
c33c90813f AudioTrack: Add TV Api setters and getters
Test: atest AudioTrackTest#testAudioDescriptionMixLevel
Test: atest AudioTrackTest#testDualMonoMode
Bug: 133526565
Change-Id: Icbdfcec65e3851ca1d3abfc920a572ea45a55c9c
2020-01-22 13:34:49 -08:00
shubang
b3f7b9acd2 Use LinearBlock in MediaEvent
Test: make;
Bug: 139308734
Change-Id: Idcf61d14d3bacd508c0e013ce5bdb8d7bd6d45ca
2020-01-22 13:20:06 -08:00
shubang
3ca5656c33 Final cleanup: Add missing fields in SectionSettings and DemuxCaps
Test: make;
Bug: 139308734
Change-Id: Ie3f37f9c4b47144bc664ebff2ab685feb21eb033
2020-01-22 21:15:08 +00:00
Wonsik Kim
d9e6d584ef Merge "media: MediaCodec buffer API revision" 2020-01-22 19:02:00 +00:00
Henry Fang
6cc8da9138 Add Media Format key for Tuner
Test: manual
bug: 133525759
Change-Id: I083fa5f210b02c56299ef4625491a157131e897e
2020-01-22 10:46:27 -08:00
Kyunglyul Hyun
581fc98d65 MediaRouter: enable transferring from/to BT devices.
The main objective of this CL is to enable selecting BT device.
For that it updates MRM and SystemMediaRoute2Provider such that
  - MRM.getRoutingControllers() returns a list including the system session
  - SystemMediaRoute2Provider marks routes as "transferable"
  - SystemMediaRoute2Provider sets provider id correctly
  - SystemMediaRoute2Provider handles transferToRoute()

Bug: 147979868
Bug: 147122575

Test: atest mediaroutertest
&& manually selecting phone / bt devices from output switcher

Change-Id: I2e2032fd6677f79b9f864c313c40846daa87f113
2020-01-22 20:46:22 +09:00
TreeHugger Robot
f8cb8930bc Merge "Add isDocumentType in MediaFile and fix test case fail" 2020-01-22 06:52:34 +00:00
Hayden Gomes
d59b90acc0 Merge changes from topic "system_usages"
* changes:
  Add API for setting supported system usages
  Adding System Usages to AudioAttributes
2020-01-22 06:47:58 +00:00
Andy Hung
6f0d16df8c Merge "AudioTrack: Add Codec format change listener" 2020-01-22 06:24:31 +00:00
Amy Zhang
e68e6deb3e Merge "add new acquireTvInputHardware API to allow the clients to pass their priority hints in" 2020-01-22 06:19:40 +00:00
Amy
ed55b9cf30 add new acquireTvInputHardware API to allow the clients to pass their
priority hints in

This change is to allow the TunerResourceManager to manage the
TvInputHardware resources.

Changes are needed in the TvInputHardwareManager implementation to
request resource from TRM instead of directly granting resources to the
client.

Test: manual
Bug: 147380513
Change-Id: Ic33d2ef86ffcc14607de621ef0f70ae4ade5c70e
2020-01-22 06:19:16 +00:00
Andy Hung
b7149a1d19 AudioTrack: Add Codec format change listener
Add AudioMetadata to handle codec format changes.

Test: atest AudioMetadataTest
Test: atest AudioTrackTest#testCodecFormatChangedListener
Test: atest android.media.cts.UtilsTest
Bug: 133526565
Change-Id: I2bf7c6981c75848c6af914237557da2bf10de3b1
2020-01-21 20:04:32 -08:00
Kyeongkab.Nam
b30b38506b Fix equals and hashCode APIs on TvTrackInfo
Current hashCode API cares only for mId and it returns same values
even if other member variables are different.
To avoid for returning same values between different TvTrackInfo of
each program, hashCode API should care all variables used on
equals API. Note that mId is defined as unique only in the same
program.

Test: build
Change-Id: I4d72f6ce80141d92f86e548804e1f0257ed6fcfb
2020-01-22 11:10:32 +09:00
Wonsik Kim
ccb7ac6b65 media: MediaCodec buffer API revision
Bug: 136283874
Test: atest CtsMediaTestCases:MediaCodecBlockModelTest
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I3fb163be67112b28fa9998493b359f12d096e759
2020-01-21 17:43:53 -08:00
shubang
ef400ab347 Unhide more methods of Tuner.java
Test: make;
Bug: 139308734
Change-Id: I5d5896cc610048cce0e98050a68b3933da1906f3
2020-01-21 15:43:13 -08:00
shubang
9fa4f6fe90 Unhide Frontend related methods in Tuner.java
Test: make;
Bug: 139308734
Change-Id: I1cb68c6e8915091509765bcc3ffcd875480caf31
2020-01-21 15:33:30 -08:00
shubang
d63e313e32 Unhide FrontendSettings part 2
and FrontendCapabilities

Test: make;
Bug: 139308734
Change-Id: I1481b758df49319dd34484548797534e3c46627d
2020-01-21 15:17:07 -08:00
Nick Chalko
454f6eb824 Merge "Unhide scan methods and classes." 2020-01-21 17:10:03 +00:00
Jean-Michel Trivi
58423362b9 Merge "MediaFormat: keys for AAC DRC album mode & output loudness" 2020-01-21 16:00:00 +00:00
Nick Chalko
386dead7ec Unhide scan methods and classes.
Bug: 139308734
Test: m framework-all system-api-stubs-docs-update-current-api
Change-Id: I4b68a50b1b880091da70a455f5c58364d27b5283
2020-01-21 07:44:39 -08:00
TreeHugger Robot
8bf4bf766e Merge "Make TimeFilter @SystemApi" 2020-01-21 07:47:14 +00:00
TreeHugger Robot
29d2fc2f71 Merge "Unhide FilterConfiguration part 2" 2020-01-21 07:36:16 +00:00
Hyundo Moon
78ae53ff27 Merge "Unhide routing session related APIs" 2020-01-21 07:19:14 +00:00
shubang
2ac4284cf1 Make TimeFilter @SystemApi
Test: make;
Bug: 139308734
Change-Id: I6740cb637b57a7d136c1614fcd437191fa6ad2c8
2020-01-20 22:13:26 -08:00
shubang
5e430e08b9 Unhide FilterConfiguration part 2
Test: make;
Bug: 139308734
Change-Id: Iafb97c22390c9a1a43a77a9c1c818d87da1dbd49
2020-01-20 22:07:33 -08:00
TreeHugger Robot
c33182c369 Merge "Mark LnbCallback @SystemApi" 2020-01-21 05:51:32 +00:00
Hyundo Moon
42bef14ac1 Unhide routing session related APIs
Bug: 147646634
Test: make update-api -j; atest mediaroutertest
Change-Id: Ia0278af6a2b62fa90e61bb278772c6369c62481d
2020-01-21 14:31:27 +09:00
shubang
1dc11a4a07 Mark LnbCallback @SystemApi
Test: make;
Bug: 139308734
Change-Id: I3cf727c3e24a8629e29b63a84cbee4f49b8b731b
2020-01-20 20:13:53 -08:00
shubang
17ebeb95ee Unhide filter event part 2
Test: make;
Bug: 139308734
Change-Id: Ic7897300f14ddd39381e363198bc8c39ce497a29
2020-01-20 19:16:51 -08:00
TreeHugger Robot
5cc8e20464 Merge "Make Descrambler @SystemApi" 2020-01-21 03:13:16 +00:00
TreeHugger Robot
2f6e9b48cf Merge "Mark Dvr class @SystemApi" 2020-01-21 03:11:23 +00:00
TreeHugger Robot
fd6439e3cd Merge "Make DvrSettings @SystemApi" 2020-01-21 01:03:55 +00:00
TreeHugger Robot
b1f2ed5533 Merge "Make Filter @SystemApi" 2020-01-21 01:03:29 +00:00
Jean-Michel Trivi
531731c703 MediaFormat: keys for AAC DRC album mode & output loudness
Bug: 144351156
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ib228eff0457e959e0973c7037e8c4bedf90ca480
2020-01-20 15:28:58 -08:00
Henry Fang
30b7a57597 Merge "Change frontend analog constant to match the hal define" 2020-01-20 22:52:11 +00:00
Henry Fang
0129cd7df6 Merge "Framework support cas@1.2" 2020-01-20 21:26:11 +00:00
Henry Fang
39247cd9c1 Change frontend analog constant to match the hal define
Test: Manual
bug: 135708935
Change-Id: Ie81a4b63d9bcad9ba93ca8d4688f67d732217c70
2020-01-20 19:53:54 +00:00
shubang
376658ebcc Make Descrambler @SystemApi
Test: make;
Bug: 139308734
Change-Id: I4c15348bb61ce78937210726b72842705b2db472
2020-01-19 19:03:21 -08:00
shubang
c798780a07 Mark Dvr class @SystemApi
split it into two subclasses

Test: make;
Bug: 139308734
Change-Id: I7264f4d92b33664dbf4207368d1a98b207377912
2020-01-19 17:59:12 -08:00
shubang
21783aca6c Make DvrSettings @SystemApi
Test: make;
Bug: 139308734
Change-Id: I74533068ad894d6e22d5cc703199ea5e756fc461
2020-01-19 17:23:43 -08:00
Hyundo Moon
ece12a89bc Merge "MediaRouter2: Add getDefaultController()" 2020-01-20 00:26:52 +00:00
Henry Fang
43cab92abe Framework support cas@1.2
Test: Manual
bug: 141783130
Change-Id: I62d42ad51444b8d58282f5d6992ba6f2169dd6d3
2020-01-19 22:28:44 +00:00
Hyundo Moon
67c41fddd8 MediaRouter2: Add getDefaultController()
The controller which can control the system routes (phone speaker,
bluetooth, etc) is returned by this new method.

This CL makes the default controller can know the current system route,
and make SessionCallback#onSessionInfoChanged() be called when
the current system route is changed.

Note that selecting route (BT / speaker) via this controller is not
yet supported by this CL.

Bug: 147937954
Test: atest mediaroutertest
      Also, manually checked logs by connecting bluetooth device.
Change-Id: I8c6254855f8121d1d2331959224fe7237affa1e2
2020-01-19 16:03:52 +09:00
🌶️Sam Sacco°͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌ne
52dbaad530 Fix typo from @parm to @param.
This was introduced in https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/10081467 and caused a doc build failure

Change-Id: I1bb63cfb57c3f8abcd13284dfc884f69a0feb86f
2020-01-18 20:48:47 +00:00