109456 Commits

Author SHA1 Message Date
Scott Main
a06cba19c9 am 8d9a4bd1: am 174dd066: Merge "remove link to renderscript support library" into jb-mr2-ub-dev
* commit '8d9a4bd1eb09cc795bf96c4f3a2824f9642c70e4':
  remove link to renderscript support library
2013-07-24 16:26:43 -07:00
Scott Main
109c9b57f6 am 5ad6ba51: am 0f9b6c59: Revert "docs: NDK r9 Release Notes"
* commit '5ad6ba511271265b0e8ab14cf4d4a54fcb9b4a61':
  Revert "docs: NDK r9 Release Notes"
2013-07-24 16:26:40 -07:00
Scott Main
fe93f90970 am 6224f2e7: am f2134151: api overview edits
* commit '6224f2e73017696d822715ddbdcd8858f87a8478':
  api overview edits
2013-07-24 16:26:34 -07:00
Scott Main
ee672b8e71 am ce7c5052: am 0cf24a5a: am 538ccd69: Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev
* commit 'ce7c50521c65c2b3611727f38d9fc6a14d780bd6':
  update usb driver doc with download link; delete revision notes
2013-07-24 16:26:31 -07:00
Joe Fernandez
6cdd45b4d8 am 91a211f1: am 8b93ba78: am cd76edb9: Merge "docs: OpenGL ES 3.0 dev guide update" into jb-mr2-dev
* commit '91a211f11fab2fb995b4c49dd09517c36db84231':
  docs: OpenGL ES 3.0 dev guide update
2013-07-24 16:26:28 -07:00
Scott Main
8fe8c3b4ae am 5aaf3859: am ef43b761: am 2edf372e: fix javadoc error
* commit '5aaf38590130f3b56bcbcc74d2fead1da111b29d':
  fix javadoc error
2013-07-24 16:26:24 -07:00
Scott Main
12bafdbd85 am c3427dc4: am a73fb627: am 3dee8aaf: Merge "update action bar guide for support lib ABC" into jb-mr2-dev
* commit 'c3427dc4da9d0a1471f0ca0f938d481a805e51db':
  update action bar guide for support lib ABC
2013-07-24 16:26:20 -07:00
Scott Main
8d9a4bd1eb am 174dd066: Merge "remove link to renderscript support library" into jb-mr2-ub-dev
* commit '174dd06650a1ffa12a305a3a982d890caf416387':
  remove link to renderscript support library
2013-07-24 16:20:10 -07:00
Scott Main
5ad6ba5112 am 0f9b6c59: Revert "docs: NDK r9 Release Notes"
* commit '0f9b6c598b90b948c01d2fecfe3a8206ed3c445d':
  Revert "docs: NDK r9 Release Notes"
2013-07-24 16:20:07 -07:00
Scott Main
6224f2e730 am f2134151: api overview edits
* commit 'f213415175ec83df7b39089d559eb9d02b72883a':
  api overview edits
2013-07-24 16:20:01 -07:00
Scott Main
ce7c50521c am 0cf24a5a: am 538ccd69: Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev
* commit '0cf24a5aa5f04ee48f643fd4cb707f3ed64b8e29':
  update usb driver doc with download link; delete revision notes
2013-07-24 16:19:57 -07:00
Joe Fernandez
91a211f11f am 8b93ba78: am cd76edb9: Merge "docs: OpenGL ES 3.0 dev guide update" into jb-mr2-dev
* commit '8b93ba786f0e50ab8cfbfb9a6f723913cc8e6eeb':
  docs: OpenGL ES 3.0 dev guide update
2013-07-24 16:19:49 -07:00
Scott Main
5aaf385901 am ef43b761: am 2edf372e: fix javadoc error
* commit 'ef43b7617c3b067d5d1f34ed41581f55c28c0659':
  fix javadoc error
2013-07-24 16:19:42 -07:00
Scott Main
c3427dc4da am a73fb627: am 3dee8aaf: Merge "update action bar guide for support lib ABC" into jb-mr2-dev
* commit 'a73fb627dc87128b7999fac4d8742881737290d6':
  update action bar guide for support lib ABC
