Jae Seo
c412e925c4
Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev am: af326ed2b9
...
am: 43ddc14d5d
* commit '43ddc14d5da7e9432d4847fe3485a5cd42b783cc':
TIF: Add android.permission.READ_TV_LISTINGS
2016-02-23 00:14:11 +00:00
Jae Seo
43ddc14d5d
Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev
...
am: af326ed2b9
* commit 'af326ed2b9e35dbd60fbe44d13f8ca7738c97340':
TIF: Add android.permission.READ_TV_LISTINGS
2016-02-22 23:50:22 +00:00
Jae Seo
af326ed2b9
Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev
2016-02-22 23:44:48 +00:00
Donghyun Cho
53df72c2d2
Merge "MediaSession: Add new methods for preparing media content" into nyc-dev am: f3db5743b9
...
am: e53db46568
* commit 'e53db46568f2a7830e5fe1d8ddd69d8c0dfb89b7':
MediaSession: Add new methods for preparing media content
2016-02-22 03:46:43 +00:00
Donghyun Cho
e53db46568
Merge "MediaSession: Add new methods for preparing media content" into nyc-dev
...
am: f3db5743b9
* commit 'f3db5743b91e4b90c81a58c41670cca9000dc9e6':
MediaSession: Add new methods for preparing media content
2016-02-22 03:42:58 +00:00
Donghyun Cho
f3db5743b9
Merge "MediaSession: Add new methods for preparing media content" into nyc-dev
2016-02-22 03:38:55 +00:00
Jae Seo
ed76f3509d
TIF: Add android.permission.READ_TV_LISTINGS
...
Bug: 21959866
Change-Id: I6f30289f8660ed8d268bb9138c32d9c6a95bb0b9
2016-02-20 02:17:39 -08:00
Jiabin Huang
8983bd4309
Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev am: 079cf52336
...
am: 63f2971dee
* commit '63f2971dee821db92d3fbb88d28ada58897cc89f':
TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode
2016-02-20 08:46:05 +00:00
Jiabin Huang
63f2971dee
Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev
...
am: 079cf52336
* commit '079cf523365e4018d1a439e1a32bb30d79c069c3':
TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode
2016-02-20 07:07:55 +00:00
Jiabin Huang
079cf52336
Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev
2016-02-20 07:01:29 +00:00
Jiabin
0388f0e503
TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode
...
test result:
Decode function takes about 0.25 seconds with 1350 channels in Live Channels.
The original one takes about 0.37 seconds in the same test case.
Bug: 23307587
Change-Id: I3a1fefe0b3e6c1986c8f515259658f2e3e23011f
2016-02-20 14:22:33 +09:00
Lajos Molnar
a8be884d0b
Merge "media: expose audio sample format in MediaFormat" into nyc-dev am: 0ab076c5c9
...
am: 4474a5cd4b
* commit '4474a5cd4b6b55e14048515be5a04ba438f60e90':
media: expose audio sample format in MediaFormat
2016-02-19 18:56:54 +00:00
Lajos Molnar
4474a5cd4b
Merge "media: expose audio sample format in MediaFormat" into nyc-dev
...
am: 0ab076c5c9
* commit '0ab076c5c9d8895ae1a77132e167dc70341a4084':
media: expose audio sample format in MediaFormat
2016-02-19 18:52:41 +00:00
Lajos Molnar
0ab076c5c9
Merge "media: expose audio sample format in MediaFormat" into nyc-dev
2016-02-19 18:47:06 +00:00
Dongwon Kang
6aeca36685
Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev am: ca601d9303
...
am: d98c06cad3
* commit 'd98c06cad34c57eb783d7d61a73d797b7be5deee':
TIF: Unhide TvContract.Programs.Genres#isCanonical
2016-02-19 00:08:09 +00:00
Dongwon Kang
d98c06cad3
Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev
...
am: ca601d9303
* commit 'ca601d9303feb39ab164ddedfcb01225847fdc32':
TIF: Unhide TvContract.Programs.Genres#isCanonical
2016-02-19 00:00:26 +00:00
Dongwon Kang
d16d1f519b
TIF: Unhide TvContract.Programs.Genres#isCanonical
...
Bug: 25726917
Change-Id: I8717b1c9f39f8b5b9196658c1501d5abf2337eb9
2016-02-18 15:42:09 -08:00
Donghyun Cho
22188f1187
MediaSession: Add new methods for preparing media content
...
Introduced new methods for preparing media content: prepare,
prepareFromMediaId, prepareFromSearch, and prepareFromUri. These methods
allow MediaSession prepare media content rather than play
it. MediaSession will set up a queue or buffer their content during
these preparing requests.
The constants, FLAG_HANDLES_PREPARE_ONLY and EXTRA_PREPARE_ONLY, are
removed because the introduced methods can replace them.
Bug:25841735, Bug:25153060, Bug:25153353
Change-Id: I8fa2097c98fe2fba92b267d2865a9b75d118af09
2016-02-18 18:22:41 +09:00
Lajos Molnar
514a3fb7a6
media: expose audio sample format in MediaFormat
...
Bug: 27172163
Change-Id: I0ae4c0299839612893bb8a43e7016e49487e1a51
2016-02-17 18:52:36 -08:00
Arunesh Mishra
de15666923
Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev am: df8d02b074
...
am: 9f43371bae
* commit '9f43371bae759ba773ef179f091d9d5fdf668cad':
SoundTriggerHelper changes for GenericSoundModels.
2016-02-17 23:51:33 +00:00
Arunesh Mishra
9f43371bae
Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev
...
am: df8d02b074
* commit 'df8d02b07499d0def4a6761b793d4af329309254':
SoundTriggerHelper changes for GenericSoundModels.
2016-02-17 23:44:56 +00:00
Arunesh Mishra
df8d02b074
Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev
2016-02-17 22:42:34 +00:00
Jean-Michel Trivi
3377a8c711
Merge "Audio record notification: only report SDK recording sources" into nyc-dev am: 7fc54dd379
...
am: 039b29808a
* commit '039b29808a94b56cdd63c6b3a15752ce38613241':
Audio record notification: only report SDK recording sources
2016-02-17 22:30:15 +00:00
Arunesh Mishra
3fff7f5634
SoundTriggerHelper changes for GenericSoundModels.
...
- Refactoring SoundTriggerHelper to handle generic sound models.
- Ability to store multiple models, callback and state information.
- Separate out initialization to be done per voice model, per any model
and per generic model.
- Minor change to the API exposed -- removing the Handler from the
createSoundTriggerDetector call.
- Added callback processing for onRecognitionEvent().
- Added logic for stopAll().
- Changes to the SoundTriggerTestApp to start/stop recognition.
- Multiple models (3).
- Ability to start/stop/load/unload individual models.
Bug: 22860713
Bug: 27222043
Change-Id: Ie5d811babb956bead653fb560a43f1e549ed11bd
2016-02-17 14:24:03 -08:00
Jean-Michel Trivi
039b29808a
Merge "Audio record notification: only report SDK recording sources" into nyc-dev
...
am: 7fc54dd379
* commit '7fc54dd3795c41329bcdfdb9c49e0e77de5acf68':
Audio record notification: only report SDK recording sources
2016-02-17 22:20:03 +00:00
Jean-Michel Trivi
7fc54dd379
Merge "Audio record notification: only report SDK recording sources" into nyc-dev
2016-02-17 22:09:16 +00:00
Jean-Michel Trivi
dd2772a339
Audio record notification: only report SDK recording sources
...
Bug 22876530
Change-Id: I7575170ee2d7414c8bf9a04a9adc936b66c33e15
2016-02-17 12:37:11 -08:00
Dongwon Kang
a2b0acdcad
Merge "TIF: Release passthrough session when HardwareSession is released" into nyc-dev am: 37f3488c5c
...
am: 467a7c73ba
* commit '467a7c73ba2d1d6cec9c1f0782c3d5582aa73595':
TIF: Release passthrough session when HardwareSession is released
2016-02-17 19:43:12 +00:00
Dongwon Kang
467a7c73ba
Merge "TIF: Release passthrough session when HardwareSession is released" into nyc-dev
...
am: 37f3488c5c
* commit '37f3488c5c33baf2efbeefeb439b118c14ee0748':
TIF: Release passthrough session when HardwareSession is released
2016-02-17 19:36:54 +00:00
Dongwon Kang
78364ddc04
TIF: Release passthrough session when HardwareSession is released
...
Bug: https://code.google.com/p/android/issues/detail?id=200114
Change-Id: I5d74eb56297e468b95aa0f99b159b2b54f93f5d2
2016-02-17 11:25:54 -08:00
Jae Seo
5f08b3c079
Merge "TIF: Rename setTvInputInfo to updateTvInputInfo" into nyc-dev am: 519e0591fe
...
am: ee87545754
* commit 'ee8754575485512c36c878628351cf070cab53ce':
TIF: Rename setTvInputInfo to updateTvInputInfo
2016-02-17 02:59:13 +00:00
Jae Seo
ee87545754
Merge "TIF: Rename setTvInputInfo to updateTvInputInfo" into nyc-dev
...
am: 519e0591fe
* commit '519e0591fe59bb03571e900ee53327d132e3e4b8':
TIF: Rename setTvInputInfo to updateTvInputInfo
2016-02-17 02:55:59 +00:00
Jae Seo
aa5605ffee
TIF: Rename setTvInputInfo to updateTvInputInfo
...
As TvInputInfo includes many complex objects as fields, it is not
practical to check whether an existing TvInputInfo has actually
"changed" by using simple comparisons when a new TvInputInfo object is
set by a TV input service.
This code change renames
- setTvInputInfo to updateTvInputInfo
- onTvInputInfoChanged to onTvInputInfoUpdated
to indicate that the callback is mechanically invoked whenever
updateTvInputInfo method is called.
Change-Id: Ia351b3591d0ed9da962311546f0ba51158e6478e
2016-02-16 15:44:47 -08:00
Dongwon Kang
d155aeb29f
Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev am: 8da2bf4946
...
am: 2a94f9b7ea
* commit '2a94f9b7ea30969934d310c17013d8748eb59cf5':
TIF: Unhide TvInputInfo.isHidden/loadCustomLabel
2016-02-16 17:39:09 +00:00
Dongwon Kang
2a94f9b7ea
Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev
...
am: 8da2bf4946
* commit '8da2bf49467f026da70a94d7cdf01b84d80bd07a':
TIF: Unhide TvInputInfo.isHidden/loadCustomLabel
2016-02-16 17:32:36 +00:00
Dongwon Kang
8da2bf4946
Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev
2016-02-16 17:22:08 +00:00
Sungsoo Lim
52d04f1f61
Minor changes on MediaBrowser am: 77dc4bb09e
...
am: 01da43b1a4
* commit '01da43b1a40e898221f157073d9b263669503371':
Minor changes on MediaBrowser
2016-02-16 06:50:18 +00:00
Sungsoo Lim
01da43b1a4
Minor changes on MediaBrowser
...
am: 77dc4bb09e
* commit '77dc4bb09e4b8682add75d3d65ca176e93e474fb':
Minor changes on MediaBrowser
2016-02-16 06:43:55 +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
cfdc3261b2
Add flags needed to switch Jack to 1.8 for CTS targets am: a835180b74
...
am: a493e4a151
* commit 'a493e4a151a3ea6a8a973391516057ce43f8dbaa':
Add flags needed to switch Jack to 1.8 for CTS targets
2016-02-15 12:23:23 +00:00
Neil Fuller
a493e4a151
Add flags needed to switch Jack to 1.8 for CTS targets
...
am: a835180b74
* commit 'a835180b74af2cad853db08e8d41a7b04773759b':
Add flags needed to switch Jack to 1.8 for CTS targets
2016-02-15 12:17:29 +00: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
3efba227e9
Merge "Add mediadrm service" into nyc-dev am: f35b991438
...
am: ec3005d1a1
* commit 'ec3005d1a122ba081b0dff7d7a1709de2da176e4':
Add mediadrm service
2016-02-13 08:22:55 +00:00
Jeff Tinker
ec3005d1a1
Merge "Add mediadrm service" into nyc-dev
...
am: f35b991438
* commit 'f35b9914383e6f55008e0c5d74f49a6365c9522f':
Add mediadrm service
2016-02-13 08:16:03 +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
Dimitry Ivanov
bbdcd8aa96
Merge "Add missing liblog dependency" am: 140d7d27f1
...
am: 59615d28e6
* commit '59615d28e6cfbdc54e1605c3e4d2cf9bec237a19':
Add missing liblog dependency
2016-02-13 01:52:11 +00:00
Dimitry Ivanov
59615d28e6
Merge "Add missing liblog dependency"
...
am: 140d7d27f1
* commit '140d7d27f1940d32aa6123414126026e1c382792':
Add missing liblog dependency
2016-02-13 01:45:24 +00:00
Dimitry Ivanov
5a06e3747d
Add missing liblog dependency
...
Bug: http://b/27171986
Change-Id: I40b93ac0d4bfacfc38c08b5dbc5d2b3358a976cb
2016-02-12 16:44:33 -08:00
Hangyu Kuang
bd752db971
Merge "Update Android mediamuxer documentation as it supports webm already." into nyc-dev am: 6dfd022bb8
...
am: b6678262dd
* commit 'b6678262dde0a6ad72f1018e0da2c2d3a3c669b3':
Update Android mediamuxer documentation as it supports webm already.
2016-02-12 23:44:02 +00: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