Sungsoo Lim
76dbe90a53
Merge "MediaBorwserService: Update javadoc" into nyc-dev am: bb71aed9ac
...
am: f58507f892
* commit 'f58507f89230f8aebb47e7673ae9c43c9c8c9805':
MediaBorwserService: Update javadoc
2016-03-04 05:59:02 +00:00
Sungsoo Lim
97243a8ff2
MediaBorwserService: Update javadoc
...
Bug: 26733259
Change-Id: I7240149c0cbbacf221e466908e6ebc201d603c5f
2016-03-04 14:47:23 +09:00
Wei Jia
08dc8c0432
Merge "MediaPlayer: use local variable to check member is null." into nyc-dev am: ebdc198e2f
...
am: 13c6b61616
* commit '13c6b61616d43912996be3302ab2d02ca2b51a99':
MediaPlayer: use local variable to check member is null.
2016-03-03 21:39:31 +00:00
Wei Jia
ebdc198e2f
Merge "MediaPlayer: use local variable to check member is null." into nyc-dev
2016-03-03 21:03:24 +00:00
Wei Jia
a2239b78f8
MediaPlayer: use local variable to check member is null.
...
Bug: 26961341
Change-Id: I343b18f4bfaba9b119a6721e1b39415474149d75
2016-03-03 10:02:19 -08:00
Lajos Molnar
2eb0376310
Merge "media: Add track ID format key" into nyc-dev am: 4ab9756906
...
am: 03b81e8084
* commit '03b81e8084d7785e68b4bb80d799dbf4b0d40a14':
media: Add track ID format key
2016-03-03 16:20:35 +00:00
Lajos Molnar
4ab9756906
Merge "media: Add track ID format key" into nyc-dev
2016-03-03 16:14:26 +00:00
Lajos Molnar
6ef0ac3278
media: Add track ID format key
...
Bug: 25684127
Change-Id: I574515c3c144f5cabe4f40d934d062de1dd20851
2016-03-03 16:12:52 +00:00
Sungsoo Lim
54d29bb301
Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev am: 4a67d975e4
...
am: bc287ddd15
* commit 'bc287ddd15c3b650bd38f64fd6ed37ee2851c47d':
MediaBrowserService: Make SubscriptionCallback.onError be called
2016-03-02 08:27:01 +00:00
Jeff Sharkey
d1be3e0bdf
Merge "When system server goes down, crash apps more." into nyc-dev am: 60b7bcc614
...
am: 33a64f5e56
* commit '33a64f5e5600d86ef6ce270ce57fffbf4f2ab35d':
When system server goes down, crash apps more.
2016-03-02 06:57:26 +00:00
Insun Kang
50a9af14c5
Merge "Annotate Media section of framework/base" into nyc-dev am: 542221d68a
...
am: af79855f84
* commit 'af79855f8402cfc71914b18106cb1d8293663eee':
Annotate Media section of framework/base
2016-03-02 06:46:41 +00:00
Sungsoo Lim
64f16f1dc1
MediaBrowserService: Make SubscriptionCallback.onError be called
...
Bug: 26733259
Change-Id: I8324e1c56e87071e781550ac0701e632a4122e73
2016-03-02 14:08:18 +09:00
Dongwon Kang
176facba14
Merge "TIF: Address API review comments" into nyc-dev
...
am: 9cd89a403e
* commit '9cd89a403e60f6be665a6068be76b805c8b83402':
TIF: Address API review comments
(cherry picked from commit f6c9dc9594 )
2016-03-01 20:48:50 -08:00
Jeff Sharkey
60b7bcc614
Merge "When system server goes down, crash apps more." into nyc-dev
2016-03-02 02:42:16 +00:00
Jeff Sharkey
c53962d4ed
When system server goes down, crash apps more.
...
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.
The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.
Bug: 27364859
Change-Id: Ife0bcb079636c88d54c44d17eb580409fd79028b
2016-03-01 19:29:16 -07:00
Insun Kang
542221d68a
Merge "Annotate Media section of framework/base" into nyc-dev
2016-03-02 01:36:10 +00:00
Dongwon Kang
9cd89a403e
Merge "TIF: Address API review comments" into nyc-dev
2016-03-01 22:11:47 +00:00
Phil Burk
f5b8848184
Merge "AudioTrack: docs for getUnderrunCount()" into nyc-dev am: 88353459e2
...
am: f1bc7deffc
* commit 'f1bc7deffc1c733ecf2e5d834274e1c13231d9db':
AudioTrack: docs for getUnderrunCount()
2016-03-01 20:42:20 +00:00
Phil Burk
88353459e2
Merge "AudioTrack: docs for getUnderrunCount()" into nyc-dev
2016-03-01 19:13:39 +00:00
Dongwon Kang
b55c7517ba
TIF: Address API review comments
...
Bug: 27386052
Change-Id: I242819e0817723e247b8fe646d534899ab50af76
2016-03-01 10:03:58 -08:00
Hangyu Kuang
44ad2a94f9
Merge "Update Android mediamuxer documentation." into nyc-dev am: 3e0127f5d5
...
am: 72c713adda
* commit '72c713addaceef80dbd8cd626e1728cd9322f586':
Update Android mediamuxer documentation.
2016-03-01 17:25:35 +00:00
Hangyu Kuang
3e0127f5d5
Merge "Update Android mediamuxer documentation." into nyc-dev
2016-03-01 17:18:15 +00:00
Ronghua Wu
3f550f5e5b
Merge "media: define HEVCProfileMain10HDR10" into nyc-dev am: 78614f7714
...
am: 91b01d6c4e
* commit '91b01d6c4eefaed20632b8320eea50566ab49bf8':
media: define HEVCProfileMain10HDR10
2016-03-01 16:41:24 +00:00
Ronghua Wu
78614f7714
Merge "media: define HEVCProfileMain10HDR10" into nyc-dev
2016-03-01 16:35:22 +00:00
Daichi Hirono
d247736f18
Merge "Fix argument type in MtpDatabase#getObjectPropertyValue." into nyc-dev am: 300efaa0ea
...
am: 8f6c0d2fe1
* commit '8f6c0d2fe10dc283a62a18ab1769b9c408ced611':
Fix argument type in MtpDatabase#getObjectPropertyValue.
2016-03-01 08:43:50 +00:00
Daichi Hirono
300efaa0ea
Merge "Fix argument type in MtpDatabase#getObjectPropertyValue." into nyc-dev
2016-03-01 08:36:28 +00:00
Daichi Hirono
486ad2e73c
Fix argument type in MtpDatabase#getObjectPropertyValue.
...
In MTP code, we use jint for ID (e.g. object handle) and code (property
code). But getObjectPropertyValue takes jlong and it causes missing
property values in Java code. Previously we passed the long value to
Map<Integer, MtpPropertyGroup>#get(Integer) and the compiler somehow
accepted the code. However it actually takes Long at runtime, so the
properties are never found.
BUG=26437284
Change-Id: I79defd325ea5d20c4dce84d891d984e24abcacc5
2016-03-01 16:49:08 +09:00
Jeff Tinker
0371b20a87
Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev am: 6430b15495
...
am: 9d486e5bd8
* commit '9d486e5bd814d7631f2f29c9098fcb3ba7f44ab9':
Add javadocs to MediaCodec.CryptoInfo methods
2016-03-01 02:38:04 +00:00
Jeff Tinker
6430b15495
Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev
2016-03-01 02:26:30 +00:00
Lajos Molnar
aafe36d8ff
Merge "media: switch to using MediaImage2" into nyc-dev am: 063a570ef0
...
am: 29b16d8b08
* commit '29b16d8b089a37a9e4e054742b44a19dc5ded3f5':
media: switch to using MediaImage2
2016-03-01 00:58:48 +00:00
Lajos Molnar
063a570ef0
Merge "media: switch to using MediaImage2" into nyc-dev
2016-03-01 00:40:30 +00:00
Phil Burk
f6e8da4b23
Merge "AudioService: add support for ENCODED_SURROUND_OUTPUT" into nyc-dev am: 4e572d32f8
...
am: 2f4d3aa204
* commit '2f4d3aa204d2026cc93fe72049d5c9f0fe39f5eb':
AudioService: add support for ENCODED_SURROUND_OUTPUT
2016-03-01 00:24:22 +00:00
Jeff Sharkey
3541354007
Merge "Parcelable classes should always be final." into nyc-dev am: 753c347efd
...
am: 620ef3f226
* commit '620ef3f22654676cd37df23db059a71e0607d6a9':
Parcelable classes should always be final.
2016-03-01 00:12:20 +00:00
Phil Burk
4e572d32f8
Merge "AudioService: add support for ENCODED_SURROUND_OUTPUT" into nyc-dev
2016-03-01 00:06:21 +00:00
Jeff Tinker
8ad2965d00
Add javadocs to MediaCodec.CryptoInfo methods
...
bug:27383993
Change-Id: I11bba4a2690d112e4210add41910f14c5ba6a927
2016-02-29 23:49:04 +00:00
Jeff Sharkey
50d1c044b5
Parcelable classes should always be final.
...
Also hide ConnectivityMetricsEvent which isn't being used yet.
Bug: 27415331
Change-Id: Iacdccddda504f3f669185f807b4f35b8dc2b0212
2016-02-29 16:46:09 -07:00
Phil Burk
ac0f704b1a
AudioService: add support for ENCODED_SURROUND_OUTPUT
...
Preference allows override of AudioPolicyManager.
Lets user force or prevent use of AC3 and DTS regardless
of what the EDID says.
Bug: 26373761
Change-Id: I21440f2b90af9a369a36b7b07724e992501bce6d
Signed-off-by: Phil Burk <philburk@google.com >
2016-02-29 12:20:43 -08:00
Insun Kang
7c090d54e2
Annotate Media section of framework/base
...
Use @IntDef and @StringDef annotations where appropriate to ensure that
IDEs can autocomplete to the correct set of constants.
Bug: 22726900
Change-Id: I7626beb0634b754ffea9c012f42e6a21aa0faa51
2016-02-29 16:06:27 +09:00
Sungsoo Lim
fc9a809c69
Merge "MediaBrowser: Fix Javadoc" into nyc-dev am: 18eda4a1ca
...
am: 1518146ef1
* commit '1518146ef15212a99abf60323a17f53d0c2c01c8':
MediaBrowser: Fix Javadoc
2016-02-29 05:25:27 +00:00
Sungsoo Lim
ab19dc8e14
MediaBrowser: Fix Javadoc
...
Bug: 27384292
Change-Id: I57ddfaea0fe888665bc7ee88cd933a660c26f1a6
2016-02-29 14:03:48 +09:00
Jeff Sharkey
e8bd6c7a3f
Merge "When system server goes down, crash apps more." into nyc-dev am: 004bf6ade3
...
am: 917fe2f8a5
* commit '917fe2f8a540fbc181a8647851a8b660da860286':
When system server goes down, crash apps more.
2016-02-28 00:27:09 +00:00
Jeff Sharkey
f8880561e6
When system server goes down, crash apps more.
...
Similar to first patch, but now using new "rethrowFromSystemServer()"
method which internally translates DeadObjectException into
DeadSystemException. New logic over in Log.printlns() now
suppresses the DeadSystemException stack traces, since they're
misleading and just added pressure to the precious log buffer space.
Add some extra RuntimeInit checks to suppress logging-about-logging
when the system server is dead.
Bug: 27364859
Change-Id: I05316b3e8e42416b30a56a76c09cd3113a018123
2016-02-27 17:17:01 -07:00
Andy Hung
5e8dbc8fb0
Merge "Make master mono controlled through settings" into nyc-dev am: 2362bdf2c7
...
am: 5bf89b5616
* commit '5bf89b561686d168b04ffab3cd7e61c0d72bc5fa':
Make master mono controlled through settings
2016-02-27 02:57:17 +00:00
Andy Hung
2362bdf2c7
Merge "Make master mono controlled through settings" into nyc-dev
2016-02-27 02:50:07 +00:00
Phil Burk
2bf39d8e9f
AudioTrack: docs for getUnderrunCount()
...
Remove unnecessary warning about underruns.
Bug: 27384290
Change-Id: Ia872a6580d50952195842c3251370a3dd5da5111
Signed-off-by: Phil Burk <philburk@google.com >
2016-02-26 18:12:31 -08:00
Jae Seo
05c9fc56e5
Merge "TIF: Enable per state input icon in TvInputInfo" into nyc-dev am: 988a430793
...
am: 46f7ff52b5
* commit '46f7ff52b529e65075802b22c281fc1decd42abc':
TIF: Enable per state input icon in TvInputInfo
2016-02-27 01:43:57 +00:00
Jae Seo
093fa4ebd8
TIF: Enable per state input icon in TvInputInfo
...
Also made the fields final and grouped them.
Bug: 23820259
Change-Id: I725c830d7c73e8cbc01b6a4f4f4991cb42258380
2016-02-26 16:54:11 -08:00
Jean-Michel Trivi
71133e5690
Merge "Audio record notification: report audio device information" into nyc-dev am: 768d81374b
...
am: 957a6cfd6d
* commit '957a6cfd6dd2ea9c6e586f594173a6ebaf34f897':
Audio record notification: report audio device information
2016-02-26 22:44:35 +00:00
Jean-Michel Trivi
768d81374b
Merge "Audio record notification: report audio device information" into nyc-dev
2016-02-26 22:37:34 +00:00
Ronghua Wu
f2615b8b33
media: define HEVCProfileMain10HDR10
...
Bug: 25684127
Change-Id: I9679eaab9b02aeede3e488d33279477a45887b63
2016-02-26 13:22:52 -08:00