2013-07-24 16:19:32 -07:00
Matthew Williams
f7e843e3a2 Merge "AnonymousSyncService & SyncRequest." 2013-07-24 22:41:22 +00:00
Jean-Michel Trivi
2e01220647 Merge "More info in audio focus stack entry" 2013-07-24 22:35:30 +00:00
Glenn Kasten
1bd84bd3d5 Merge "Rename mChannels to mChannelMask to avoid ambiguity" 2013-07-24 22:35:11 +00:00
Glenn Kasten
44097837df Merge "Match AudioRecord.getChannelConfiguration docs" 2013-07-24 22:30:20 +00:00
Matthew Williams
fa77418134 AnonymousSyncService & SyncRequest.
Changes to the way bundles are parcelled broke SM,
this update writes out the bundle as xml. This circumvents
the need for parcel, and makes it easier to debug whats
happening.
Change-Id: I6cd5d3a2eb80bfa5b3ae0c7f2d2ff91a65daaa34
2013-07-24 15:25:29 -07:00
Jean-Michel Trivi
caa2c5bba8 More info in audio focus stack entry
Add fields in an audio focus stack entry to track what type of audio
 focus was requested, and why it was lost.
Make audio focus dump easier to read.

Change-Id: I61f6e43c13a32328a07125a2ba0dce1053872c86
2013-07-24 14:52:57 -07:00
Jim Miller
fca3193bbe Merge "Fix layout incompatibility between hdpi vs xhdpi devices" 2013-07-24 21:14:09 +00:00
Chris Craik
6b8e13b714 Merge "Use IllegaleStateException to be consistent with rest of Bitmap class" 2013-07-24 21:01:57 +00:00
Zhijun He
3f9a609050 Merge "camera2: Implement CameraDevice#waitUntilIdle" 2013-07-24 20:56:31 +00:00
Jim Miller
c95e5c844a Fix layout incompatibility between hdpi vs xhdpi devices
The xhdpi was using the hdpi spec instead of the default since
it was the closest match.

This allows both devices to work correctly.

Fixes bug 9985496

Change-Id: I03ddf1b6645d5f82e2fba6c39a1c5b3a37e62d45
2013-07-24 13:27:51 -07:00
Christopher Tate
616dfe37f5 Merge "Don't let batch coalescing / rewindowing break batch ordering" 2013-07-24 19:47:59 +00:00
Glenn Kasten
33c437df39 Rename mChannels to mChannelMask to avoid ambiguity
This clarifies that it's a channel mask, as opposed to a count.

Also no need to initialize the field in the declaration,
as it's initialized in the constructor.

Include channel mask in error logs.

Change-Id: Ifc02668cf922dc8826a9fb042b3ca52fad377ba6
2013-07-24 12:20:52 -07:00
Romain Guy
fb6c743c6e Merge "Fix 9patches' limitation of 32 empty quads" 2013-07-24 18:54:11 +00:00
Romain Guy
6cad75744e Fix 9patches' limitation of 32 empty quads
The 9patch format allows to define more empty quads than this, remove
the use of a single int to index empty quads and replace it with a
lookup in the 9patch resource data structure.

Change-Id: I148ee5d9e0c96822b534a344e15c9d88078db7c2
2013-07-24 11:49:33 -07:00
Glenn Kasten
d5af238199 Match AudioRecord.getChannelConfiguration docs
Bug: 10001767
Change-Id: I28705ae84ee585afc37cdd2b13a039b7bfc36543
2013-07-24 11:43:32 -07:00
Alan Viverette
87c79a18fe Merge "Add secure settings for captions" 2013-07-24 18:16:16 +00:00
Colin Cross
e8b68c45f8 Merge "add static dependency on liblog" 2013-07-24 17:53:40 +00:00
Dianne Hackborn
530a7fd844 Merge "Fix another problem with procstats bucketing." 2013-07-24 17:52:58 +00:00
Ben Murdoch
b8fc83f3ac Merge "Update WebView.loadDataWithBaseURL documentation." 2013-07-24 09:24:05 +00:00
Kenny Root
e79b9280f0 Merge "Use hostname verifier directly instead of instance" 2013-07-24 06:51:29 +00:00
Kenny Root
ba23a6677e Exclude magic inner-class name from preload
Add a magic subclass name that will exclude inner classes that are meant
to prevent object instatiation but allow class preloading. This will
allow classes that have undesired side-effects to delay initialization
until the side-effects are no longer disruptive.

