drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237,055 Commits 1 Branch 0 Tags
Commit Graph

10511 Commits

Author SHA1 Message Date
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
bc287ddd15 Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev 
am: 4a67d975e4

* commit '4a67d975e4e7d792e84ce4f2d2a5eba0da361533':
  MediaBrowserService: Make SubscriptionCallback.onError be called
 2016-03-02 05:46:21 +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 f6c9dc9594cf16c6e148498cabd793f8affa76e9)
 2016-03-01 20:48:50 -08:00
Jeff Sharkey
33a64f5e56 Merge "When system server goes down, crash apps more." into nyc-dev 
am: 60b7bcc614

* commit '60b7bcc614ae818c902e1a0ed3b2381e23eba61c':
  When system server goes down, crash apps more.
 2016-03-02 02:51:39 +00:00
Jeff Sharkey
60b7bcc614 Merge "When system server goes down, crash apps more." into nyc-dev 2016-03-02 02:42:16 +00:00
Insun Kang
af79855f84 Merge "Annotate Media section of framework/base" into nyc-dev 
am: 542221d68a

* commit '542221d68afe424da3821c9ae87dc62a5a5fac5a':
  Annotate Media section of framework/base
 2016-03-02 02:33:23 +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
f6c9dc9594 Merge "TIF: Address API review comments" into nyc-dev 
am: 9cd89a403e

* commit '9cd89a403e60f6be665a6068be76b805c8b83402':
  TIF: Address API review comments
 2016-03-01 22:55:19 +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
f1bc7deffc Merge "AudioTrack: docs for getUnderrunCount()" into nyc-dev 
am: 88353459e2

* commit '88353459e28059d440d76d1e78fb6a2bce157fb3':
  AudioTrack: docs for getUnderrunCount()
 2016-03-01 20:31:18 +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
72c713adda Merge "Update Android mediamuxer documentation." into nyc-dev 
am: 3e0127f5d5

* commit '3e0127f5d568d946ed24a9f98829c8bce1086dda':
  Update Android mediamuxer documentation.
 2016-03-01 17:23:06 +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
91b01d6c4e Merge "media: define HEVCProfileMain10HDR10" into nyc-dev 
am: 78614f7714

* commit '78614f7714cec3cacc4947b5c3e1a2b199640a3b':
  media: define HEVCProfileMain10HDR10
 2016-03-01 16:38:01 +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
8f6c0d2fe1 Merge "Fix argument type in MtpDatabase#getObjectPropertyValue." into nyc-dev 
am: 300efaa0ea

* commit '300efaa0eac384ddf9d29d0f6e5390a8a1974353':
  Fix argument type in MtpDatabase#getObjectPropertyValue.
 2016-03-01 08:41:27 +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
9d486e5bd8 Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev 
am: 6430b15495

* commit '6430b15495f1f7ab89c76b52f138ffba0553ed25':
  Add javadocs to MediaCodec.CryptoInfo methods
 2016-03-01 02:33:19 +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
29b16d8b08 Merge "media: switch to using MediaImage2" into nyc-dev 
am: 063a570ef0

* commit '063a570ef0a0b24e3344fcb56351a3e08c52da28':
  media: switch to using MediaImage2
 2016-03-01 00:53:10 +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
Phil Burk
2f4d3aa204 Merge "AudioService: add support for ENCODED_SURROUND_OUTPUT" into nyc-dev 
am: 4e572d32f8

* commit '4e572d32f870cec54100ea47f4828bfe483bb50e':
  AudioService: add support for ENCODED_SURROUND_OUTPUT
 2016-03-01 00:16:51 +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
Jeff Sharkey
620ef3f226 Merge "Parcelable classes should always be final." into nyc-dev 
am: 753c347efd

* commit '753c347efd0a03ee0187e9c98c9978e43104c257':
  Parcelable classes should always be final.
 2016-03-01 00:08:21 +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
Yujie Qin
4427b31183 Merge "Use new API from PIEX" into nyc-dev am: 42d8b7d7ab 
am: 26d072a2a9

* commit '26d072a2a9b4e328a8d07d5ad1dcca020bd52e41':
  Use new API from PIEX
 2016-02-29 08:26:41 +00:00
Yujie Qin
26d072a2a9 Merge "Use new API from PIEX" into nyc-dev 
am: 42d8b7d7ab

* commit '42d8b7d7abe4ecab049e020c3836dae97660dd4d':
  Use new API from PIEX
 2016-02-29 08:24:48 +00:00
Yujie Qin
42d8b7d7ab Merge "Use new API from PIEX" into nyc-dev 2016-02-29 08:21:52 +00: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
1518146ef1 Merge "MediaBrowser: Fix Javadoc" into nyc-dev 
am: 18eda4a1ca

* commit '18eda4a1caba579962c54c6a8ca8ba08e2430c40':
  MediaBrowser: Fix Javadoc
 2016-02-29 05:22:40 +00:00
Sungsoo Lim
ab19dc8e14 MediaBrowser: Fix Javadoc 
Bug: 27384292
Change-Id: I57ddfaea0fe888665bc7ee88cd933a660c26f1a6
 2016-02-29 14:03:48 +09:00
Eino-Ville Talvala
acda72fbe6 Merge "Media.effect: Remove redundant package info" into nyc-dev am: 0d0625993a 
am: 12d993893f

* commit '12d993893f5d629d99959bd488b949e880146a3f':
  Media.effect: Remove redundant package info
 2016-02-28 05:22:40 +00:00
Eino-Ville Talvala
12d993893f Merge "Media.effect: Remove redundant package info" into nyc-dev 
am: 0d0625993a

* commit '0d0625993ac4f0b8b5a629a4bcb1cb4dcc5eaaac':
  Media.effect: Remove redundant package info
 2016-02-28 05:17:31 +00:00