Eric Laurent
3503886bc0
Merge "MediaActionSound: fix SoundPool load race condition" into nyc-dev
...
am: 2523d8f
* commit '2523d8f1e385bd69bfd33510f1041ee0b7e7db66':
MediaActionSound: fix SoundPool load race condition
Change-Id: If32589bc3097724872303de6fc9b1723bd68486c
2016-04-04 21:48:48 +00:00
Eric Laurent
d7a267de78
MediaActionSound: fix SoundPool load race condition
...
If play() was called shortly after load() and before the load
completion callback, the sample was considered
loaded although the SoundPool was not ready to play it.
Fixed by implementing a more robust state machine for sound
load and play control.
Bug: 22499793
Change-Id: I727e07f842a0adc5225dc248f16bc4a7225a1c8e
2016-04-04 12:53:01 -07:00
Robert Shih
1305623441
Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev
...
am: 5bf198c
* commit '5bf198c3806c611fceb3d6d373883ed8f11a37fc':
Fix MediaExtractor.getDrmInitData implementation for webm
Change-Id: I46d4b3a1b17bd11f209a4f9fa150c1d38bb55592
2016-04-04 17:18:25 +00:00
Robert Shih
5bf198c380
Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev
2016-04-04 17:09:45 +00:00
Sungsoo Lim
38fdef8d4e
Merge "MediaBrowser: Make EXTRA_PAGE zero-based" into nyc-dev
...
am: 16bbf7d
* commit '16bbf7d8eddf4778b415e8871ab04885250dbd94':
MediaBrowser: Make EXTRA_PAGE zero-based
Change-Id: I75f1786e6a2acb2a06e11f1af7856a7344593104
2016-04-04 07:06:15 +00:00
Sungsoo Lim
0799bd07d7
MediaBrowser: Make EXTRA_PAGE zero-based
...
Bug: 27948393
Change-Id: I97fb6b5f13ffb8e006ed4a7efc06e7f45fb5121a
2016-04-04 11:14:10 +09:00
Jean-Michel Trivi
e2e83f1a7d
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev
...
am: e731fab
* commit 'e731fab348e5b6d19c078e200afa50f166bfbf7d':
AudioTrack.Builder: fix javadoc code sample
Change-Id: If68633496ba82655cdf9591ed7cb08b96c7733ca
2016-04-02 01:27:07 +00:00
Jean-Michel Trivi
49962261b3
AudioTrack.Builder: fix javadoc code sample
...
Fix sample rate in javadoc code sample.
Bug 24499652
Change-Id: I8d92ff34981cb4486e780d74213ed88fd3f74cc6
2016-04-01 17:23:19 -07:00
Robert Shih
c67abec674
Fix MediaExtractor.getDrmInitData implementation for webm
...
Should lookup "crypto-key" in individual track formats instead of file format.
Bug: 26070802
Change-Id: I1a0f59e7bca1d311631e7ad90b9a403ac20d319b
2016-04-01 16:25:53 -07:00
Jean-Michel Trivi
f533f04807
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev
...
am: 7fa2caf
* commit '7fa2caf34a941a15062ec4ab77b60aa382e76e2a':
AudioTrack.Builder: fix javadoc code sample
Change-Id: Ia269d56b2881c13d0b72982ba758c842cdf8ad49
2016-04-01 21:58:56 +00:00
Jean-Michel Trivi
67e3d66609
Merge "Audio recording activity notification: change callback name" into nyc-dev
...
am: 9cc2c5c
* commit '9cc2c5ceaa0718c6619890e58cbea3890ebcd9cf':
Audio recording activity notification: change callback name
Change-Id: I68cd7f3674f1856aaa117ff1381b6d6983c59960
2016-04-01 21:58:54 +00:00
Jean-Michel Trivi
7fa2caf34a
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev
2016-04-01 21:53:23 +00:00
Jean-Michel Trivi
e27a75173f
AudioTrack.Builder: fix javadoc code sample
...
Code sample in javadoc for AudioTrack.Builder didn't compile.
Bug 24499652
Change-Id: Ib881052bdebd74a25bb86ab73f9679b17c3ce62b
2016-04-01 21:52:42 +00:00
Jean-Michel Trivi
9cc2c5ceaa
Merge "Audio recording activity notification: change callback name" into nyc-dev
2016-04-01 21:48:41 +00:00
Dongwon Kang
93343b8f25
Merge "TIF: Add setLabel(CharSequence) in TvInputInfo.Builder" into nyc-dev
...
am: 66ebc88
* commit '66ebc88626a73f8c2a8833fea000b65dbbf971cc':
TIF: Add setLabel(CharSequence) in TvInputInfo.Builder
Change-Id: Id6784bb9c1db532915250ee586725c3f15e8de05
2016-04-01 19:50:43 +00:00
Dongwon Kang
66ebc88626
Merge "TIF: Add setLabel(CharSequence) in TvInputInfo.Builder" into nyc-dev
2016-04-01 19:42:41 +00:00
Ronghua Wu
8a051c1a35
media: update dolby vision CodecProfileLevel
...
am: 32e537c
* commit '32e537c610b66ca975e6d9e4cf5dadb4a7cb62d3':
media: update dolby vision CodecProfileLevel
Change-Id: I57990eabeea272fee71ed2aa2cd631e9e92fb190
2016-04-01 18:34:32 +00:00
Ronghua Wu
32e537c610
media: update dolby vision CodecProfileLevel
...
Bug: 25684127
Change-Id: I3d35e31b34cc0d23c68eded87d5e443c74833685
2016-04-01 18:02:41 +00:00
Jean-Michel Trivi
e6a505b775
Audio recording activity notification: change callback name
...
Rename AudioRecordingCallback.onRecordConfigChanged() to
onRecordingConfigChanged() after API council review
Bug 27952000
Change-Id: I362a973781e029bca921181934599dcf60e13136
2016-04-01 09:56:28 -07:00
Dongwon Kang
d09372ad86
TIF: Add setLabel(CharSequence) in TvInputInfo.Builder
...
Bug: 25726241
Change-Id: I8b7cf157dffd0df2b04af0386e448b23409be1e5
2016-04-01 09:51:27 -07:00
Insun Kang
848785f20c
Merge "ExifInterface: Code clean up" into nyc-dev
...
am: faecc3f
* commit 'faecc3f800cf2eaaf94f563faaba44193582e8b0':
ExifInterface: Code clean up
Change-Id: I527fe115f16725d9f1ab371e96c776d81a62e36d
2016-04-01 08:59:03 +00:00
Insun Kang
8884af3ee9
ExifInterface: Code clean up
...
Replaces deprecated constants with newly added constants in the actual
implementation.
Bug: 27932489
Change-Id: Id54236a05127cd7ce3bf0668c002635fb86489a9
2016-04-01 11:53:14 +09:00
Jaesung Chung
61f6904e98
Merge "ExifInterface: deprecate duplicated tags" into nyc-dev
...
am: d37577d
* commit 'd37577d1094de1a93c61502df5738b56433b3e70':
ExifInterface: deprecate duplicated tags
Change-Id: If1c9ac561edcbde6bdcf592886cc3794497ed5c6
2016-03-31 23:12:13 +00:00
Jaesung Chung
d37577d109
Merge "ExifInterface: deprecate duplicated tags" into nyc-dev
2016-03-31 23:04:43 +00:00
Hangyu Kuang
a82e1d5f15
Merge "Update mediamuxer documentation that it does not support muxing B-frames." into nyc-dev
...
am: 7c33a5d
* commit '7c33a5dccee1849f7d2a7a6dbea0da2d4eeb27c2':
Update mediamuxer documentation that it does not support muxing B-frames.
Change-Id: I8e8a583590a124d3126459fe54b9885ae7c3046d
2016-03-31 21:40:59 +00:00
Hangyu Kuang
7c33a5dcce
Merge "Update mediamuxer documentation that it does not support muxing B-frames." into nyc-dev
2016-03-31 21:32:43 +00:00
Dongwon Kang
0264016bdb
Merge "TIF: Update javadoc with a better wording" into nyc-dev
...
am: fd0bdc4
* commit 'fd0bdc4a29e6069e123268981b1af1f12f16030d':
TIF: Update javadoc with a better wording
Change-Id: I5d6fed8a4e661742d13973dda7ba3457cba1e2ec
2016-03-31 19:49:10 +00:00
Dongwon Kang
2703a4e7b1
Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev
...
am: 8904a1a
* commit '8904a1a1df404149be94ee7df600eda1de177ff4':
TIF: Address comments on hardware manager related system APIs
Change-Id: I0ef721b3b15a3c6358cb8f34cd2427bd311ce738
2016-03-31 17:49:09 +00:00
Dongwon Kang
3c9b4983a1
Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev
...
am: 8f647b5
* commit '8f647b5cdb1f776dbc5d2127fe72a6cf40f95813':
TIF: Add more class documentation on TvInputManager
Change-Id: Ie5035212f2d97a93aa2ca686bb814ffaf2175d1a
2016-03-31 17:48:49 +00:00
Dongwon Kang
775e3c288e
TIF: Update javadoc with a better wording
...
Change-Id: I656c8a94e9d0e5b3ee9ab2b948d51573f5c4e1b2
2016-03-31 10:33:32 -07:00
Dongwon Kang
8904a1a1df
Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev
2016-03-31 17:01:36 +00:00
Dongwon Kang
8f647b5cdb
Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev
2016-03-31 16:46:35 +00:00
Hangyu Kuang
d853da5425
Update mediamuxer documentation that it does not support muxing B-frames.
...
Bug:27597166
Change-Id: I79c971f68d55b19838c1de2be012aaf373c735c4
2016-03-31 16:38:18 +00:00
Tomasz Mikolajewski
f2c62df036
Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev
...
am: e1d0cab
* commit 'e1d0cabb5f4ccc43d7fa1d84a02a87a8683f8537':
Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.
Change-Id: Ic637439d4d49829f46c64ecced05c838e45fc211
2016-03-31 03:55:24 +00:00
Tomasz Mikolajewski
e1d0cabb5f
Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev
2016-03-31 03:47:41 +00:00
Jaesung Chung
0ae6bdfe37
ExifInterface: deprecate duplicated tags
...
Bug: 27932489
Change-Id: I423a4eab875aec80cf0a2e4c2911e8b5c88fd0d7
2016-03-31 11:20:38 +09:00
Tomasz Mikolajewski
2b57efb262
Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.
...
Bug: 27579803
Change-Id: If9fe16976cfbc0760a6afb3043d35e0ee387945c
2016-03-31 10:36:26 +09:00
Jean-Michel Trivi
a26c8d38a9
Merge "Fix audio focus logging" into nyc-dev
...
am: 4e9b8d4
* commit '4e9b8d4fe46c9b4f19b74fea92ffb4d51354ad5e':
Fix audio focus logging
Change-Id: I2220177c6bd4c1a0ba0fd7ad3abd9e52a6241a14
2016-03-31 00:32:43 +00:00
Dongwon Kang
5557bef5e4
TIF: Add more class documentation on TvInputManager
...
Bug: 25726241
Change-Id: Ib3ff49f2d9f7a3bdcee4b97f89da193fe05d663c
2016-03-30 16:10:11 -07:00
Dongwon Kang
0632d8ae71
TIF: Address comments on hardware manager related system APIs
...
Bug: 25726241
Change-Id: I0a3e7e8cf494d897fc04528ba719faa4150b9207
2016-03-30 13:25:45 -07:00
Jean-Michel Trivi
449362e065
Fix audio focus logging
...
Fix error in audio focus dispatching log: the message value (here
MSSG_FOCUS_CHANGE, which is 0) was logged instead of the focus
value being sent to the audio focus listener.
Bug 25790720
Change-Id: I534ce8d1059c09a52e56c51acd60405ef3c4cda1
2016-03-30 12:06:22 -07:00
Jaesung Chung
10e6624312
Merge "ExifInterface: keep tags in the original tag groups" into nyc-dev
...
am: 41e54ad
* commit '41e54ad3a8e058f35a17eddff9b498dcf872006e':
ExifInterface: keep tags in the original tag groups
Change-Id: I0d0464b15b0b41157b9dfd6b241612506d6e02d8
2016-03-30 11:08:39 +00:00
Jaesung Chung
41e54ad3a8
Merge "ExifInterface: keep tags in the original tag groups" into nyc-dev
2016-03-30 10:59:24 +00:00
Jaesung Chung
4118ca8627
ExifInterface: keep tags in the original tag groups
...
Previously ExifInterface saved its tags in the all possible IFD tags via
setAttribute() method even it already knew the right IFD group for those
tags. In this CL, it introduces updateAttribute() and removeAttribute()
methods in order to maintain the internal IFD tags and its values
according to its original EXIF saving states in the given JPEG file.
Bug: 27583378
Change-Id: Ie49163c8c9bdd38b575ccd76938879ccddcd547b
2016-03-30 13:43:34 +09:00
Phil Burk
202f4c1d8b
Merge "AudioTrack: document some throws" into nyc-dev
...
am: 9a95421
* commit '9a95421c26dc4d20387e04c37ba6ba89e3cef1bd':
AudioTrack: document some throws
2016-03-28 22:51:55 +00:00
Phil Burk
9a95421c26
Merge "AudioTrack: document some throws" into nyc-dev
2016-03-28 22:31:25 +00:00
Phil Burk
eeecfa4401
AudioTrack: document some throws
...
For setBufferSizeInFrames() and related methods.
Bug: 27384290
Change-Id: Ie5decb39d7945f304f57163c5da540cfd01903c7
Signed-off-by: Phil Burk <philburk@google.com >
2016-03-28 14:19:17 -07:00
Daichi Hirono
bd48200e89
Update the comment of MtpDevice#getObjectSizeLong
...
am: 1337deb
* commit '1337deb6eac47b9eeef0999a928caba0cfca7126':
Update the comment of MtpDevice#getObjectSizeLong
2016-03-28 05:44:26 +00:00
Daichi Hirono
1337deb6ea
Update the comment of MtpDevice#getObjectSizeLong
...
BUG=27805369
Change-Id: I63762fedf540e89e9ca811a143cb178881ef1830
2016-03-28 04:37:14 +00:00
Jae Seo
ffcb3acb90
Merge "TIF: Notify of visibility or label changes of TvInputInfo" into nyc-dev
...
am: d26ee11
* commit 'd26ee111720aebcad486dd1a37b5338040a4f915':
TIF: Notify of visibility or label changes of TvInputInfo
2016-03-25 23:37:46 +00:00