Bug: 9984058
Change-Id: I46b0784760d84a2a2da1f9f41d87ee7f70a3fc16
2013-07-23 22:37:37 -07:00
Scott Main
174dd06650 Merge "remove link to renderscript support library" into jb-mr2-ub-dev 2013-07-24 04:10:03 +00:00
Scott Main
d2d43b9647 remove link to renderscript support library
Change-Id: If8e693239b92058c0a2928e0811870bec3a150fe
2013-07-23 21:08:30 -07:00
Kenny Root
928ee1e48f Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

Bug: 9984058
Change-Id: I780249dbd3c7bb346e1b275dcb68e4e2be7ebbbb
2013-07-23 20:46:24 -07:00
Scott Main
0f9b6c598b Revert "docs: NDK r9 Release Notes"
This reverts commit bdbe56f6a8d74c0c88dd0fcd02fa2376e2a41e99.
2013-07-23 19:40:43 -07:00
Scott Main
f213415175 api overview edits
Change-Id: I3bd4941b3d77c7bbe2c678254e336c069070363e
2013-07-23 19:19:52 -07:00
Dianne Hackborn
85df4e0c1c Fix another problem with procstats bucketing.
We were now propagating the screen on state when updating
all process states, so they would get pushed into the screen
off bucket always even if the screen was on.  Oops!

Also improve the summary output when dumping a single package
to be more summary-like.

Change-Id: I16c640f9dc02d6db8c66aeb1c720f67beab60635
2013-07-23 19:15:27 -07:00
Christopher Tate
385e49805e Don't let batch coalescing / rewindowing break batch ordering
Bug 9965704

Change-Id: I41819bd1da16cc61c54938ed4ddd421f15b56fbb
2013-07-23 18:55:20 -07:00
David Christie
3de52c67e5 Merge "Add WorkSource capability to LocationManager" 2013-07-24 01:37:36 +00:00
Scott Main
0cf24a5aa5 am 538ccd69: Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev
* commit '538ccd69e29896ca7611e9fbf7c8734e1fa9f336':
  update usb driver doc with download link; delete revision notes
2013-07-23 18:19:09 -07:00
Scott Main
538ccd69e2 Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev 2013-07-24 01:17:00 +00:00
Svetoslav Ganov
4a1e24ce9d Merge "Updating the print dialog and its interactinos with the printing app." 2013-07-24 01:13:01 +00:00
Svetoslav Ganov
0d1daa50f6 Updating the print dialog and its interactinos with the printing app.
1. Added support for reporting the old print attributes during layout.
   Now we keep track of the old print attributes, so the app can
   compute the delta and decide whether re-layout work is needed.

2. Fixed PrintDocumentAdapter callback interleavings. Layout callbacks
   were intermixing with write ones - a mess. Now we make an attempt
   to cancel layout and write if they respond to cancellation, otherwise
   we wait but do not interleave them.

3. Refactored the PrintJobConfigActivity for easier maintenance and
   to have a single update UI method that does the minimal amount
   of work.

Change-Id: I31ada1a0550882e6185018e6f17f923aed165d15
2013-07-23 18:05:53 -07:00
Colin Cross
0d6e7315eb add static dependency on liblog
Change-Id: I8056aa744b37ef0c31229329a0de79c58c5955ea
2013-07-23 18:04:24 -07:00
Geremy Condra
46a7b0d1aa Merge "Fix default DNS not being set on network changes" 2013-07-24 00:32:34 +00:00
Dianne Hackborn
eb54cc7eed Merge "Fix bug that was causing us to lose total memory buckets." 2013-07-24 00:31:27 +00:00