Robert Shih
dd9c91d2ba
Merge "DrmInitData: prevent public constructor access" into nyc-dev
...
am: 696dc4d
2016-04-06 17:17:47 +00:00
Robert Shih
696dc4d8df
Merge "DrmInitData: prevent public constructor access" into nyc-dev
2016-04-06 17:13:23 +00:00
Phil Burk
91d9f03e36
Merge "MidiDevice: fix connectPorts for same Process" into nyc-dev
...
am: b2e4e98
2016-04-06 03:57:02 +00:00
Phil Burk
b2e4e98e7c
Merge "MidiDevice: fix connectPorts for same Process" into nyc-dev
2016-04-06 03:51:46 +00:00
Trevor Johns
a5060ee80d
Merge branch 'mnc-mr-docs' into mnc-ub-dev
...
Large merge to reconnect automerger for docs branch to mainline.
Conflicts:
docs/html-intl/intl/es/index.jd
docs/html-intl/intl/es/preview/download.jd
docs/html-intl/intl/es/preview/index.jd
docs/html-intl/intl/ja/index.jd
docs/html-intl/intl/ja/preview/download.jd
docs/html-intl/intl/ja/preview/index.jd
docs/html-intl/intl/ko/index.jd
docs/html-intl/intl/ko/preview/download.jd
docs/html-intl/intl/ko/preview/index.jd
docs/html-intl/intl/pt-br/index.jd
docs/html-intl/intl/pt-br/preview/download.jd
docs/html-intl/intl/pt-br/preview/index.jd
docs/html-intl/intl/ru/index.jd
docs/html-intl/intl/ru/preview/download.jd
docs/html-intl/intl/ru/preview/index.jd
docs/html-intl/intl/zh-cn/index.jd
docs/html-intl/intl/zh-cn/preview/download.jd
docs/html-intl/intl/zh-cn/preview/index.jd
docs/html-intl/intl/zh-tw/index.jd
docs/html-intl/intl/zh-tw/preview/download.jd
docs/html-intl/intl/zh-tw/preview/index.jd
docs/html/guide/topics/manifest/compatible-screens-element.jd
docs/html/guide/topics/manifest/uses-feature-element.jd
docs/html/preview/download.jd
docs/html/preview/features/runtime-permissions.jd
docs/html/sdk/index.jd
docs/html/tools/revisions/studio.jd
docs/html/tools/sdk/eclipse-adt.jd
docs/html/tools/support-library/features.jd
telephony/java/android/telephony/TelephonyManager.java
Bug: 28000173
Change-Id: Iacab0481175f1b32e0ac3bab98cde9e994100e94
2016-04-05 20:32:07 -07:00
Phil Burk
80299748cc
MidiDevice: fix connectPorts for same Process
...
If connectPorts() was called for a device in the same process then
the connection would die when the ParcelFileDescriptor was closed.
Bug: 26406775
Change-Id: Id0538452593b4761ac2a93d366ade76d2e35ce73
Signed-off-by: Phil Burk <philburk@google.com >
2016-04-05 15:27:53 -07:00
Robert Shih
50cd766a57
DrmInitData: prevent public constructor access
...
Bug: 27949882
Change-Id: I8482f8eba18632eea95e14f0123c11da18e70fae
2016-04-05 14:51:44 -07:00
Eric Laurent
3503886bc0
Merge "MediaActionSound: fix SoundPool load race condition" into nyc-dev
...
am: 2523d8f
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
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
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
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
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
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
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
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
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
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
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
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
2016-03-31 17:49:09 +00:00
Dongwon Kang
3c9b4983a1
Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev
...
am: 8f647b5
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
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
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
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
