Hangyu Kuang
a20e438c8f
Merge "media: update VP9 CodecProfileLevel" into nyc-dev
...
am: 333c7d3
2016-04-11 20:35:14 +00:00
Jeff Sharkey
0e2e7806b7
Merge "Clean up AudioRouting API internals." into nyc-dev
2016-04-11 20:33:50 +00:00
Hangyu Kuang
333c7d3600
Merge "media: update VP9 CodecProfileLevel" into nyc-dev
2016-04-11 20:22:18 +00:00
Shubang Lu
e72ec3e2cc
Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev am: e346335
...
am: 009f5cd
2016-04-11 19:49:25 +00:00
shubang
009f5cd591
Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev
...
am: e346335
2016-04-11 19:44:28 +00:00
Shubang Lu
e346335d3c
Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev
2016-04-11 19:37:25 +00:00
Hangyu Kuang
f0ef572fd0
media: update VP9 CodecProfileLevel
...
Bug:27969307
Change-Id: I44f230bb691bd193c2119b399eca17da87bfbc97
2016-04-11 12:08:03 -07:00
Jeff Sharkey
ed2edc7a8e
Clean up AudioRouting API internals.
...
Reuse existing OnRoutingChangedListener APIs and internal logic by
extending the new AudioRouting.OnRoutingChangedListener. We use
new default methods to delegate incoming calls on the legacy
interfaces.
Fix a handful of locking bugs.
Bug: 27950070, 27952052, 27949198
Change-Id: Ie584108bcbeeab064d8e27d4984e541f31d36728
2016-04-11 13:01:55 -06:00
shubang
c2215d0856
TIF: Add equals() and hashCode() for comparisons
...
Bug: 21307285
Change-Id: I6afcde913b3238044fd66d5f74afe3f97a85b25e
2016-04-11 10:53:36 -07:00
Jaesung Chung
d1b04ba98f
Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev am: 6d01f0a
...
am: f8c9926
2016-04-09 06:26:00 +00:00
Jaesung Chung
f8c992629b
Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev
...
am: 6d01f0a
2016-04-09 06:12:06 +00:00
Jaesung Chung
6d01f0af43
Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev
2016-04-09 06:04:37 +00:00
Lajos Molnar
7a5a93b776
media: document MediaFormat.KEY_FRAME_RATE better
...
Bug: 27126548
Change-Id: I7e6a70bd192623d335816c1aa135448b7846aa92
2016-04-08 23:44:05 +00:00
Jaesung Chung
c048c5f74a
ExifInterface: inform the developers to close their FD/streams
...
After use of constructors for FD/Streams, developers should close their
FD/streams.
Bug: 27948392
Change-Id: I6c26213d6804791e6d72d5830566f63e5ed57284
2016-04-08 22:34:47 +09:00
Daichi Hirono
8dc7f92c00
Merge "Close MTP database when MtpServer\'s thread is terminated." into nyc-dev
...
am: 4e5bbc3
2016-04-08 00:22:52 +00:00
Daichi Hirono
4e5bbc3ea7
Merge "Close MTP database when MtpServer's thread is terminated." into nyc-dev
2016-04-08 00:13:02 +00:00
Dongwon Kang
c324bf2514
Merge "TIF: Fix a typo in the documentation" into nyc-dev am: f07ec15
...
am: 025a9217
2016-04-07 23:05:13 +00:00
Dongwon Kang
025a921799
Merge "TIF: Fix a typo in the documentation" into nyc-dev
...
am: f07ec15
2016-04-07 23:01:22 +00:00
Dongwon Kang
f07ec150f3
Merge "TIF: Fix a typo in the documentation" into nyc-dev
2016-04-07 22:56:47 +00:00
Dongwon Kang
308fe5741f
TIF: Fix a typo in the documentation
...
Change-Id: I0e4963ca6ce3f42682a7d591f913ea801987b31b
2016-04-07 13:39:35 -07:00
Daichi Hirono
fe259319e6
Close MTP database when MtpServer's thread is terminated.
...
Fix: 28030321
Change-Id: I7efe59b651a62ca917ba74312a80b56c0564e060
(cherry picked from commit dd383597c4
2016-04-07 05:47:41 +00:00
Robert Shih
dc05dab86f
Merge "DrmInitData: prevent public constructor access" into nyc-dev am: 696dc4d
...
am: dd9c91d
2016-04-06 17:23:27 +00:00
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
Daichi Hirono
d9babdad23
Merge "Close MTP database when MtpServer's thread is terminated."
2016-04-06 04:46:27 +00:00
Daichi Hirono
dd383597c4
Close MTP database when MtpServer's thread is terminated.
...
Fix: 28030321
Change-Id: I7efe59b651a62ca917ba74312a80b56c0564e060
2016-04-06 13:04:51 +09:00
Phil Burk
8680d6d023
Merge "MidiDevice: fix connectPorts for same Process" into nyc-dev am: b2e4e98
...
am: 91d9f03
* commit '91d9f03e360a5d5f41ec9cb5baf1dfa855540778':
MidiDevice: fix connectPorts for same Process
Change-Id: I29fedf16cbeff60313c708fc0646db71cc8246ca
2016-04-06 04:00:27 +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
8d3692c565
Merge "MediaActionSound: fix SoundPool load race condition" into nyc-dev am: 2523d8f
...
am: 3503886
2016-04-04 21:51:17 +00: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
83e3f3afb7
Merge "Fix MediaExtractor.getDrmInitData implementation for webm" into nyc-dev am: 5bf198c
...
am: 1305623
2016-04-04 17:21:51 +00: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
b646eab3f5
Merge "MediaBrowser: Make EXTRA_PAGE zero-based" into nyc-dev am: 16bbf7d
...
am: 38fdef8
2016-04-04 07:09:34 +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
4d59d33905
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev am: e731fab
...
am: e2e83f1
2016-04-02 01:31:42 +00: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
577c1c1570
Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev am: 7fa2caf
...
am: f533f04
2016-04-01 22:03:54 +00:00
Jean-Michel Trivi
dd15f5ae28
Merge "Audio recording activity notification: change callback name" into nyc-dev am: 9cc2c5c
...
am: 67e3d66
2016-04-01 22:03:51 +00: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
