10299 Commits

Author SHA1 Message Date
Dongwon Kang
8da2bf4946 Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev 2016-02-16 17:22:08 +00:00
Sungsoo Lim
77dc4bb09e Minor changes on MediaBrowser
- Rename add and remove in Subscription putCallback and removeCallback
  for better readability.
- Fix a broken link of javadoc.

Change-Id: If41941d1134d4ee6ef953932ca572f5d445a2aff
2016-02-16 15:20:44 +09:00
Neil Fuller
a835180b74 Add flags needed to switch Jack to 1.8 for CTS targets
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

Bug: 27113322
Bug: 26953739
Change-Id: Ib9ceaadafc9c1d41ff137c48111ad3b060f7e248
2016-02-15 12:07:21 +00:00
Jeff Tinker
dc614f86a5 Add mediadrm service
Part of media security hardening

This is an intermediate step toward moving
mediadrm to a new service separate from mediaserver.
This first step allows mediadrmservice to run based
on the system property media.mediadrmservice.enable
so it can be selectively enabled on devices that
support using native_handles for secure buffers.

bug: 22990512
Change-Id: I9af073d8383f25657938d07be90c21c0dc6126b7
2016-02-12 20:23:45 -08:00
Hangyu Kuang
6dfd022bb8 Merge "Update Android mediamuxer documentation as it supports webm already." into nyc-dev 2016-02-12 23:30:49 +00:00
Phil Burk
af9aa07fbd Merge "AudioFormat: implement ENCODING_IEC61937" into nyc-dev 2016-02-12 22:24:55 +00:00
Dongwon Kang
edbe2652f9 TIF: Unhide TvInputInfo.isHidden/loadCustomLabel
Needed to load input preferences set by user in settings.

Bug: 26850395
Change-Id: I5cd4e2474724c247c765cafa829fc9d7f363da45
2016-02-12 11:16:27 -08:00
Hangyu Kuang
89de5eb346 Update Android mediamuxer documentation as it supports webm already.
Bug: 27075269

Change-Id: Ie2571bb90b6d8dac85dad48d845e21c80b2b250f
2016-02-12 10:55:59 -08:00
Jean-Michel Trivi
d9cd292369 Merge "Dynamic audio policies: JNI support for UID rules" into nyc-dev 2016-02-12 16:57:50 +00:00
Phil Burk
d817dfd531 Merge "AudioTrack: fix docs for return code for setBufferSizeInFrames()" into nyc-dev 2016-02-12 06:32:14 +00:00
Phil Burk
cd0e210651 AudioTrack: fix docs for return code for setBufferSizeInFrames()
Also added some documentation links that were failing before.

Change-Id: I0a744dd0a3d3e1d09f643b35d976863fa0422d10
Signed-off-by: Phil Burk <philburk@google.com>
2016-02-11 16:42:13 -08:00
Jae Seo
25c9c5edab TIF: Separate service connection errors from recording errors
Also clarify the expected behaviors when an error has occurred in a
recording session.

Bug: 27110861
Change-Id: I811197e45ea94b1b0e151d534a1f030a84b89d10
2016-02-11 15:44:55 -08:00
Phil Burk
43f4b276a5 AudioFormat: implement ENCODING_IEC61937
Allows applications to wrap compressed audio in a PCM
stream and pass through directly to HDMI output.

Bug: 24541671
Bug: 20891646
Bug: 26373761
Signed-off-by: Phil Burk <philburk@google.com>

Change-Id: If29e10b0665758330eca085bfeaac19fefc373b3
2016-02-11 19:36:12 +00:00
Jean-Michel Trivi
ba6b4b400d Dynamic audio policies: JNI support for UID rules
Rename AttributeMatchCriterion to AudioMixMatchCriterion to be consistent
 with the fact that now mixing rules are not always about audio attributes.

AudioSystem JNI: add support for UID-based rules.

Bug 26798796

Change-Id: Icb0f57841c94f410e1fac9ed071a829a26b9a58e
2016-02-10 14:26:35 -08:00
Jae Seo
a2a0c735ff TIF: Add Active Format Description to TvTrackInfo
Bug: 21277083
Change-Id: Ided4ffcd2816e7bb11a81ef10f3b6e1499c6e89b
2016-02-10 14:03:18 -08:00
Youngsang Cho
4ecf78116e TIF: Add INPUT_ID field in RecordedProgram
INPUT_ID can be retrieved from CHANNEL_ID. But, even if the channel
is removed, recording should be playable. So INPUT_ID is needed.

Change-Id: I7042a19758ce71e77ca2ae7613015e4d22f0d41f
2016-02-10 21:16:22 +00:00
Jae Seo
425c8bf292 Merge "TIF: Rename connect()/disconnect() and remove unnecessary methods" into nyc-dev 2016-02-10 18:27:06 +00:00
Jae Seo
e3c11e8429 TIF: Rename connect()/disconnect() and remove unnecessary methods
Bug: 26969670
Change-Id: Iee7d1af2eecc11bb28a8d9d7e377b4754a37095c
2016-02-09 19:18:29 -08:00
Chulwoo Lee
65fa5ea41e Fix build
Change-Id: I9498ecda9b05c7166faf9f648f0b61682a88c4da
2016-02-09 17:49:54 -08:00
Chulwoo Lee
889f0b7fda Merge "Encode/Decode genres using CSV" into nyc-dev 2016-02-10 01:33:55 +00:00
Chulwoo Lee
b2a2351383 Encode/Decode genres using CSV
Currently, the delimiter of genres is comma, but it is also used in the
broadcast genre, so we decided to encode the genre to CSV format.
Let's support only a simple CSV not a complex cases like fully double
quoted string to simplify the encode/decode method and encourage the
TIS to use these methods for broadcast genres.

Bug: 25241891
Change-Id: Id745d4fee43dbcdc508c0f6fad83477b6209ecd8
2016-02-09 17:19:50 -08:00
Glenn Kasten
f1cf2afd52 Merge "Update documentation for offset and size" into nyc-dev 2016-02-09 19:06:23 +00:00
Glenn Kasten
518432e366 Update documentation for offset and size
Change-Id: Id9d5ef62767155cc8597795b43c4422f623574ed
2016-02-09 10:47:56 -08:00
Jae Seo
cd502cf715 TIF: Fix the unresolved link to #stopRecording()
Change-Id: Ifa5aeb7c6f1d8210650a1d276872aa4e22d5ffa3
2016-02-08 19:24:12 -08:00
Jae Seo
2a061b5bcf Merge "TIF: Allow the application to indicate a TV program to record" into nyc-dev 2016-02-09 02:14:12 +00:00
Jae Seo
4eee6a73e4 TIF: Allow the application to indicate a TV program to record
Bug: 26962040
Change-Id: I2f062a4621c8a9a6765543826ba2cd607f1468d4
2016-02-08 14:51:52 -08:00
Jean-Michel Trivi
f82f746903 Support for Bundle in AudioAttributes
Bug 25449464

Change-Id: I99cdfd4589e3161b52620e439ba993ce21d256b4
2016-02-08 19:24:19 +00:00
Jae Seo
abda420b9d TIF: Update the internal input list with new TvInputInfo
Bug: 26864151, Bug: 26863281
Change-Id: I33e357aac74bceda50c794eb6057c363de9250b8
(cherry picked from commit 89a9937927e05a86938aa297a79047ce1a7c7d2d)
2016-02-08 18:19:41 +00:00
Jean-Michel Trivi
e35bde5291 Merge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix" 2016-02-05 22:27:26 +00:00
Jean-Michel Trivi
fee832a097 Dynamic audio policies: fix AttributeMatchCriterion addition in mix
When adding an AttributeMatchCriterion for a mix, build the instance
  with the constructor that matches the rule.

Bug 26798796

Change-Id: I130f4bdab51644685413d294096d35d9685ea5eb
2016-02-05 11:15:42 -08:00
Glenn Kasten
f22472a1d0 Merge "Update documentation to say write not read or play" 2016-02-05 17:02:53 +00:00
Jae Seo
0cc5a9d8f6 MediaBrowser: Add extra lookup keys to specify media items to retrieve
Bug: 25821318, Bug: 25153123, Bug: 25153113
Change-Id: I50cc99439a4a6dd714cf7bfd0950e2583554668a
2016-02-05 12:52:17 +09:00
Jae Seo
3bc8dd8edd Merge "TIF: Add extras to TvInputInfo" 2016-02-03 23:29:58 +00:00
Jae Seo
3c590a8d20 TIF: Add extras to TvInputInfo
Bug: 23820259, Bug: 21905878
Change-Id: I642525afb4f98bf7fb76917048dc9336a2a2313a
2016-02-03 22:09:30 +09:00
Youngsang Cho
82621b6c09 TIF: call RecordingCallback.onConnected when SessionCallback.onConnected is called
Bug: 26945681
Change-Id: Icd5029bc0a7cf82d690a69d390678831a46cd39a
2016-02-02 22:10:39 -08:00
Chulwoo Lee
4fb2d18c46 Merge "Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode"" 2016-02-02 18:54:48 +00:00
Chulwoo Lee
072300558e Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode"
This reverts commit a6130cee3ac9ed8648be005adcf217cf4426defc.

Change-Id: Id3d5ec0ca35bbd8e0b28b2b0dd936078b5da93d6
2016-02-02 18:34:58 +00:00
Jiabin Huang
1570c3e91e Merge "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode" 2016-02-02 09:22:02 +00:00
Jiabin Huang
a6130cee3a TIF: Improve android.media.tv.TvContract.Programs.Genres#decode
test results:
 random string(1000 channels) decode 1000 times on Nexus Player
 6.8 seconds => 1.4 seconds

Bug: 23307587
Change-Id: If309b0819d705d791c8fa9b177e6d2bd0019102e
2016-02-02 18:19:30 +09:00
Sungsoo Lim
bc89bd2056 Merge "MediaBrowserUtils: Fix NPE" 2016-02-02 02:23:11 +00:00
Sungsoo Lim
a24ca36ce1 MediaBrowserUtils: Fix NPE
Bug: 26910471
Change-Id: I134516f6318c34cc5dfdcf04438e6ba00b843607
2016-02-02 11:22:11 +09:00
Hyungtae Kim
3a0ad304f6 Merge "Rename instr argument 'repeat' to 'iterations'" 2016-02-02 01:41:48 +00:00
Hyungtae Tim Kim
84789bef99 Rename instr argument 'repeat' to 'iterations'
The argument means the number of test iterations for camera
stress testing. Renamed for easier understanding of the argument.

Change-Id: I3247e35f8640c98db5c8438c3fc79a45073d9623
2016-02-01 16:00:49 -08:00
Glenn Kasten
679f1e26d0 Update documentation to say write not read or play
Change-Id: I41b074f17da519f87ce410a576ecee079bdf4615
2016-02-01 14:11:51 -08:00
Sungsoo Lim
8e3fb58621 MediaBrowser: Minor fixes
- Change double spaces to a single space.
- Add IntDef annotation.
- Use a plural noun for 'flag'.
- Check parentId using TextUtils.isEmpty().

Change-Id: Ic268e543a60fbe281a4deaa24d4d9bde9c0bc22d
2016-02-01 21:54:52 +09:00
Hang Yin
a80bf36741 Merge "Camera2 framework stress test suite" 2016-01-30 00:45:00 +00:00
Jean-Michel Trivi
5bf536cf78 Merge "Fix dynamic audio policy rules" 2016-01-29 22:52:28 +00:00
Jean-Michel Trivi
32696d49e1 Fix dynamic audio policy rules
Always set the mix type when adding rules, even
 when adding from a parcel.

Bug 26798796

Change-Id: Ib10bfa9b9b7753b18d9b1b5a67e82677dcac2cbe
2016-01-29 13:50:20 -08:00
Dongwon Kang
f14a39398f Merge "TIF: Make RecordingCallback static" 2016-01-29 18:53:24 +00:00
Dongwon Kang
397b1447ab TIF: Make RecordingCallback static
Change-Id: I5138713fe21f49d43e9c70af8c2ba66318aa8342
2016-01-29 10:47:21 -08:00