• Home
  • History
  • Annotate
  • only in /frameworks/base/core/jni/
History log of /frameworks/base/core/jni/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
ac04f4e69a6de138c5afc668a2c89b7da7ff4e6a 23-Jun-2016 John Reck <jreck@google.com> Remove FD from the right Looper

Bug: 29586513

Also gives BackdropFrameRenderer a direct-destroy
of Choreographer since it's hammering on new Threads
and we don't want to wait for the GC to release
FDs.

Change-Id: Id2ec0af2ee4d5304961c4ab87a104ccb92f35fc2
ndroid_view_DisplayEventReceiver.cpp
716866d56542c267ccb686992de590ad04c84215 26-May-2016 Peng Xu <pengxu@google.com> Sensor: Make getId() more varied

Apps from different developers will now receive a different
ID for the same dynamic sensor. Additionally, all apps
will now receive a different/new ID for the same dynamic
sensor after a factory reset.

Bug: 28775590, 29547335
Change-Id: I15b48b974cbb1d53cc33dfdb7b9eb5f1b562190c
ndroid_hardware_SensorManager.cpp
4de5a3ac6655f76b67af38712ae5aeb6d7c15938 21-Jun-2016 Dianne Hackborn <hackbod@google.com> Reduce race when connecting to an existing content provider.

We lost the code that checks to see if the target process still
exists and aborts trying to use it if so. To reduce the race
there, we have a new explicit check of the state of the process.

Hopefully fixes some of issue #28737082.

Change-Id: I37a7a6e9767516d564168ef5e110c4adafe3fb76
ndroid_util_Process.cpp
34bf49e4de4c1994b5d9c19166606bc9b7ad1b9c 17-Jun-2016 John Reck <jreck@google.com> DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it

Bug: 29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
(cherry picked from commit aa6e84f21ddf89ea649a3f00044bc23adfe86978)
ndroid_view_RenderNode.cpp
a9408d4a4809dd229fb7fb8f9594cb6db4b1da64 03-Jun-2016 Robert Carr <racarr@google.com> PiP animation: Move window with resize when ending animation.

At the end of the animation (when going from larger to smaller),
we are left with a scaled surface, that we want to seamlessly
resize to an unscaled surface of the new size. Because we have scaled
the shadow region of the surface, the position of the content
will differ before and after the resize applies. We use new
SurfaceFlinger API to cause position updates to apply after
resize. Because we have to switch into SCALING_MODE_FREEZE,
we could end up prematurely cropping the window, so we
switch to using screen space crop for the pinned stack.

Bug: 28899837
Change-Id: I9b762a237413e4fa3d432e67d30c7125bfef484c
ndroid_view_SurfaceControl.cpp
028029730bf2d177f84316d2d444d409eba4b6cb 27-May-2016 Doris Liu <tianliu@google.com> Copy native tree's property when mutate vector drawable

When mutating vector drawables, we need to not only copy over
the VD tree structure, but also the properties of the VD tree,
such as alpha.

Bug: 28974071
Change-Id: I265e7e3cb92455b876cae248bcb9811230cb34f9
ndroid_graphics_drawable_VectorDrawable.cpp
39e8022a75507be06179c3de7358cebb1bb22e06 25-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Force pending transactions to flush before screenshot." into nyc-dev
e9953b1752a583058e639ef3de456988ab6ef7bf 24-May-2016 Robert Carr <racarr@google.com> Force pending transactions to flush before screenshot.

Following 14e54ba747 (ag/1043009) we need to push an empty
synchronous transaction if we want to ensure all previous
transactions have occured before taking a screenshot. In
light of Bug 7552304 it seems wise to do this before screenshoting
applications.

Bug: 27098060
Bug: 7552304
Change-Id: I6d7dfbe634a288c55449d2f1d6fbbfc13bab08ad
ndroid_view_SurfaceControl.cpp
219de73da2a986ddcbfbc593c4e4e01c858ce245 23-May-2016 Eric Laurent <elaurent@google.com> Fix AudioTrack and AudioRecord documentation

Improve documentation for error codes returned by
AudioTrack.write() and AudioRecord.read() methods.
Fix native to JAVA error code conversion in JNI.

Bug: 28906466

Change-Id: I4d48b1d428834b7a39a14e2d81b6c164696817a8
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
f9d9ce7705475874c82af04eb9b208a7fb556792 13-May-2016 Michael Wright <michaelwr@google.com> DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

This is a response to API council feedback.

Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
ndroid_view_PointerIcon.cpp
b35301e421bb08c28425c49ad46a277c96ccb411 14-May-2016 Svetoslav Ganov <svetoslavganov@google.com> Merge "Make settings cahches generation mechanism robust." into nyc-dev
04df738bcb6584dd82b731a67f4cf8d6925b061e 11-May-2016 Svetoslav Ganov <svetoslavganov@google.com> Make settings cahches generation mechanism robust.

Settings is using a MemoryIntArray to communicate the settings table
version enabling apps to have up-to-date local caches. However, ashmem
allows an arbitrary process with a handle to the fd (even in read only
mode) to unpin the memory which can then be garbage collected. Here we
make this mechanism fault tolerant against bad apps unpinning the ashmem
region. First, we no longer unpin the ashmem on the client side and if
the ashmem region is purged and cannot be pinned we recreate it and
hook up again with the local app caches. The change also adds a test
that clients can only read while owner can read/write.

bug:28764789

Change-Id: I1ef79b4b21e976124b268c9126a55d614157059b
ndroid_util_MemoryIntArray.cpp
0997908c95151ce24609c10731990e648156b95d 19-Apr-2016 Dimitry Ivanov <dimitry@google.com> Move Vulkan layer path setup to ApplicationLoaders

ThreadedRenderer was never the right place for this anyway, and
ApplicationLoaders can provide both the full library search path (not
just the extracted native library dir) as well as the application loader
namespace.

Bug: 28213888
Change-Id: Ibcc0a9178da4dba6f3f3105932fdac1a1d0261af
ndroid.mk
ndroidRuntime.cpp
ndroid_app_ApplicationLoaders.cpp
ndroid_view_ThreadedRenderer.cpp
bece5990c7ad14fff494204e68ca251f4c9c626b 09-May-2016 Greg Kaiser <gkaiser@google.com> ContextHub: Avoid reference leaks

We were leaking references in each call to onMessageReceipt(),
leading us to eventually run out of references and crash. We
now delete our local references prior to leaving the function.
Also, since especially our message size can be quite large,
we put in logic to gracefully fail if the system is out of
memory.

In addition, we fix up reference leaks within
constructJContextHubInfo(). These were one-time leaks at
initialization, so not the root cause of our crash, but still
unnecessary leaks which are easily fixed.

Bug: 28655628
Change-Id: I3a3dc8e069c6c1810f3152872d8d8410e8ad0683
ndroid_hardware_location_ContextHubService.cpp
9af20ffb59bd07c069995e94f66484d67b4726ab 05-May-2016 Rubin Xu <rubinxu@google.com> Remove obsolete file

Bug: 27531824
Change-Id: Id6706f0ba6a68723704e58a7fbd8b529e3ec7970
ndroid_auditing_SecurityLog.cpp
424784d60e475cd1ce1d8168491f07a23f213109 03-May-2016 Hal Canary <halcanary@google.com> stop leaking SkPDFDocument

bug: 28520971

Change-Id: I0fffde4bfa0aa8fe716e5ee2fc95a00b5c824e2f
ndroid/graphics/pdf/PdfDocument.cpp
6543533f29d869d5cbbc1c403e4e0ed219fcc300 03-May-2016 Doris Liu <tianliu@google.com> Merge "Count native allocation for VD against Java heap" into nyc-dev
f8d131cc8dc4ef675b8f8fc57dcc26062d575d32 30-Apr-2016 Doris Liu <tianliu@google.com> Count native allocation for VD against Java heap

There are two parts to VD's native allocation:
1) VD's internal data structure (i.e. groups, paths, etc that make
up of the VD tree). This structure can change, when a VD is used
to load a different drawable resource.
2) Two bitmap caches, not both of which will necessarily be allocated
The size of the bitmap cache depends on canvas matrix and drawable
bounds, and therefore can often change.

We need to count the native allocation from the above against Java heap.

Bug: 26269056
Change-Id: If833aedcf7f3efe00ea73a41ddccb1b48066ffd8
ndroid_graphics_drawable_VectorDrawable.cpp
b99d272e4367d137c5887740e9ed4bfe1badb347 02-May-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera: Update for video buffer binder changes" into nyc-dev
3cd7305f99c798a6a3735145b8cbcbb92bee7802 29-Apr-2016 destradaa <destradaa@google.com> Fix build break due to 32/64 bit compilation.

Change-Id: I9aba08a5fd512c52c9d0c9d4853c72a3e81a22cd
ndroid_hardware_location_ContextHubService.cpp
60f2c17e273ea919dc663f387ef246b3d359c412 29-Apr-2016 Daniel Estrada Alva <destradaa@google.com> Merge "Fixes on handling messages from apps to host." into nyc-dev
e259271df57eeff0365112cc68c8e3d415ae00d1 28-Apr-2016 Chien-Yu Chen <cychen@google.com> Camera: Update for video buffer binder changes

Bug: 28403412
Change-Id: Ic72edfcf7e02317bfb504e1ef686499671d53688
ndroid_hardware_Camera.cpp
6469c233fb9f7e617a5bc8b5d8348d7241d279c7 28-Apr-2016 destradaa <destradaa@google.com> Fixes on handling messages from apps to host.

- Ensure that app to host events are not filtered out
- Populates the app handle appropriately for clients to reference the
nano app sending the event

Bug: 28273520
Bug: 28272149

Change-Id: I7373fc84abcadc2ab17109484f2d04b02a474593
ndroid_hardware_location_ContextHubService.cpp
bf67e5dc63ab801832e83fd09ae525d937ccb451 28-Apr-2016 Martijn Coenen <maco@google.com> Merge "Don't count vm_map_ram as used memory in vmallocinfo." into nyc-dev
d5ec5f919dc835ca302d97c3cdc8f5b11f0584f0 27-Apr-2016 Peng Xu <pengxu@google.com> Fix docs build by adding include <endian.h>

Added endian.h into include list to avoid build error in "docs".
The function "htobe64" in endian.h is used.

Change-Id: Ic76dab25d34c56b58b97849dfa7b103963392568
ndroid_hardware_SensorManager.cpp
0c6e213dc70575d5a29c29bf7eb360b1c482b978 27-Apr-2016 Dimitry Ivanov <dimitry@google.com> Merge changes I12c9448e,I928175a3 into nyc-dev

* changes:
Create linker namespace for the system server classloader
Extract pathclassloader initialization to a separate class
7b0a3be0012edae0d17e0a92c66b30c9025f5886 27-Apr-2016 Peng Xu <pengxu@google.com> Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev
9594487548d42ea13569bd15369382f7283c8d33 27-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Syncronize pdfium initialization between users." into nyc-dev
b1ef62bb3834af6bdf8017e56b2cc614a566229e 20-Apr-2016 Dimitry Ivanov <dimitry@google.com> Extract pathclassloader initialization to a separate class

To be able to reuse this code when creating a classloader for
the system_server.

Bug: http://b/27245894
Bug: http://b/27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
(cherry picked from commit 5d7d777fa6f47ade2097e77d3d9ddb52c26d77d6)
ndroid.mk
ndroidRuntime.cpp
ndroid_app_ApplicationLoaders.cpp
om_android_internal_os_PathClassLoaderFactory.cpp
be2e7121872afe2f561f20c4660da854c31e1b66 27-Apr-2016 Philip P. Moltmann <moltmann@google.com> Syncronize pdfium initialization between users.

Only initalize pdfium once per process and only destroy it once all
users are gone.

Bug: 28387883, 28370309, 28388184
Change-Id: I41e8f6da247a7cfab5fb9d159c047293719192c3
ndroid/graphics/pdf/PdfEditor.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
eb613a61d3e708932993551eb22a0e6fd5007d08 27-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Read -Xjittransitionweight from system properties." into nyc-dev
39bb2c29b427b0cf2396a8691176584094ae805c 27-Apr-2016 Hangyu Kuang <hkuang@google.com> Merge changes from topic 'atv-hdr' into nyc-dev

* changes:
Unhide getHdrCapabilities and HdrCapabilities.
Plumb HDR capabilities to Display
Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
7f209d37f17d4df09475137c38b84a3338c84023 27-Apr-2016 John Reck <jreck@google.com> Merge "API tweaks to PixelCopy and make it public" into nyc-dev
8d74de55464c885b602b34252ee8721a9e810dcf 27-Apr-2016 Calin Juravle <calin@google.com> Read -Xjittransitionweight from system properties.

Bug: 27865109
Change-Id: I4a752a68693ac7d764d006f1282398c2e95ef1d0
ndroidRuntime.cpp
6b8a522f16213a70f35a7bbb6db5c5ce8bdc1af7 27-Apr-2016 Martijn Coenen <maco@google.com> Don't count vm_map_ram as used memory in vmallocinfo.

Bug: 28378463
Change-Id: I1f22464dbd31bc9ee7f2307ce7eec4a0e2bbad06
ndroid_os_Debug.cpp
9ff94c0251722c44eece7c3561b4ed36b286d4a8 31-Mar-2016 Michael Wright <michaelwr@google.com> Plumb HDR capabilities to Display

Bug: 25684127
Change-Id: I0a4fcdc59aa1a7b295c8df03699466685300e735
ndroid_view_SurfaceControl.cpp
e94cbc76d560a157c0a0d47181b4ed2a0aadbeb1 25-Apr-2016 John Reck <jreck@google.com> API tweaks to PixelCopy and make it public

Bug: 27708453
Change-Id: I81667ce42f9ca1c1a13e1e61299927900845fc84
ndroid_view_ThreadedRenderer.cpp
54ac21918481fe6f7aac1c0effde51f9e9860ae3 25-Apr-2016 Hangyu Kuang <hkuang@google.com> Revert "Revert "Hook up HDR capabilities from native SurfaceControl""

This reverts commit 2c38f45f27079492697a391e0a6221f77f485fbc.


Bug:25684127
ndroid_view_SurfaceControl.cpp
987609f5a7bd8e18559334aa0260e6614520af13 26-Apr-2016 Chris Craik <ccraik@google.com> Merge "Improve SurfaceView postion snapping" into nyc-dev
53a441ca8eda5a3e6209a952b1bbd32a39e19a1c 20-Apr-2016 Svet Ganov <svetoslavganov@google.com> Ensure local settings caches are not stale

We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
ndroid.mk
ndroidRuntime.cpp
ndroid_util_MemoryIntArray.cpp
b85b1fed45eef4c4a095c7697156054cd2acf4e1 21-Apr-2016 Peng Xu <pengxu@google.com> Intialize Java Sensor object uuid in JNI

This fixed an "invoke method on null object" error, because of
Sensor.mUuid field is uninitialized.

Bug: 28305085
Change-Id: Ic0139986b3d623c198068585a411814ab4f5f83a
ndroid_hardware_SensorManager.cpp
0e974e74252c9419094c7aadb5ec1f537f0902fd 23-Apr-2016 Chris Craik <ccraik@google.com> Improve SurfaceView postion snapping

bug:27098060

Snap SurfaceView positions to safely align to pixel boundaries.

Also expands MovingSurfaceViewActivity to support a scaling option, and
show problems more clearly.

Change-Id: Ic8e9c1e2f80c2c653bf4428e373f14528ddbce81
ndroid_view_RenderNode.cpp
150553756f89a51cc70b24cd9dbab4bdfba0fc59 21-Apr-2016 Tim Murray <timmurray@google.com> Merge "Increase the max binder thread pool size for system_server." into nyc-dev
4e9a9dfb67ebc48028b1613a03144101d94f7d92 20-Apr-2016 Rob Carr <racarr@google.com> Merge "Force windows to be scalable during pinned animation." into nyc-dev
eef4a3d53cadaab782944923577d6aca7b7ba5c8 19-Apr-2016 Tim Murray <timmurray@google.com> Increase the max binder thread pool size for system_server.

bug 28201939

Change-Id: Iaade417a26247970b96f0aaacb3844d72de6399c
ndroid_util_Binder.cpp
1ca6a33f36357281b3445e85d9e67cacd1a12ede 12-Apr-2016 Robert Carr <racarr@google.com> Force windows to be scalable during pinned animation.

We resize windows at the beginning of the pinned stack
animation when animating to a larger size, and so for some
duration a resize will be pending. We need to force the window
out of SCALING_MODE_FREEZE so we can animate during this period.

Bug: 27891386
Change-Id: I5cff599ed67f2c179e938662b6f0d99bd790aaba
ndroid_view_SurfaceControl.cpp
0b724f8770dffcda935d6ec5ea50fb93fb7b8891 19-Apr-2016 Eric Laurent <elaurent@google.com> Merge "AudioSystem: allow platforms no audio ports" into nyc-dev
8cddce3f8f503b2aa8b993fef6406645c3e80da6 19-Apr-2016 John Reck <jreck@google.com> Merge "Make getFrameNumber lazy" into nyc-dev
28912a508493e583c48772e2a234e0ed66849490 18-Apr-2016 John Reck <jreck@google.com> Make getFrameNumber lazy

Change-Id: I783de544ad9a3636ea90f1c8c4034738997bfbc8
Fixes: 28246085
ndroid_view_RenderNode.cpp
4afbed15f3b4f88c0190bbb89deba7a6ceae2da7 18-Apr-2016 John Reck <jreck@google.com> Fix NPE checkjni

Fixes: 28240259

releasedCallback can be null, which we need to check for

Change-Id: Ib218e1c624be8734db5722fc625ebbd72fa099ec
ndroid_view_DisplayListCanvas.cpp
85cfc8c368523359be8c12b8551e122b94972ab7 15-Apr-2016 John Reck <jreck@google.com> Merge "Add a callback for when a gl functor is released" into nyc-dev
cd1c3eba69d044b551cededad75474038f919890 14-Apr-2016 John Reck <jreck@google.com> Add a callback for when a gl functor is released

Bug: 27709981

Change-Id: Id5be3e8f88d6d84a9c59c7ed23e7e8862feefbe8
ndroid_view_DisplayListCanvas.cpp
032a35954c6ceb9ab76c728c7638408e0fc07972 15-Apr-2016 Raph Levien <raph@google.com> Don't do layout in hasGlyph for codepoint + vs

In the case where the input is a base codepoint + a variation selector,
the code currently checks hasVariationSelector and then does a layout,
checking for a single glyph. However, HarfBuzz in some cases will change
the VS into a space glyph, so hasGlyph will return false.

This patch makes hasGlyph rely entirely on the hasVariationSelector
method in the case of a base codepoint + a VS

Bug: 27531970
Bug: 28182689
Change-Id: Id190c427149213509f2d779ec1aa330feb4b62d8
ndroid/graphics/Paint.cpp
b36d104b8ffba24417c1b15b763bc8972c6e0d3d 15-Apr-2016 Eric Laurent <elaurent@google.com> AudioSystem: allow platforms no audio ports

Allow platforms with no audio outputs or inputs. This
means that listAudioPorts() and listAudioPatches() methods can
return no ports or patches.

Bug: 25075342
Change-Id: I891c3ee2cdb2b96c0ac37d4e9cc00e77ae58a5b4
ndroid_media_AudioSystem.cpp
de16f96c7e66b7a643ecc7b6c1a8fb70737f5250 15-Apr-2016 Winson Chung <winsonc@google.com> Merge "Take app screenshots in 565." into nyc-dev
a5fdde9d15fbdf1aaeb61e1cf0c128af3aeb7b67 15-Apr-2016 Winson <winsonc@google.com> Take app screenshots in 565.

- Or to be specific, SurfaceFlinger can’t easily take 565 screenshots,
so convert them when creating the ashmem bitmap.

Bug: 28151300
Change-Id: Ic7586659a41cc19c322136f77a1c52ef68c22707
ndroid/graphics/Bitmap.cpp
d6a25c2b3e7fd5a98741e2f770cf54d539b29258 14-Apr-2016 John Reck <jreck@google.com> Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev
8afcc76920499d0a384dba1470c5a377f80ed768 13-Apr-2016 John Reck <jreck@google.com> Revert "Revert "Make stopped state a first-class thing""

This reverts commit eab3f2658aa41d37c3b05d49a2ce4e3f4ed85399.

Fixes first-frame issue, mReportNextDraw needs to override
mStopped

Fixes: 28118961
Fixes: 27286867

Change-Id: I5c811759637d08ba9f3b342016d1b3006986d5a2
ndroid_view_ThreadedRenderer.cpp
53553d3bcdacc9a02d65c069c311f9fc915d36bf 14-Apr-2016 Calin Juravle <calin@google.com> Merge "Handle dalvik.vm.jitprithreadweight property" into nyc-dev
08a26ee1d605d28873f4b1c9af785cda878ee9f2 13-Apr-2016 Craig Donner <cdonner@google.com> Merge "Minor changes needed to support EXT_protected_content." into nyc-dev
aa9ecac10b90af84ab8cb9fb40f42df3460a4eb3 12-Apr-2016 Calin Juravle <calin@google.com> Handle dalvik.vm.jitprithreadweight property

Bug: 28065407
Bug: 27865109
Change-Id: I8cebc22a9e072fd1d6d765427a0cd59ba2201bf6

(cherry picked from commit 0de80b9f550fc8ff1f46d5f95cf229745d71eb2a)
ndroidRuntime.cpp
afe9a4c67c2e2988c76232796f017a992a6f2a28 13-Apr-2016 Craig Donner <cdonner@google.com> Minor changes needed to support EXT_protected_content.

Bug: 22775237
Change-Id: I40affa4f2cb245b8acd0106a2ee21a06cb9f9162
ndroid/graphics/SurfaceTexture.cpp
b35da390601e3c24e777d72daacd8dbeb4d1d9c4 12-Apr-2016 Doris Liu <tianliu@google.com> Allow leading spaces in path string (to keep behavior consistent)

Bug: 28132454
Change-Id: Iee799c13a85738db3d6940aca0fe917f284fa651
ndroid_graphics_drawable_VectorDrawable.cpp
ndroid_util_PathParser.cpp
1ee2dd2f5fb10cd0e6a4d3d368c1e24d3ec417a2 12-Apr-2016 Doris Liu <tianliu@google.com> Merge "Check whether VD tree is still valid before calling native setter" into nyc-dev
250c617d13216a210f3ebca25c6f765c29334a8d 12-Apr-2016 Ashutosh Joshi <ashutoshj@google.com> Merge "Remove LOAD_OS_APP message from standard context hub messages" into nyc-dev
cdedc9a80d971c8152b6f2674c040c79cff3b8dd 12-Apr-2016 Doris Liu <tianliu@google.com> Check whether VD tree is still valid before calling native setter

VD tree is ref-counted in both Java and native. VD's child nodes are
entirely owned by the native tree, as VD nodes in native should outlive
its Java counterparts, with one exception: when there's an infinite UI
animator running on VD, the animator may have weak reference to a few
child nodes. In the case of hidden animator running infinitely, the child
nodes would keep getting the animation pulse while the rest of the tree
would have been destroyed. To prevent the setters triggered by animation
from calling into native, we need to check whether the tree is still
valid before going down into JNI.

Bug: 28104172
Change-Id: Ie9d4bf3898c0c23e620a4747624d24b8ab779743
ndroid_graphics_drawable_VectorDrawable.cpp
d2eec0efb2e47b23b2a12ab2967e422f0be49094 12-Apr-2016 John Reck <jreck@google.com> Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev
10dd0585c11dcedb5a271d54e645594f1d215d5c 01-Apr-2016 John Reck <jreck@google.com> Framework-side of SurfaceView#getBitmap

Bug: 27708453

Change-Id: Ie6fd7eca522d3e6549d8af587c975fd7e6053649
ndroid_view_ThreadedRenderer.cpp
85202e0a6e0cf381f1a47ca9e91273da7dbf6687 11-Apr-2016 Ashutosh Joshi <ashutoshj@google.com> Remove LOAD_OS_APP message from standard context hub messages

Removing LOAD_OS_APP from the list of standard Android messages.

Change-Id: I1db1933e2c090716a1921f14e04e1f5d133ea9cd
ndroid_hardware_location_ContextHubService.cpp
825fa4d5ae7b2907ee1769d09e6333306de2a92e 11-Apr-2016 John Reck <jreck@google.com> Merge "Revert "Make stopped state a first-class thing"" into nyc-dev
eab3f2658aa41d37c3b05d49a2ce4e3f4ed85399 11-Apr-2016 John Reck <jreck@google.com> Revert "Make stopped state a first-class thing"

This reverts commit 945961f78a78eced823d5ba78505c781b079703d.

Change-Id: Iebc1d49fac33380233f8785fc39bec6c30a5e714
ndroid_view_ThreadedRenderer.cpp
34994b74bbe1a05fc4730fb1d5054f3255da0c54 11-Apr-2016 Alexey Polyudov <apolyudov@google.com> Merge "contexthub: nanohub HAL redefined hub_app_name_t; keep in sync" into nyc-dev
ab2d44596b749f3095a262ca3dc3188238dd19d1 08-Apr-2016 Alexey Polyudov <apolyudov@google.com> contexthub: nanohub HAL redefined hub_app_name_t; keep in sync

we're now using hub_app_name_t as unique nanoapp ID throughout
all layers

Bug: 28086503
Change-Id: Ie8113de1b2bafd441d79e45137f44d74970fcd01
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
ndroid_hardware_location_ContextHubService.cpp
0e89f9804420a9b667eeaadff7916c227e6608cf 08-Apr-2016 Doris Liu <tianliu@google.com> Merge "Improve error logging for parsing failures" into nyc-dev
0a1a5167be26d363d4e27bdc7b816f425b7b4e66 08-Apr-2016 Doris Liu <tianliu@google.com> Improve error logging for parsing failures

Bug: 27043594
Change-Id: I901b65f734c49444a78e0714e007e15e2340ab9d
ndroid_graphics_drawable_VectorDrawable.cpp
ndroid_util_PathParser.cpp
c147dbbca4ea1870bcf88c5889e6a83865ceed54 08-Apr-2016 Raph Levien <raph@google.com> Merge "Avoid copying of font table data, provide raw font bytes" into nyc-dev
296bf8c55aaba0025f3e5b904fda3b6e15686753 07-Apr-2016 Raph Levien <raph@google.com> Avoid copying of font table data, provide raw font bytes

Minikin is changing its approach to table access to use HarfBuzz to
access the tables, based on raw font data, rather than calling the
MinikinFont::GetTable() virtual method. This patch provides raw access
to the font data to make this work.

There's a bit of plumbing to make sure fonts get a pointer to the raw
data as well.

Bug: 27860101
Change-Id: I638e18cf363644bf22fbc9fb9b3358a9e731087f
ndroid/graphics/FontFamily.cpp
c724dcf23c5e2ebd22c042a8a6f2424b7e9d5029 08-Apr-2016 John Reck <jreck@google.com> Merge "Make stopped state a first-class thing" into nyc-dev
4a62effbfe8ad9a0eb7049c2f52a57d39bb64e29 08-Apr-2016 John Reck <jreck@google.com> Merge "Fix some edge cases" into nyc-dev
945961f78a78eced823d5ba78505c781b079703d 08-Apr-2016 John Reck <jreck@google.com> Make stopped state a first-class thing

Bug: 27286867

WindowManager has committed to stopped state
controlling the lifecycle of the Surface, so
make that a first-class thing in HWUI as well.

This makes it more resistent to things like
a rogue updateSurface() happening while mStopped=true,
leading to bad things down the line. Instead let
the surface be changed/updated as often as desired,
and just block any attempt to draw on that surface.

Also removes some unnecessary makeCurrent()s, as
EglManager ensures that we *always* have a valid
GL context now (using a pbuffer surface if there is
no window surface set)

Change-Id: Iead78ddebc7997e8fdb0c9534836352f5e54b9bd
ndroid_view_ThreadedRenderer.cpp
51f2d606dcbfba3cc5b03dfea37c1304b91c232f 06-Apr-2016 John Reck <jreck@google.com> Fix some edge cases

Bug: 27709981

This desperately needs a refactor, but to keep
the current (really needed & nice) behavior of
dispatching after sync finishes would be difficult
to handle cleanly without lots of ripping so... #yolo

Change-Id: I831a06c6ae7412a062720d68ecbe3085190f0258
ndroid_view_RenderNode.cpp
ndroid_view_Surface.cpp
ndroid_view_ThreadedRenderer.cpp
7d4a7fa333c4d73ed36d3729b43a5f3ae82cdc93 07-Apr-2016 Ashutosh Joshi <ashutoshj@google.com> Merge "Add dumpsys capabilities for context hub service" into nyc-dev
8c83a85e26844a24c2f4975e248021a4d4a32f9d 07-Apr-2016 Seigo Nonaka <nona@google.com> Merge "Paint.hasGlyph should return false on unsupported flags." into nyc-dev
6239cc6fe1d18ce4365c56346a09c7963dfa8f10 05-Apr-2016 Ashutosh Joshi <ashutoshj@google.com> Add dumpsys capabilities for context hub service

Add useful debug hook for context hub service.
Fix constants
Use helper functions to address OS

Change-Id: Iba5f24a9a1fd809c3d83752953389d373ff334ca
ndroid_hardware_location_ContextHubService.cpp
59ee472c95373c15bb32e72d68433397efdf9da8 06-Apr-2016 Craig Donner <cdonner@google.com> Downgrades error messages about not being able to detect whether we are in protected mode or not to informational messages. If there is no GL context, then we are by definition not in protected mode, and still return false as advertised, thus there's no need for an error message.

Bug: 27926028

Change-Id: Ia791a989b92be17bc31f9221654168347d60eed9
ndroid/graphics/SurfaceTexture.cpp
589cddc034f87fcd02adb24e168ef6b2ed851b82 05-Apr-2016 Seigo Nonaka <nona@google.com> Paint.hasGlyph should return false on unsupported flags.

By Noto font update, now it has a special glyph for unsupported flags.
Paint.hasGlyph should return false in this case even if it has a glyph.

Bug: 27999343
Change-Id: Icbd31db83d945d66de1477aa888275f6c0ef79b0
ndroid/graphics/Paint.cpp
b4cc448946b2edb5802f60a3b1f97efbc8dd7ea0 05-Apr-2016 Ashutosh Joshi <ashutoshj@google.com> Merge "App upload to Context hub." into nyc-dev
cafdee9a72652354c5bde0b13c86dac3d88ac2ae 05-Apr-2016 Ashutosh Joshi <ashutoshj@google.com> App upload to Context hub.

Fix constants
Use helper functions to address OS

Change-Id: I61bd1f3eff2716ead2771eda335998f2e9b73afc
ndroid_hardware_location_ContextHubService.cpp
d9289085be9487ac568b08048047c078b1302eb3 04-Apr-2016 Doris Liu <tianliu@google.com> Merge "Make AVD thread safe" into nyc-dev
1d8e194661085f9a18ab1b3cd12f9e19d3a86be5 03-Mar-2016 Doris Liu <tianliu@google.com> Make AVD thread safe

This CL introduces staging properties to VectorDrawable, which holds
properties coming from UI thread. When staging properties are changed,
they are marked dirty, and the staging properties then get pushed to
RenderThread at sync point. In cases where no staging property has
been changed, at sync point we sync the render thread properties back
to staging properties to reflect the latest render thread animation
value change.

Also, update Vector Drawable bitmap only when it's dirty

Bug: 27343970
Bug: 27385912
Bug: 27263667
Bug: 27927674
Bug: 27774383

Change-Id: Ia864f5400a53a08dbfb284fae581fb1aac4fff87
ndroid_graphics_drawable_VectorDrawable.cpp
c6418c04abe23f86b3214c3bb935a5988b1bb64a 04-Apr-2016 Derek Sollenberger <djsollen@google.com> Merge "Cleanup addtional files that were missed in the first purge of AvoidXfermode" into nyc-dev
93ab281e1c68e228c845dbac4c13b8a567efbbb7 04-Apr-2016 Derek Sollenberger <djsollen@google.com> Cleanup addtional files that were missed in the first purge of AvoidXfermode

bug: 14650725
Change-Id: Ib7fb6a31705fb60535ecf2017db321c15e3d06cc
ndroid.mk
ndroid/graphics/AvoidXfermode.cpp
ndroid/graphics/AvoidXfermode.h
b741e3b374e7eebf96e2104dec5caccf723b2a39 29-Mar-2016 Ashutosh Joshi <ashutoshj@google.com> Added handling apps query response from context hub

Added handling of app query reponse from context hub.
Exposed the maximum message size to clients.

Change-Id: Ie96a860774d005ad6ad72acc88dc79964835486b
ndroid_hardware_location_ContextHubService.cpp
2c697fb4a8b8f8c0a2acf1fb15027f363f74c2dc 01-Apr-2016 Ashutosh Joshi <ashutoshj@google.com> Revert "Added handling apps query response from context hub"

This reverts commit adf75e31f52a7a935a66a884fb55631c7309ee75.

Change-Id: I8391eb57c3a53e686bd817d27860fa6f785113f1
ndroid_hardware_location_ContextHubService.cpp
c75f7c20e86a8c5dd8523aee3ad390b91f3d2418 01-Apr-2016 Ashutosh Joshi <ashutoshj@google.com> Revert "Ensuring builds compile for both 32 bit and 64 bit targets."

This reverts commit 85e093bc03d747f69b3ada658c9e82f442cda334.

Change-Id: I9346929e6016e36beb3b6949ccec9fce73da91c4
ndroid_hardware_location_ContextHubService.cpp
85e093bc03d747f69b3ada658c9e82f442cda334 01-Apr-2016 Ashutosh Joshi <ashutoshj@google.com> Ensuring builds compile for both 32 bit and 64 bit targets.

Fixing print formats for pointers.
Fixing a dangerous memory free.

Change-Id: I7c53bdaeceed80845ef002ed6a8a783ecb0378dc
ndroid_hardware_location_ContextHubService.cpp
adf75e31f52a7a935a66a884fb55631c7309ee75 29-Mar-2016 Ashutosh Joshi <ashutoshj@google.com> Added handling apps query response from context hub

Added handling of app query reponse from context hub.
Exposed the maximum message size to clients.

Change-Id: I8d8ecaa2e75f6ef86ee65a3a050538cbbadc32eb
ndroid_hardware_location_ContextHubService.cpp
2aaf681dc04bb5bcfe7b3056dd42dea1f3ef0bdf 01-Apr-2016 John Reck <jreck@google.com> Merge "Remove warning" into nyc-dev
aea43f8414c79492beccc55a274700b644bf747a 01-Apr-2016 Keisuke Kuroyanagi <ksk@google.com> Merge "Fix: doRunAdvance returns wrong value when offset == count." into nyc-dev
562cfef1d5f179d1ca6b1672825f3533874d4650 31-Mar-2016 John Reck <jreck@google.com> Remove warning

Fixes: 25760687

The recommendation floating around is to ignore this even
though it's unquestionably an app bug so just remove it.

Change-Id: I7075de5d2864874d786a0aab0c945be96de172e3
ndroid/graphics/Bitmap.cpp
44b49f070aafe8ad44efae87341121cce49ff11c 25-Mar-2016 John Reck <jreck@google.com> Add a callback for rendernode parentcount=0

Bug: 27709981
Fixes: 22565656

Change-Id: I1cb4461baf9069dc4e7ca6de10d5862578c107f4
ndroid_view_RenderNode.cpp
ndroid_view_ThreadedRenderer.cpp
50c52c0b34566c4501801062175124f663f118ac 30-Mar-2016 Peng Xu <pengxu@google.com> Merge "Several code quality improvements" into nyc-dev
4a4baef431195f3f0a7ce3ea8b8bc316ed68228c 17-Mar-2016 Peng Xu <pengxu@google.com> Several code quality improvements

* Added GuardedBy annotation.
* Fix a misleading variable name.
* Use anonymous namespace to reduce namespace pollution.

Change-Id: Ieffbb8dfd6abbb24b705445659fb96f7ce861592
ndroid_hardware_SensorManager.cpp
8c349f5d3b764d4ab726070dba397a2a292a6858 28-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Add bandaid for preview orientation on reverse-landscape cameras" into nyc-dev
b3677715e64277fb59045684a7722ef8a8ab2541 28-Mar-2016 Keisuke Kuroyanagi <ksk@google.com> Fix: doRunAdvance returns wrong value when offset == count.

Bug: 27869952
Change-Id: I56278676da4c354ced4244e4b073bb0d82edf93b
ndroid/graphics/Paint.cpp
cd7c97bcf720abca3c364a27427d54ffcfa502f4 26-Mar-2016 Philip P. Moltmann <moltmann@google.com> Merge "PDFium interface changed, hence adjust the adapter jni code." into nyc-dev
6c91e2c31b514bcfd838c75b4c74412e7288415d 25-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Camera: Add bandaid for preview orientation on reverse-landscape cameras

Camera sensors on Android may be either landscape or reverse-landscape
oriented, but the vast majority of shipping devices only use landscape.

This means that many camera-using apps (which are generally forcing
themselves to landscape orientation) never call setDisplayOrientation,
since its default value of 0 is correct for the majority of devices.

However, there are some reverse-landscape devices, and for those, such
apps get upside-down preview.

This bandaid changes the default value of displayOrientation to be 180
on such devices, so that apps that never call setDisplayOrientation get
correct preview. This bandaid has no effect on apps that do call
setDisplayOrientation, so hopefully such apps are doing the math
correctly.

Also update documentation to indicate that setDisplayOrientation should
be called, and to note the change in default orientation behavior in
Android N.

Change-Id: I1b2c957642fda8edead61bd07eda9d18c38d1fe6
Fixes: 27840948
ndroid_hardware_Camera.cpp
a9471b1bd6806114e38c58b6286a0b70aa8b85a3 25-Mar-2016 Derek Sollenberger <djsollen@google.com> Update pixelRef genID when reusing pixels in RecyclingClippingPixelAllocator.

When this code was refactored to support the new RegionDecoder it appears that
we dropped a call to bump the genID. Adding it back is functionally correct
and should fix the recycling issue.

bug: 26617759
Change-Id: I966d398ca983edb40040e01345799b3cc9957fe0
ndroid/graphics/Graphics.cpp
ab852f2972550d1ff6d6b9ec9ec85a9add16409c 24-Mar-2016 Sergei Vasilinetc <sergeyv@google.com> Merge "Add offset() to Path's fast-case mode" into nyc-dev
ecbcdd384c07402204064243981a432f5b0aad36 22-Mar-2016 sergeyv <sergeyv@google.com> Add offset() to Path's fast-case mode

bug:22510833
Change-Id: I417ed13ff450aa7f6c72370b4c5de8e8a53a0235
ndroid/graphics/Path.cpp
6266d8c959806a359571b0833702fbe46e9748f9 23-Mar-2016 Pablo Ceballos <pceballos@google.com> Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev
e6109ddd3ee52f22c95e5284c325602fbdd5159f 22-Mar-2016 Lorenzo Colitti <lorenzo@google.com> Merge "Remove framework code that calls SIOCKILLADDR" into nyc-dev
ed7bf2e04e14da2f7537ccadfb2dba9e60f84318 21-Mar-2016 Lorenzo Colitti <lorenzo@google.com> Remove framework code that calls SIOCKILLADDR

Bug: 26976388
Change-Id: I652361d9e650a77085070d6c26b28b7638ba2dfe
ndroid_net_NetUtils.cpp
bad99183916ba2bac6659efc8a28273e344ba511 17-Mar-2016 sergeyv <sergeyv@google.com> Clean up and rename TypefaceImpl

bug:25865834
Change-Id: I77e8a627163e040a5c25865054a8a936052af367
ndroid/graphics/FontFamily.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Paint.cpp
ndroid/graphics/Typeface.cpp
ndroid_graphics_Canvas.cpp
ndroid_text_StaticLayout.cpp
dccca44ffda4836b56a21da95a046c9708ffd49c 21-Mar-2016 sergeyv <sergeyv@google.com> Reland: Move text logic from jni to hwui level

Initial CL: https://googleplex-android-review.git.corp.google.com/#/c/886854/

Change-Id: I9dfd85fe1d2a2c44f4360c8a29fd58d80e6f31c8
ndroid.mk
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/CanvasProperty.cpp
ndroid/graphics/FontFamily.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinSkia.h
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/TypefaceImpl.h
ndroid/graphics/pdf/PdfDocument.cpp
ndroid_graphics_Canvas.cpp
ndroid_graphics_drawable_VectorDrawable.cpp
ndroid_text_StaticLayout.cpp
ndroid_view_DisplayListCanvas.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_RenderNode.cpp
6847953955502caa0bd0ba255d879a89aeccbd24 21-Mar-2016 Sergei Vasilinetc <sergeyv@google.com> Merge "Revert "Move text logic from jni to hwui level"" into nyc-dev
afbd0f1fef46ef0ddf633dfde0de724db3da1405 21-Mar-2016 Sergei Vasilinetc <sergeyv@google.com> Revert "Move text logic from jni to hwui level"

This reverts commit a7f6bba1a3565c19715e878dfe7f0e01022944ff.

Change-Id: If4f36f87a85411b6128fd92d391313803ccaf9dd
ndroid.mk
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/CanvasProperty.cpp
ndroid/graphics/FontFamily.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinSkia.h
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/TypefaceImpl.h
ndroid/graphics/pdf/PdfDocument.cpp
ndroid_graphics_Canvas.cpp
ndroid_graphics_drawable_VectorDrawable.cpp
ndroid_text_StaticLayout.cpp
ndroid_view_DisplayListCanvas.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_RenderNode.cpp
49658d43802dc74c0ad68b7f5ba509832c1dec81 21-Mar-2016 Sergei Vasilinetc <sergeyv@google.com> Merge "Move text logic from jni to hwui level" into nyc-dev
79bd8d48ad69c39834291809fe78ea478d067b68 07-Mar-2016 Philip P. Moltmann <moltmann@google.com> PDFium interface changed, hence adjust the adapter jni code.

Bug: 27564090
Change-Id: I983398a90438062ecc9c7ebc0ad325777fa8aaff
ndroid.mk
ndroid/graphics/pdf/PdfEditor.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
885b742bb66660947d8335e9a4f5a4eef2e45ff9 20-Jan-2016 doheon1.lee <doheon1.lee@lge.com> Changes of root storage space unmounting time on Zygote Process

Zygote process forks every child process for launch the SystemServer and other
applications. When child process is forked, unmount storage inherited
from Zygote process is executed before it gains its own root storage
space.
If Zygote have no storage spaces, unmount operations not needed to
get relevant permission storage space.
Thus unmount is executed only once shortly before the SystemServer is forked.
And the child processes do not unmount its inherited root storage space.

Change-Id: I311ca7ea2c93085f42579f8cf8bdc7ef1d570a04
om_android_internal_os_Zygote.cpp
969e8c365f7e17e5cf9ed11867a46afb9d8e97c1 17-Mar-2016 John Reck <jreck@google.com> Merge "Move updating window position off RT" into nyc-dev
38f6c034d153bb648d45bce09d80a69ba3e03360 17-Mar-2016 John Reck <jreck@google.com> Move updating window position off RT

Bug: 27385141
Change-Id: I6c75b5f1d9ef55ef64dde050f71d0e28fb8714bf
ndroid_view_RenderNode.cpp
a7f6bba1a3565c19715e878dfe7f0e01022944ff 16-Mar-2016 sergeyv <sergeyv@google.com> Move text logic from jni to hwui level

bug:25865834
Change-Id: I2d8c9c9544afcb5ce1784f732aed3e54e0eda372
ndroid.mk
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/CanvasProperty.cpp
ndroid/graphics/FontFamily.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinSkia.h
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/TypefaceImpl.h
ndroid/graphics/pdf/PdfDocument.cpp
ndroid_graphics_Canvas.cpp
ndroid_graphics_drawable_VectorDrawable.cpp
ndroid_text_StaticLayout.cpp
ndroid_view_DisplayListCanvas.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_RenderNode.cpp
58ae278294017abca0dffc95f006ae646c88db89 17-Mar-2016 Glenn Kasten <gkasten@google.com> Merge "Use audio_session_t consistently" into nyc-dev
990ea136b202a9956a5d35ac7895655ece34f5f6 17-Mar-2016 Yujie Qin <yujieqin@google.com> Return DNG mimeType for the case kRAW_SkEncodedFormat

Bug: 27587823
Change-Id: I0f539034a883083a30f33262edc715714f45e60d
ndroid/graphics/BitmapFactory.cpp
c7605b838bda61593e503924c6c86e3a33a6d64b 17-Mar-2016 Rubin Xu <rubinxu@google.com> Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev
61adad884b8d5fb8e2aa38b693bc2dce39bf92c8 16-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "Adjust graphics dataspace references to new standard" into nyc-dev
400349907ec5bb09887e5ba9f9cd1fa1f3d06716 16-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Dynamic audio policies: device type and address" into nyc-dev
71e806b2f464b0ac85367fe008b554b44e4c5812 16-Mar-2016 Tenghui Zhu <ztenghui@google.com> Merge "Add fillType support to VectorDrawable" into nyc-dev
4ad39885f2e6e79ae1faaa41ae240eeffcefd368 15-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Dynamic audio policies: device type and address

Store device type and address in audio mixes regardless of the
mix route type, no "registration" field.
For LOOP_BACK mixes, assign the REMOTE_SUBMIX device type.

Bug 25448664

Change-Id: I8d59b2fd3e05b1dcf1081ad826f985f5e3e74769
ndroid_media_AudioSystem.cpp
46591f4a2dbd785bcae2b82bb490e78208605ec8 15-Mar-2016 Teng-Hui Zhu <ztenghui@google.com> Add fillType support to VectorDrawable

Default as non-zero, which is the same as SVG.
b/27533958

Change-Id: Id20e6d3493bb4d2b4b65d7f6cdb13586631c40e4
ndroid_graphics_drawable_VectorDrawable.cpp
ac329d3e34e99e10243906d32cc4e36c626ac8ee 16-Mar-2016 Ashutosh Joshi <ashutoshj@google.com> Merge "Exposing Context Hub service." into nyc-dev
6235a94ffaed1d82cee2317481c18776f601da1b 15-Mar-2016 Michal Karpinski <mkarpinski@google.com> Unifying method names and comments to security logging, not device logging

Also move SecurityLog to android.app.admin package.

Bug: 27531824
Bug: 27532560
Bug: 27532564
Bug: 27532425
Change-Id: I2677afdb5685bc5d21e52c41b381b57a41e364b6
ndroid.mk
ndroidRuntime.cpp
ndroid_app_admin_SecurityLog.cpp
27982e65eebdd8c23619e29c4d85a8b208e30200 09-Mar-2016 Pablo Ceballos <pceballos@google.com> Java bindings for SurfaceControl::setFinalCrop

Bug 26559810

Change-Id: I74eefa91b2d38e55fb9e27e7dc2cd3536e610108
ndroid_view_SurfaceControl.cpp
7494eb2114f047f1d96a7520c95c72a8e4e2cb35 16-Mar-2016 Derek Sollenberger <djsollen@google.com> Merge "Remove all non-porterduff xfermodes from the public API" into nyc-dev
9ff7d2235427b211344fa58b608424805a21aa24 11-Feb-2016 Peng Xu <pengxu@google.com> Exposing Context Hub service.

Adding the Context hub service. This is the service that exposes
the context hub HAL to the system. The API exposed is a System API.

Change-Id: I854141714ecd21f6386e6b15b7bc9a997483ccf6
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_location_ContextHubService.cpp
7966d446cddf92f814792dca3cfb0dfbbc1bef3e 14-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Adjust graphics dataspace references to new standard

Bug: 27344373
Change-Id: I0ad67868894b01948d40336812d836ee2f3bcfdb
ndroid_view_Surface.cpp
66f4831aa105f981ba1d5c21e3dcf8f1e0d76de8 13-Mar-2016 Brian Carlstrom <bdc@google.com> frameworks/base: Make Thread::run threadName argument required

Bug: 27557176
Change-Id: Icff15e51fb7c99387ac8317181d12749f343439a
ndroidRuntime.cpp
51e7805f14062df674f613fdaa830030aaaa4f8e 11-Mar-2016 Derek Sollenberger <djsollen@google.com> Remove all non-porterduff xfermodes from the public API

bug: 14650725
Change-Id: I3c935c32849be8762281eb3d1c86481be3fa139f
ndroid/graphics/Xfermode.cpp
9dea71ccfff224fc213b00303cc77b9d0e82333f 10-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "DngCreator: Only write orientation into IFD0" into nyc-dev
33b840444f5a481dd31e129079d3c0cf3acdf80e 08-Mar-2016 Glenn Kasten <gkasten@google.com> Use audio_session_t consistently

Also prefer AudioManager.AUDIO_SESSION_ID_GENERATE over
AudioSystem.AUDIO_SESSION_ALLOCATE, because
AudioSystem.AUDIO_SESSION_ALLOCATE is @hide.

Bug: 27562099
Change-Id: I5924554feb919db7f2390f5b062faedd515421af
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
cb1b27b6f8e728f12a2e8a5c172aa249440d611f 10-Mar-2016 Anton Daubert <adaubert@google.com> Merge "Fine scale the decoded result to match the desired sampleSize." into nyc-dev
2612bbc0f5ae5422ba3e8e685ae375b2b8626fda 09-Mar-2016 Martijn Coenen <maco@google.com> Merge "API to query which cores are exclusively assigned." into nyc-dev
4e5ec34e98faa8338ca04282a160ef2b0d13bc9d 07-Mar-2016 Anton Daubert <adaubert@google.com> Fine scale the decoded result to match the desired sampleSize.

Bug: 27097032
Change-Id: Ie15a3116cdd6988524977e5390f6edbac224e502
ndroid/graphics/BitmapFactory.cpp
8c35d5be63ab1811679875f12b19b050ac163b18 09-Mar-2016 Eino-Ville Talvala <etalvala@google.com> DngCreator: Only write orientation into IFD0

The orientation field is not expected to be present in subIFDs.
With this, the new DNG validation CTS checks pass.

Bug: 23727371
Change-Id: I959fd84bc196adbbba1de2c4369e25f568411168
ndroid_hardware_camera2_DngCreator.cpp
cd4bdf3eb91c1cc2757d32a86fc90745d0dff990 03-Mar-2016 Martijn Coenen <maco@google.com> API to query which cores are exclusively assigned.

On devices with cpuset support, the foreground app
may have a core exclusively assigned to it. Add an
API that allows apps to query which core that is,
so it can use that to set scheduling affinity.

Bug: 27381794
Change-Id: Iea148776da6d7abb745ccf9e6ad5ad46491e340a
ndroid_util_Process.cpp
659f3a11e92d6a9f66da45819401c9d41c50f437 07-Mar-2016 Pablo Ceballos <pceballos@google.com> Merge "Implement glCreateShaderProgramv JNI" into nyc-dev
75e91294530aea50f8ee8255205429395d728ce5 07-Mar-2016 Philip P. Moltmann <moltmann@google.com> Merge "Do not move PDF content as the content is already moved." into nyc-dev
ca8772377e519736feb438d40fff4d8c1825ca06 07-Mar-2016 Paul Mclean <pmclean@google.com> Merge "Remove redundant stop() from native audiotrack release." into nyc-dev
78652ee24d6e6ea6c7f2b4c7f72b3c8097a27fe5 04-Mar-2016 Paul McLean <pmclean@google.com> Remove redundant stop() from native audiotrack release.

Support for ReleaseJavaProxy() semantics in Wilhelm IAndroidConfiguration.

Bug: 23899814
Change-Id: Iaa29b950c02b30d3a1a4621bd9c2fc62361e48d6
ndroid_media_AudioTrack.cpp
329484bb7e31e3b0574cd25186a9d6a840f39781 04-Mar-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera2 Legacy: Connect to surfaces it produces" into nyc-dev
8a35cbf45bce1d09ab0ef222331edf811f50985d 04-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "DngCreator: Improve BlackLevel, fix thumbnail metadata" into nyc-dev
7f16ec21711fdb97930166175c29d8235f75202e 29-Jan-2016 Pablo Ceballos <pceballos@google.com> Implement glCreateShaderProgramv JNI

Bug 26851015

Change-Id: Ibfa3bdee929a16389925ce2576715a87253718fe
ndroid_opengl_GLES31.cpp
8069b1f252d6a1e1c469dfc733bdd0db5d69574f 03-Mar-2016 Eino-Ville Talvala <etalvala@google.com> DngCreator: Improve BlackLevel, fix thumbnail metadata

- Use new dynamic black level result key when available
- Write rational black level instead of integral value
- Fix incorrect thumbnail BitsPerSample metadata
- Fix incorrect date/time format string
- Fix unknown orientation

Test: dng_validate for captured DNGs is clean
Bug: 27452979
Bug: 25862995
Change-Id: I87b73f7a4f4ecc3cf6498c7db16df68dd0b0b43a
ndroid_hardware_camera2_DngCreator.cpp
485e41d51067f9cd1f7de245533f1288e3a3d822 04-Mar-2016 Chris Craik <ccraik@google.com> Merge "Revert "Disable HWUI_NEW_OPS"" into nyc-dev
29c3630563452c9635f0510d071839c112d3017d 03-Mar-2016 Chien-Yu Chen <cychen@google.com> Camera2 Legacy: Connect to surfaces it produces

When legacy camera device is the producer of its output surfaces,
it needs to connect to the surfaces before using the surfaces
and disconnect from the surfaces after finishing using the surfaces.

Bug: 27331537
Bug: 27383242
Change-Id: Ia3e2ca142f7973face0f60fbfc96935054aac1c4
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
7c90661a6f36b98fd86757c8206c67c8bf71669d 03-Mar-2016 Philip P. Moltmann <moltmann@google.com> Do not move PDF content as the content is already moved.

Bug: 26961589
Change-Id: I444a4164f3b98af7aeb6df6e9a0b025d20a4a93b
ndroid/graphics/pdf/PdfDocument.cpp
f0a76088f8132ca3ea10241c55c5e81aebe072c2 03-Mar-2016 Chris Craik <ccraik@google.com> Revert "Disable HWUI_NEW_OPS"

bug:27366026

This reverts commit 0bed032eb2d19c339ecaa89a6e3159c0e2ac98de.

Change-Id: I4d569a11bb2b8db73b9984c50941c78ec5c91fe9
ndroid.mk
ca9605fc2894b5c18c70bfd5f408cb1285ab5092 03-Mar-2016 Dimitry Ivanov <dimitry@google.com> Merge "Use modified android_dlwarning" into nyc-dev
7aa090e793b566b3b331af05df45dbe15e189da3 03-Mar-2016 Mathieu Chartier <mathieuc@google.com> Merge "Trim " (deleted)" from map names" into nyc-dev
d47cbea81cbc3a986ebf511c73d39fb9b6d2634c 03-Mar-2016 Mathieu Chartier <mathieuc@google.com> Trim " (deleted)" from map names

Fixes application images to show as .art instead of GC accounting.
This was caused by storing the image in an anonymous map.

Bug: 27471334
Change-Id: I1a9584ab56cd7674df3832304886c743dafee731
ndroid_os_Debug.cpp
5f2f804a19ecf511d069ebbda6cc69a07fa7b13d 03-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Camera: Fix error handling for reading in vendor tags

- Fix bad format string for the unexpected error case
- Add expected error case for devices with no camera HAL module

Bug: 27465574
Change-Id: I0e77a689df402de96553b81274be85da7397e08e
ndroid_hardware_camera2_CameraMetadata.cpp
978c80b474e4b390e62da3e13b5e7e11667005bb 03-Mar-2016 Paul Jensen <pauljensen@google.com> Have ConnectivityService install packet filters when possible
am: 578a76e7de

* commit '578a76e7de77492ac33e407fff4fb9a2f5550d8a':
Have ConnectivityService install packet filters when possible
578a76e7de77492ac33e407fff4fb9a2f5550d8a 14-Jan-2016 Paul Jensen <pauljensen@google.com> Have ConnectivityService install packet filters when possible

Listen for ICMP6 router advertisements on networks that support
packet filters. Construct packet filters and install them to
ignore redundant future ICMP6 router advertisements.

Bug: 26238573
Change-Id: If78300b9fda257c21f3ee6533e1da7de9f897cb4
ndroid_net_NetUtils.cpp
74989b4d3ffdcd3def599e1f973d481062ba8e6f 02-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev
ddbf6c700b68ddab86c1396526a0b3208a0c610b 02-Mar-2016 Dimitry Ivanov <dimitry@google.com> Use modified android_dlwarning

The new form of android_dlwarning is thread-safe
and does not have a problem with dlwarning returning
a pointer that can in some situations become invalid.

Bug: http://b/27453994
Change-Id: Ied8366439467a9afd783a3b22b8c48b8709ac9aa
ndroid_app_Activity.cpp
f8fd8520606ff579f966a0f76864c7e5ee1b35ef 02-Mar-2016 Chong Zhang <chz@google.com> Merge "Force disconnect when the surface is about to be saved." into nyc-dev
5d2d7788f1759b0f3d2c057af0b3ea61b0354fee 18-Dec-2015 Eino-Ville Talvala <etalvala@google.com> Camera2: Switch to auto-gen C++ binder interfaces

- Move camera AIDL files to frameworks/av
- Update makefiles to point to new AIDL locations
- Adjust camera2 implementation to match modifications to AIDL needed
for native AIDL auto-generation
- Move Surface.aidl to frameworks/native to allow use in
native AIDL. Use android::view::Surface in Surface JNI to
serialize Surface objects to ensure parceling compatibility.
- Adjust service binder tests to new interface

Bug: 25091611
Change-Id: I85b817374b34a4540fa145328dbe4bbf7f746baf
ndroid.mk
ndroid_hardware_camera2_CameraMetadata.cpp
ndroid_view_Surface.cpp
0ce76e920492ce12226591cb0fd66527c7723eed 01-Mar-2016 Glenn Kasten <gkasten@google.com> Merge "Add use for audio_unique_id_t" into nyc-dev
1984d783304fe1ee915907d3a3c631f73d1243ff 01-Mar-2016 Dimitry Ivanov <dimitry@google.com> Merge "Display Toast with linker warnings after Activity.onStart()" into nyc-dev
47e36a3e270ff3e94750d730ac2a9f0bdfe96c04 01-Mar-2016 Chong Zhang <chz@google.com> Force disconnect when the surface is about to be saved.

Some client will not disconnect, and if we're saving the surface (instead
of destroying it), we need to make sure the surface is disconnected.
Otherwise the client won't be able to reconnect to the same surface.

bug: 27295820
Change-Id: I471b8fbe8f590c900e17a017167466fc8a70b87a
ndroid_view_SurfaceControl.cpp
86a27f343cd0c1bf5854aca4af6311faef45342f 29-Feb-2016 Pablo Ceballos <pceballos@google.com> Merge "Fix glGetTransformFeedbackVarying JNI" into nyc-dev
2a1d3cbc02d3a66f14ff5f52bc54ad781fe55620 29-Feb-2016 Yujie Qin <yujieqin@google.com> Merge "Use SkFILEStream directly when possible" into nyc-dev
414c529a4f3d8aa50df6e3615d2084ac1089de85 29-Feb-2016 Colin Cross <ccross@android.com> Merge "Add dumpsys meminfo --unreachable" into nyc-dev
211d9052f265b4f41b6de74131482a7c77a5e005 27-Feb-2016 Glenn Kasten <gkasten@google.com> Add use for audio_unique_id_t

Bug: 25641253
Bug: 21019153
Change-Id: I955f7e224a522adc2a68bc1c2cd5d87d9046f1fb
ndroid_media_AudioSystem.cpp
c1d7b7f71ce1a55548d7e8bb32d728190e2ffd47 29-Feb-2016 Yujie Qin <yujieqin@google.com> Use SkFILEStream directly when possible

When decoding from a file descriptor, if the descriptor is seekable and
has no offset, use SkFILEStream directly instead of wrapping in an
SkFrontBufferedStream.
This will let the SkRawCodec take advantage of a seekable stream.
One can see 2x speed up for RAW cases.

Bug: 27097104
Change-Id: I369fbb3af1170c94ec7cd9bb35e8e0007dde9fd5
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
4449ef5b6a85ef4e16dbd5d939db7b11eac0b586 26-Feb-2016 Dimitry Ivanov <dimitry@google.com> Display Toast with linker warnings after Activity.onStart()

Displays list of problems linker encountered with app's
native code including
1. Unauthorized access to private platform libraries.
2. Text relocations
3. Invalid DT_NEEDED entires

This change is intended only for preview/beta releases and to
be reverted before the first release build.

Bug: http://b/27365747
Change-Id: I08735472059248c901ef22042682d574fb2b0c92
ndroid.mk
ndroidRuntime.cpp
ndroid_app_Activity.cpp
10c3a2838c39bc88875628b49a902144df0f1d6a 27-Feb-2016 Christopher Tate <ctate@google.com> BinderProxy native destruction resilience

* Don't race with construct/init; we can't abide partial state here
* Defense in depth: null check the contained native state to catch
double invocations.

Bug 27377823

Change-Id: I38f91668d36404c2a7b93d5f7c6616d9eb3f0a30
ndroid_util_Binder.cpp
768d81374ba50d215064ca11ed3ca34cf46d087c 26-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Audio record notification: report audio device information" into nyc-dev
8ab728093eed85c176822d58a0d2ba1f4ebbb362 26-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Audio record notification: report audio device information

Support querying the AudioDeviceInfo in AudioRecordConfiguration.
When AudioService (through RecordingActivityMonitor) receives
a recording event on an existing session, report it as an
update if the recording configuration has changed.

Bug 22876530

Change-Id: I1b72c08aa0589077fe8ad254087965e6384ce50a
ndroid_media_AudioSystem.cpp
1a2cb453fa8204db84d92fd2de92b0ed1e546a03 26-Feb-2016 Dimitry Ivanov <dimitry@google.com> Merge "Create linker-namespace for the classloader" into nyc-dev
9b09e533ac67d3d25465e3312b4957bc90b0c84f 26-Jan-2016 Paul McLean <pmclean@google.com> JNI plumbing for native audio routing API

Bug: 23899814
Change-Id: I3a831bb661fbdfe1981ae3482fcc8773c7df22b6
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
642a4f5b66841788ffce5cf1d81ba744265db174 26-Feb-2016 Glenn Kasten <gkasten@google.com> Merge "Allow sample rate UNSPECIFIED to mean a route-dependent value" into nyc-dev
4dfd6c0abc67e9a367513727ecdda0dbb78acbd8 26-Feb-2016 John Reck <jreck@google.com> Merge "Disable HWUI_NEW_OPS" into nyc-dev
0bed032eb2d19c339ecaa89a6e3159c0e2ac98de 26-Feb-2016 John Reck <jreck@google.com> Disable HWUI_NEW_OPS

Bug: 27365711

Change-Id: Ife7ecc7c688738df4028f30847a2ff914e433b99
ndroid.mk
a55c7f15a3c386ec643f21eeb2f4e9fd7b03ba70 23-Feb-2016 Dimitry Ivanov <dimitry@google.com> Create linker-namespace for the classloader

With this change ApplicationLoaders.getClassLoader()
creates linker-namespace for the classloader at the
construction time. Before this change the namespace
was created on first load of a jni library.

With this change we ensure that every classloader
has initialized namespace associated with it.

As an additional advantage we now can avoid storing
namespace-specific fields in the classloaders.

Bug: http://b/27189432
Bug: http://b/22548808
Change-Id: I3b160bd478a55171008682c40b2ebc13bdbd9882
ndroid.mk
ndroidRuntime.cpp
ndroid_app_ApplicationLoaders.cpp
ndroid_app_NativeActivity.cpp
1cbf9b3741ec486c3ffce08f145501eb1ca73640 02-Feb-2016 Glenn Kasten <gkasten@google.com> Allow sample rate UNSPECIFIED to mean a route-dependent value

Bug: 25641253
Bug: 21019153
Change-Id: I3b8e01b6ea09f42c813ab1a0f3f625dc3803cc0b
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
0f61ae26ce09c0b0525c6ab83f2cae7b76f5168e 25-Feb-2016 Pablo Ceballos <pceballos@google.com> Merge "Add glReadPixels with buffer-offset argument" into nyc-dev
16ad43c00033dd8de3116f9604ee41047ce8f122 24-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Audio record notification: report client/device configuration" into nyc-dev
33fd8169cdb7e7fa33885b6f892bc4f6df68959b 22-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Audio record notification: report client/device configuration

Report client and device recording configuration during updates.
Support querying the AudioFormat in AudioRecordConfiguration.

Bug 22876530

Change-Id: I90b44db9bc3fda479452fc63221f8082f5b6a741
ndroid_media_AudioSystem.cpp
30058435065f392754e749fe43589dd8b452727d 23-Feb-2016 Doris Liu <tianliu@google.com> Merge "Support running AVD on UI thread" into nyc-dev
28cfd20f024a56a927014351c8bdf9d8552603e3 23-Feb-2016 Doris Liu <tianliu@google.com> Support running AVD on UI thread

By default, AVD animates on RT thread. But since in some cases there's a
need for a finer control on when the frame update for the animation should
happen, such as coordiating the AVD animation with other animations that
run on UI thread, we are providing a way to force the AVD to run on UI
thread.

Bug: 27278616
Change-Id: I372ecd3dc52e3fa0bdce3a1e9c19443f9b199027
ndroid_graphics_drawable_AnimatedVectorDrawable.cpp
4dc580c0dfb33a515bc71353a06398b3ddafe4dc 23-Feb-2016 Bo Hu <bohu@google.com> Merge "Emulator: Replace ro.kernel.qemu.gles with qemu.gles" into nyc-dev
68981ff03b2c166800ddc82973a2aa95269a343b 22-Feb-2016 Pablo Ceballos <pceballos@google.com> Add glReadPixels with buffer-offset argument

- For reading into PBOs on GLES3, add an overloaded version of
glReadPixels that takes an offset argument.

Bug 18878609

Change-Id: I744483deab6358a66b0dc5e87be1ae2b96560ac1
ndroid_opengl_GLES30.cpp
280c5b2155feae857ad514dff81adbfe73e398e9 22-Feb-2016 Polina Bondarenko <pbond@google.com> Merge "Added hardwareproperties SystemService" into nyc-dev
adc49e8fd59005a10df294d46c022563257eb942 22-Feb-2016 Erik Kline <ek@google.com> Delete all NetworkUtils DHCP-related code.
am: c3b52bc466

* commit 'c3b52bc46604cb18d74fbe13dda15f4679222107':
Delete all NetworkUtils DHCP-related code.
0f6ae2ec0df270c4ce51c87896fe01fe6e1fedfa 22-Feb-2016 Erik Kline <ek@google.com> resolve merge conflicts of b242549166 to nyc-dev

Change-Id: I42d4cac95a209fdfae5769d75d90f004a94d60a4
c3b52bc46604cb18d74fbe13dda15f4679222107 18-Feb-2016 Erik Kline <ek@google.com> Delete all NetworkUtils DHCP-related code.

Bug: 26991160
Change-Id: I2c74e0161f43f65c1b6a85dc9f294b64c8f1ae6e
ndroid_net_NetUtils.cpp
b2425491662b4d31fbcf09ab36bd10adc42a2b28 18-Feb-2016 Erik Kline <ek@google.com> Give bluetooth sufficient capabilities to run DhcpClient

Specifically:
CAP_NET_RAW
CAP_NET_BIND_SERVICE

Bug: 26991160
Change-Id: I2afddc9efa3b613d974afb0ea33703948203d99a
om_android_internal_os_Zygote.cpp
b73396b3f89de9620ab6e3d37b25f7451584789c 20-Feb-2016 bohu <bohu@google.com> Emulator: Replace ro.kernel.qemu.gles with qemu.gles

ro.kernel.qemu.gles is passed in by emulator and is read only;
the actual gles version can only be decided at egl library
loading time, and qemu.gles value will be set there and be
queried here.

bug: 27273457
Change-Id: I5ba228a2fa6649786dc87da09367d368e9e6d1e8
ndroid_view_DisplayListCanvas.cpp
350e65206cfbd86484fcfda77bb988e270606dda 19-Feb-2016 Doris Liu <tianliu@google.com> End staging animators when destroy RootRenderNode

When animation happens in a dialog, it is possible for the dialog to
be dismissed and RootRenderNode to be destroyed before we create
animation handle for the staged animators. In that case, we need
to remove the staged animators so they will not run without a
animation handle.

Bug: 26975079
Change-Id: I0c2c6c1b530beaec3984c0b1c410df4fd8f25c95
ndroid_view_ThreadedRenderer.cpp
c4bb185d41cfb960ed9a3178a4f8974c351abdb0 19-Feb-2016 Doris Liu <tianliu@google.com> VectorDrawable native rendering - Step 5 of MANY

This is reverting the revert of what reverts the revert of the original
implementation. Fourth revert is a charm!

This reverts commit df7fdb1e0bdb5c289bbc08047e5c710185503309.

Change-Id: I6fc3a5accfd8b79c3da31bbc101ad9e9b4d6e7dd
ndroid_graphics_drawable_AnimatedVectorDrawable.cpp
ndroid_view_RenderNodeAnimator.cpp
f8754ac2127f8adf40bd4731f39b16340acdb2f7 12-Feb-2016 Polina Bondarenko <pbond@google.com> Added hardwareproperties SystemService

Add HardwarePropertiesManagerService which call native methods to
get CPU, GPU, battery temperatures, CPU usage info, fan speeds.
Restrict hardware properties retrieval only for device and profile
owners.

Bug: 26945055
Change-Id: I4d6b30b78e575532d5e9cfa59ef6cd81355439d4
ndroid.mk
ndroidRuntime.cpp
ndroid_os_HardwarePropertiesManager.cpp
31af215b26cc0832a35509668241f0f7c2496e3c 19-Feb-2016 Ben Wagner <bungeman@google.com> Merge "Use UTF32 directly in HarfBuzz<->Skia interface." into nyc-dev
c4fb5f9d4b8012bc007f0c7e472d4ff4801254f5 03-Feb-2016 Colin Cross <ccross@android.com> Add dumpsys meminfo --unreachable

dumpsys meminfo --unreachable will search the native heap for
allocations that are unreachable.

Bug: 27208635
Change-Id: I40ab1c261cb222ca71d04ab8408f355bcb18ed94
(cherry picked from commit 84b1e3554b36b7fbccf57330c93bf484985ae3d6)
ndroid.mk
ndroid_os_Debug.cpp
f49105114308da5a9a9015e771a2f0b6799092fa 19-Feb-2016 Keisuke Kuroyanagi <ksk@google.com> Merge "Optimize: Use measureText instead of doLayout." into nyc-dev
c1fa6d0deb21bdfb59368a9c88b263ea5c65f9cf 18-Feb-2016 Ben Wagner <bungeman@google.com> Use UTF32 directly in HarfBuzz<->Skia interface.

This fixes a TODO to use kUTF32_TextEncoding directly. This avoids
encoding UTF32 codepoints from HarfBuzz into UTF16 to pass to Skia,
which will then re-decode to UTF32. This also removes a use of
SkUtils.h which Skia desires to move to private use.

Change-Id: I087f4216c25f7874e496920cd33e2f109530c397
ndroid/graphics/HarfBuzzNGFaceSkia.cpp
4c8a52647814badd361ebd13813180b8db9b923e 18-Feb-2016 Keisuke Kuroyanagi <ksk@google.com> Optimize: Use measureText instead of doLayout.

measureText is a light weight method dedicated to measure text width.
With this CL, breakText, doRunAdvance and doOffsetForAdvance use
measureText.

Bug: 24505153

Change-Id: Ibd62de2e0fe2e196cf07472f2270cc8c6325daab
ndroid/graphics/Paint.cpp
5b7188aebc2401c9c010543eff62ef53036c147b 18-Feb-2016 Doris Liu <tianliu@google.com> Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev
df7fdb1e0bdb5c289bbc08047e5c710185503309 18-Feb-2016 Doris Liu <tianliu@google.com> Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""

This reverts commit 0d20a275a5baf8579c8b9111cf2ce6615874a6b6.

Change-Id: I97c782f1164a5d39ab74dc098cca71d9e1b30cd8
ndroid_graphics_drawable_AnimatedVectorDrawable.cpp
ndroid_view_RenderNodeAnimator.cpp
fccb29cbbf15fb8395cd4f1ae73f87c0dcb7e017 17-Feb-2016 Derek Sollenberger <djsollen@google.com> Merge "Update Region parcelling to use SkRegion::Iter" into nyc-dev
8e1206bfffa78164dbb4c8103d16a4de3363e832 17-Feb-2016 Andres Morales <anmorales@google.com> Merge "allow for slow FrameMetricsListeners" into nyc-dev
11f02d7e522ec8742f7ef533c252e04e24b93f6b 13-Feb-2016 Andres Morales <anmorales@google.com> allow for slow FrameMetricsListeners

A slow listener could cause a race in the NotifyHandler
where the single reference to the buffer to send would get
updated when it shouldn't have been.

Switch to a queue of available buffers to prevent this race.

Also, stop setting and clearing the observer reference and instead
incStrong/decStrong to mark temporary strong ownership without
colliding with other owners in flight.

Bug: 27097094
Change-Id: Iee647bfae8b80019b6d8290179eed3973230901f
ndroid_view_ThreadedRenderer.cpp
fd00820ca3db46eafda00b66e73bbfc2d9e37eae 17-Feb-2016 Derek Sollenberger <djsollen@google.com> Update Region parcelling to use SkRegion::Iter

Bug: 26593930
Change-Id: Ie673c776ed7e1c327ca0f3196900fbb229c2a936
ndroid/graphics/Region.cpp
5b49c6f31bce6b5ac250178ce004c21d50a48819 17-Feb-2016 Doris Liu <tianliu@google.com> Merge "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""" into nyc-dev
faa1033dc7d6b1ea6c17a483e586eaa167d154f9 16-Feb-2016 Andreas Gampe <agampe@google.com> Frameworks/base: Fix registration function

Registration functions return "int."

Change-Id: Icb8d35f3bc23794cdb22db1c1adda236c9d8676e
ndroid_util_jar_StrictJarFile.cpp
8e552f2eaef9c31c6e69c3babe6639829afd7b1c 16-Feb-2016 Leon Scroggins <scroggo@google.com> Merge "use std factory for compose-shader" into nyc-dev
0d20a275a5baf8579c8b9111cf2ce6615874a6b6 11-Feb-2016 Doris Liu <tianliu@google.com> Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""

This reverts commit e03ef25a3e44ef5d495e366c30b9b5b69fc58194.

Change-Id: I9c2e1c891667451a3ee668e414bf337ad67279ab
ndroid_graphics_drawable_AnimatedVectorDrawable.cpp
ndroid_view_RenderNodeAnimator.cpp
af9aa07fbdcabf873efe7c27862e7825dbdfdb88 12-Feb-2016 Phil Burk <philburk@google.com> Merge "AudioFormat: implement ENCODING_IEC61937" into nyc-dev
fb95699364e555148b437cfa1e5c69384f843845 28-Jan-2016 Ben Wagner <bungeman@google.com> Deduplicate font file mappings.

With ttc and gx variation fonts, it is now possible and common that a
number of fonts will use the same font file for data but with different
parameters. In the current code each font will map the font file data,
taking up an unecessary amount of virtual address space and is
inefficient with respect to memory management (like the tlb). This CL
deduplicates these file mappings so that a given font file will only be
mapped into memory once.

DO NOT MERGE
Change-Id: I5ca69f963a434c72ec4028402ecbf9e0f0ee7148
(cherry picked from commit fffcf0a31fd4c9a4ec8aa7de70b1eda0d48fb337)
ndroid/graphics/FontFamily.cpp
e2caaa9c8d9838f814218a48a203f95a517c9bbe 12-Feb-2016 Ben Wagner <bungeman@google.com> Merge "Add support for gx font variation axes." into nyc-dev
4531e2df1d99300253322ec171088f055b219d64 12-Feb-2016 Matt Sarett <msarett@google.com> Merge "Use SkCodec::MinBufferedBytes() for front buffered image decode stream" into nyc-dev
d9cd292369fcf9e2446edb6776d8bddf0f67d845 12-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Dynamic audio policies: JNI support for UID rules" into nyc-dev
a87b07d7fafd59ae26073a80cd742b17ea427ecd 06-Nov-2015 Ben Wagner <bungeman@google.com> Add support for gx font variation axes.

This adds an 'axis' child element to the 'font' element. The 'axis'
element has attributes 'tag' (a four byte identifier) and 'stylevalue'
(a float value) to the parser. This also modifies reading the font file
name in a backwards compatible fashion by using only the direct #text
children of the 'font' element. (Both the Minikin and Skia parsers now
allow the font file name on a separate line in the fonts.xml file).

This information is then passed through to Skia in order to select the
desired variation. The Skia parser already parses this way and has for
some time, so Chrome and WebView can already read this format.

Change-Id: I15623fe864fa92b2bf0705af5e389daedfb77e5c
(cherry picked from commit b8e367fb7428076ff2e4aa2a97adaed1ef806e92)
ndroid/graphics/FontFamily.cpp
96ffbdc9ddd8e8fd6582a907b1c5e916d21e44fa 11-Feb-2016 Matt Sarett <msarett@google.com> Use SkCodec::MinBufferedBytes() for front buffered image decode stream

This should not change decode behavior, but it's worth noting that
the number of bytes buffered will decrease from 64 to 30.

Change-Id: I66b0e38a487c1786823b0125686b094dae5d13dc
ndroid/graphics/BitmapFactory.cpp
c3703a258d67f14c84194ab443b9a34d9107e792 12-Feb-2016 Mike Reed <reed@google.com> use std factory for compose-shader

Change-Id: I4562d66cb8b9b8237e6aae7c205228731732cf17
ndroid/graphics/Shader.cpp
43f4b276a56e6fb5a3c9637c0e3a6865657e3be7 28-Jan-2016 Phil Burk <philburk@google.com> AudioFormat: implement ENCODING_IEC61937

Allows applications to wrap compressed audio in a PCM
stream and pass through directly to HDMI output.

Bug: 24541671
Bug: 20891646
Bug: 26373761
Signed-off-by: Phil Burk <philburk@google.com>

Change-Id: If29e10b0665758330eca085bfeaac19fefc373b3
ndroid_media_AudioFormat.h
ndroid_media_AudioTrack.cpp
e03ef25a3e44ef5d495e366c30b9b5b69fc58194 11-Feb-2016 John Reck <jreck@google.com> Revert "VectorDrawable native rendering - Step 5 of MANY"

Bug: 27136799

This reverts commit 18bdf443e371e9f293439b4ff92cc79abaa422e5.

Change-Id: I825b061eec2a591f2d18119ba64494624b9ad4f2
ndroid_graphics_drawable_AnimatedVectorDrawable.cpp
ndroid_view_RenderNodeAnimator.cpp
18bdf443e371e9f293439b4ff92cc79abaa422e5 02-Feb-2016 Doris Liu <tianliu@google.com> VectorDrawable native rendering - Step 5 of MANY

Implemented reset() (public API for AVD)
and reverse() (internal API that needs to be supported)

Change-Id: Ife1650049f271cad1347943151a5800c40c20aa2
ndroid_graphics_drawable_AnimatedVectorDrawable.cpp
ndroid_view_RenderNodeAnimator.cpp
e5951de6c829260c068d2552871971c8a56d2543 11-Feb-2016 Andres Morales <anmorales@google.com> Merge "check for null members in NotifyHandler" into nyc-dev
ba6b4b400d850ba18fcb9d5bf9789d490f390acc 10-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Dynamic audio policies: JNI support for UID rules

Rename AttributeMatchCriterion to AudioMixMatchCriterion to be consistent
with the fact that now mixing rules are not always about audio attributes.

AudioSystem JNI: add support for UID-based rules.

Bug 26798796

Change-Id: Icb0f57841c94f410e1fac9ed071a829a26b9a58e
ndroid_media_AudioSystem.cpp
e3f0818b1a127a4ad35665c8781065d0fae2c5d6 10-Feb-2016 Andres Morales <anmorales@google.com> check for null members in NotifyHandler

An unexpected message posted to the queue should not
crash the application.

Bug: 27097094
Change-Id: Ide6a07014660ff14e0f287660c534cfa1e0acad9
ndroid_view_ThreadedRenderer.cpp
f4d81bd865d341c6d71fcd4c40294a2570770879 29-Jan-2016 Andy Hung <hunga@google.com> Add AudioRecord timestamps

Bug: 13569372
Bug: 22886739
Change-Id: Icdd0e6f3871a43a26faa39e5535740f72a58dcae
ndroid_media_AudioRecord.cpp
59fb43e7bdc607f49b301644e4300485f352b103 30-Jan-2016 Pablo Ceballos <pceballos@google.com> Fix glGetTransformFeedbackVarying JNI

- Deprecate the broken version that takes a byte argument.
- Implement a new version that takes a byte buffer argument.

Bug 19478262

Change-Id: I5ea4f11940e93b5964b66dbf5700b7ff8b80339e
ndroid_opengl_GLES30.cpp
910beb8f5d9042163e2ad0dbb744d9f147db9604 03-Feb-2016 Andres Morales <anmorales@google.com> updates to FrameStatsObserver API

- Rename to FrameMetrics to avoid collision with existing
android.view.FrameStats class
- Make FrameMetricsObserver implementation detail,
exposing FrameMetricsListener interface as public API
and wrapping in FrameStatsObserver to maintain state
- Remove dropped frame count call, in favor of passing as
parameter to callback method.
- Move away from raw timestamp access in favor of Metric IDs
which represent higher-level, more stable stages in a frame
lifecycle and match the categories exposed in the onscreen
bars.
- Support many-to-many Window<->FrameMetricsListener relationship

Change-Id: I00e741d664d4c868b1b6d0131a23f8316bd8c5c2
ndroid_view_ThreadedRenderer.cpp
469a828ac78366e0c8e15331ea950e40af48e59e 05-Feb-2016 Doris Liu <tianliu@google.com> Merge "Ref count the nodes in VectorDrawable"
43a5591c8da267e85db9df6c93db73ca29a1bcba 05-Feb-2016 Doris Liu <tianliu@google.com> Merge "Revert "Revert "VectorDrawable native rendering - Step 4 of MANY"""
a08c9f52db26fa78e33464b57cc0597981352270 05-Feb-2016 Peng Xu <pengxu@google.com> Fix potential crash when getSensorList returns error

bug: b/19937981

Change-Id: Ibfb8c625609923b4e60fa73685dbeb10944ab2b9
ndroid_hardware_SensorManager.cpp
ef062ebd20032efe697741d6c3dfd1faec54f590 05-Feb-2016 Doris Liu <tianliu@google.com> Ref count the nodes in VectorDrawable

Also added API check so that for pre-N we ignore invalid VD animation,
in order to avoid breaking old apps.

Bug: 26975469
Bug: 26949340
Change-Id: I498539ad6a05de3d886e7dcdc8a167e78333ab11
ndroid_graphics_drawable_VectorDrawable.cpp
1819bb5230241b3428b75f848c3f9977afd0186f 05-Feb-2016 Matt Sarett <msarett@google.com> Copy appropriate number of rows in RecyclingClippingPixelAllocator

This is used by BitmapRegionDecoder to decode into a recycled
bitmap.

Since the specification does not guarantee that the recycled
bitmap will be larger than the decoded region, we must be careful
to only to copy min(recycledHeight, decodeHeight) rows.

This should fix flakiness in the BitmapRegionDecoderTest on cts.

BUG:26978886
Change-Id: I318468b0eaa67bd9a7860824f75d45df9bf5fbce
ndroid/graphics/Graphics.cpp
9bab9e8656e5f79c2cbba082dfaf8abe42b920f8 05-Feb-2016 Chris Craik <ccraik@google.com> Merge "Don't force transparent text to be high contrast"
edf71a96c94aac8aaeaada5f07fef1662db0ddca 05-Feb-2016 Chris Craik <ccraik@google.com> Don't force transparent text to be high contrast

bug:26142378

Change-Id: Ia6c9111d9b84d2a5d3385d08c586ac12c9b14dc0
ndroid_graphics_Canvas.cpp
766431aa57c16ece8842287a92b2e7208e3b8ac3 04-Feb-2016 Doris Liu <tianliu@google.com> Revert "Revert "VectorDrawable native rendering - Step 4 of MANY""

This reverts commit 5a11e8d0ba21624025b89ac63bbd18befa55be0e.

Change-Id: I7a48b59c4f930dad65ddc8590c25a12636244ea2
ndroid.mk
ndroidRuntime.cpp
ndroid_graphics_drawable_AnimatedVectorDrawable.cpp
ndroid_graphics_drawable_VectorDrawable.cpp
5a11e8d0ba21624025b89ac63bbd18befa55be0e 04-Feb-2016 Doris Liu <tianliu@google.com> Revert "VectorDrawable native rendering - Step 4 of MANY"

b/26949340 and b/26975469, b/26975079 as well

This reverts commit f276acd98457bcaabc9e79a17a736b3b484f005e.

Change-Id: I4b55177daf0d289bc03604c71fd4bf579f65073a
ndroid.mk
ndroidRuntime.cpp
ndroid_graphics_drawable_AnimatedVectorDrawable.cpp
ndroid_graphics_drawable_VectorDrawable.cpp
0a1abd3247d856fe875d5ef45f75bc2c8167ea96 04-Feb-2016 John Reck <jreck@google.com> Merge "Have RT drive window positioning"
f648108f83d4e74811919e9811efb8fcc184b8a3 03-Feb-2016 John Reck <jreck@google.com> Have RT drive window positioning

Bug: 22802885

Change-Id: I6beed5474d3a943b16e9097f7bd61ce3cbd37505
ndroid_view_RenderNode.cpp
ndroid_view_ThreadedRenderer.cpp
6f485569fa3d6047dcffd068aebf361e3598783c 30-Jul-2015 Derek Sollenberger <djsollen@google.com> Update Canvas API with view system calls.

Refactor DisplayListCanvas, RecordingCanvas, and SkiaCanvas
to share a common API.

Change-Id: I0268ec2749ea5d13a3a72bb2784ed6a9911383d9
ndroid_view_DisplayListCanvas.cpp
5e4aa93df6486af3043afb7edc8aa8b8e8f61bbc 03-Feb-2016 Leon Scroggins <scroggo@google.com> Merge "Lock SkBitmap before accessing color table"
a72d52bbed043b5149c98a1697bf7022e00050b3 03-Feb-2016 Doris Liu <tianliu@google.com> Merge "VectorDrawable native rendering - Step 4 of MANY"
f276acd98457bcaabc9e79a17a736b3b484f005e 07-Jan-2016 Doris Liu <tianliu@google.com> VectorDrawable native rendering - Step 4 of MANY

This CL runs VectorDrawable animation on RenderThread. The changes in this CL
include:
- Convert all the animators in AnimatorSet for AVD into a set of RenderNodeAnimators.
- Hook up the new animators with RenderThread
- Add drawOp in RecordingCanvas for drawing VD so that during the animation
on RenderThread, all the property changes on VD can be reflected on the screen.

TODO:
- Implement reverse and reset for AVD.

Change-Id: I2df1d754f2db0ad098d9c15dde4bb2bdfafc2315
ndroid.mk
ndroidRuntime.cpp
ndroid_graphics_drawable_AnimatedVectorDrawable.cpp
ndroid_graphics_drawable_VectorDrawable.cpp
66ce1c3b1a7b5ed3d4d5a9a05a7c133998c9a73e 02-Feb-2016 Leon Scroggins III <scroggo@google.com> Lock SkBitmap before accessing color table

This only affects kIndex_8 Bitmaps, which can only be created by
decoding particular images (e.g. GIF). Without locking the SkBitmap,
colorTable() always returns NULL. Lock it so we can write the color
table to the Parcel.

BUG:26527976
Change-Id: Ifc54b06ca08db26ba6455a3830b7e671b64f37c4
ndroid/graphics/Bitmap.cpp
f812e57d384710ff4d538a3cd76e5782b4c1e9a5 02-Feb-2016 Ryan Bavetta <bavetta@google.com> Merge "Allow Generic SoundTrigger Models"
ee3fc89a3a7b3a68ae0e9f6f9b8d0fe5e203a873 27-Jan-2016 Ryan Bavetta <bavetta@google.com> Allow Generic SoundTrigger Models

BUG: 22860713
Change-Id: Ic260af0831f9751ced161820f52f0b0185bdfcea
ndroid_hardware_SoundTrigger.cpp
03d8f76836c5950374bc9030a78706d25ac233e9 31-Jan-2016 Michael Lentine <mlentine@google.com> Adding plumbing for passing the lib directory.

Added call in handleBindApplication which will pass the library path into
HardwareRender which then passes it to libvulkan through ThreadedRenderer's
jni interface.

Change-Id: I7dc1fec9c7a1566716a4501a0d5697ea94e57b53
ndroid.mk
ndroid_view_ThreadedRenderer.cpp
d89cb1eb81a019ee944f8a2803500ab98f92dc1c 29-Jan-2016 Andy Hung <hunga@google.com> Merge "Add AudioRecord timestamps"
0ad99c059735d6d4a9f9fb5379c8b1b35ce01f38 16-Jan-2016 Andy Hung <hunga@google.com> Add AudioRecord timestamps

API change

Bug: 13569372
Bug: 22886739
Change-Id: Ic250fd0c39901f4e99c58281e371f27c241b6bed
ndroid_media_AudioRecord.cpp
a29583553957a19755bfba26f48b6ebe977879cb 27-Jan-2016 Peng Xu <pengxu@google.com> Implementation of sensor additioanl info report

This implements a mechanism for sensor hardware/HAL to deliver additional information beside sensor
readings to application. It includes internal temperature reading, untracked delay of sample,
location and pose of sensor device placement in phone frame, etc. This is also a very expandable
frame to account for future need.

Change-Id: Ifd52ff315ef675086326f118eab773b0194bae23
Note: sensor additional information report used to be called sensor meta data.
ndroid_hardware_SensorManager.cpp
2c6c25f2460fd5606e52c25f98d44122219a7090 28-Jan-2016 Pavlin Radoslavov <pavlin@google.com> Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user" am: 26fdbc1833
am: dc84cff34f

* commit 'dc84cff34f020e4768e99fa08749bbe0b87a2233':
Grant CAP_WAKE_ALARM to the Bluetooth process for any user
de3dbb463c30b53ac0a254f69ffa01416dcbadb3 28-Jan-2016 Tenghui Zhu <ztenghui@google.com> Merge "Gradient for VectorDrawable's fill and stroke"
dc84cff34f020e4768e99fa08749bbe0b87a2233 28-Jan-2016 Pavlin Radoslavov <pavlin@google.com> Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user"
am: 26fdbc1833

* commit '26fdbc18337a8e9d16e18255e39ce7a16e83d57b':
Grant CAP_WAKE_ALARM to the Bluetooth process for any user
bd098d4ed3240b5beb5c0d1c1c8d87d2aa708dd7 28-Jan-2016 Chien-Yu Chen <cychen@google.com> Merge changes from topic 'camera-hardening'

* changes:
Add cameraserver process
Camera: update connect call
a35b5539a95342799a18e95616c5e5751a198e4c 20-Jan-2016 Peng Xu <pengxu@google.com> Dynamic Sensor Discovery Implementation

Defined the dynamic sensor meta data type and UUID of sensor, as well
as the broadcast intent that is related to dynamic sensor status
change.

Modify SensorManager, SystemSensorManager and the JNI layer to support
dynamic sensor discovery.

Added SensorNotificationService to notify apps that sensor connected
or disconnected via broadcast.

Change-Id: I28adfb005357d7e3983d65117d6865830c75027d
ndroid_hardware_SensorManager.cpp
dbee9bb342cdfaa5155b1918f90262c05e2464cb 15-Dec-2015 Teng-Hui Zhu <ztenghui@google.com> Gradient for VectorDrawable's fill and stroke

Add ComplexColor interface for both GradientColor and ColorStateList.
Set up constant state, factory, theme attrs for GradientColor, while
refactoring the ColorStateList's similar code. (Functionality in CSL should
be the same).

Support themeing in both the root and item level in GradientColor.
For example, both startColor in <gradient> tag or color in <item> tag can
have theme color.
Add tests for both simple and complex cases with themeing etc.

Hook up the native VectorDrawable implementation using 2 extra JNI calls for
simplicity. Such calls only happen at inflate and applyTheme call.

b/22564318

Change-Id: Ibdc564ddb4a7ee0133c6141c4784782f0c93ce0e
ndroid_graphics_drawable_VectorDrawable.cpp
2956beeec97df6ee7fe0c826ccc8c6f625f36d75 28-Jan-2016 Pavlin Radoslavov <pavlin@google.com> Grant CAP_WAKE_ALARM to the Bluetooth process for any user

Use multiuser_get_app_id(uid) to check for AID_BLUETOOTH
and allow the CAP_WAKE_ALARM capability for any user.

Bug: 26784675
Change-Id: I11641e212b7c815e9137ae5620da6ad55f95a899
om_android_internal_os_Zygote.cpp
8b8b242985d3b12d21be11e8f0efb74d3236ea74 27-Jan-2016 Polina Bondarenko <pbond@google.com> Merge "HardwarePropertiesManager: Add API for hardware properties retrieval"
781c53a8e2706a4d354d3e0f9e5fee99ef6b3407 27-Jan-2016 Craig Donner <cdonner@google.com> Merge "Setting consumer protected mode on from SurfaceTexture when in a protected context."
dd93728b461c686ee4c5f329509418fe9342cb8d 26-Jan-2016 Florin Malita <fmalita@google.com> Merge "Add internal Canvas save flags"
eecff56fed5dd5206acfbc5007b4912081b36d3b 21-Dec-2015 Florin Malita <fmalita@google.com> Add internal Canvas save flags

Skia's SkCanvas::SaveFlags are being deprecated. This CL introduces
the equivalent android::SaveFlags, converts all internal clients to
the new enum, and switches the saveLayer glue to the
SaveLayerRec-based API.

Change-Id: Icb1785f4e7c0f652b1f04b34a1e3ccb063c408f3
ndroid_graphics_Canvas.cpp
214a13720905161bbaa2f661f810c787e4c5baa8 25-Jan-2016 Andres Morales <anmorales@google.com> Merge "expose hwui frame stats through FrameStatsObserver"
4bbb8504a755fd273cd8e6be3d6e2fbc7ccbc2a4 12-Jan-2016 Craig Donner <cdonner@google.com> Setting consumer protected mode on from SurfaceTexture when in a protected context.

Bug: 22775237
Bug: 22855417

Change-Id: I9608ba08b28b02f3df1cc334fdc22d645831f1f6
ndroid/graphics/SurfaceTexture.cpp
06f5bc70a667a02b14e31d3f53f91d3661e30666 16-Dec-2015 Andres Morales <anmorales@google.com> expose hwui frame stats through FrameStatsObserver

Change-Id: I88884bafc8e2f6d7f67a36d3609490e83cf8afd5
ndroid_view_ThreadedRenderer.cpp
965ecbbb3eb19007690c333ab3aa05e380deb633 13-Nov-2015 Polina Bondarenko <pbond@google.com> HardwarePropertiesManager: Add API for hardware properties retrieval

Add serive "hardwareproperties" and methods getDeviceTemperatures,
getCpuUsages and getFanSpeeds to retrieve hardware properties:
device temperatures (CPU, GPU and battery), CPU usages and fan speeds.
This is a public API.

Bug: 22407109
Change-Id: If7efcbba7b160256d41704b60d93a7218dcc79d7
ndroid.mk
ndroidRuntime.cpp
ndroid_os_HardwarePropertiesManager.cpp
a420880ca5b4b6b324341cfb5222697e75698142 22-Jan-2016 Keisuke Kuroyanagi <ksk@google.com> Merge "Use light weight method for text measurement."
6cfa1cc4b0a60dcae6f97efd3efdd6f6033ab3be 22-Jan-2016 Michael Wright <michaelwr@google.com> Merge "Add choreographer API to the NDK."
3d3fe5026a6a3e951ef56ad16a100b8d5ae84574 04-Dec-2015 Michael Wright <michaelwr@google.com> Add choreographer API to the NDK.

Change-Id: Icb8cffd3cd3bd06814466be72db3e26f6a62cbc6
ndroid_view_DisplayEventReceiver.cpp
a3024bd7026deb777556dd75dd34a719ea1c2b39 17-Sep-2015 Keisuke Kuroyanagi <ksk@google.com> Use light weight method for text measurement.

Bug: 24505153

Change-Id: I94823e8d546fbe0a29bc05e8841672c4cf9b5ecd
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
8020313d05f22dc1f8a7a182e6da134db17761ec 20-Jan-2016 John Reck <jreck@google.com> Merge "Re-enable new pipeline"
c48e3b602ead581b06669f59aad786bdc05eb6b0 20-Jan-2016 Jeff Davidson <jpd@google.com> Merge "Implement roaming tracking in NetworkStats summary queries."
a6a78076eeb27084ed815ce0492d4ffe08134bec 12-Jan-2016 Jeff Davidson <jpd@google.com> Implement roaming tracking in NetworkStats summary queries.

Whether a network is deemed roaming or not was already being tracked
as part of the NetworkIdentitySet, so the underlying data store
already tracks roaming and native data separately. However, this data
was being aggregated together in NetworkStatsCollection#getSummary,
since the NetworkIdentitySet is converted to an iface name for the
purposes of matching, and the iface name will be identical whether or
not the iface is considered roaming. Now it is separated.

Also fixes a long-standing bug in NetworkIdentitySet where an identity
read from a saved file would always be considered roaming == false,
even if it wasn't at the time it was written.

Bug: 25813438
Change-Id: I11ab5b51182ed8da7af8fde468df065f9fdc3dad
om_android_internal_net_NetworkStatsFactory.cpp
900fe2410ddfdaa7be71d41335b73dc2c1c7858e 20-Jan-2016 Rubin Xu <rubinxu@google.com> Merge "Add JNI bridge to the new logd security buffer."
dcdbba7c95c8495cf5b25b020b33af186e127bf2 19-Jan-2016 John Reck <jreck@google.com> Re-enable new pipeline

Change-Id: I0d0b2a109a3756d404e4e244348a863a9afa3f9b
ndroid.mk
7bdf3cff92d26f9a4a8b88f816f5313fe02d6a33 19-Jan-2016 Calin Juravle <calin@google.com> Merge "Enable profile guided compilation on the framework side"
db4a79a5d7d348e9d2286d95d4e5a59dd484456f 23-Dec-2015 Calin Juravle <calin@google.com> Enable profile guided compilation on the framework side

The background compilation service will trigger a profile based
compilation instead of a full one. If no profile information is
available the compilation is skipped (see installd).

Note that the end decision whether or not to compile a package is taken
by dext2oat. We can't make the decision here because this service runs
under system server which cannot read app's profile data.

Bug: 26080105
Change-Id: I457ea8dea0557839c1f7cdc241770055732b0a4a
ndroidRuntime.cpp
465eefb9f31928157158a0f30319d1d95a21a567 19-Jan-2016 John Reck <jreck@google.com> Merge "fix race condition between HWUI cache and renderThread" am: 2c2b5e8514
am: 4354ae9883

* commit '4354ae9883ae1282ac457539f46d529bdfa89fec':
fix race condition between HWUI cache and renderThread
4354ae9883ae1282ac457539f46d529bdfa89fec 19-Jan-2016 John Reck <jreck@google.com> Merge "fix race condition between HWUI cache and renderThread"
am: 2c2b5e8514

* commit '2c2b5e8514247d8524778d209f26b7dbde19d142':
fix race condition between HWUI cache and renderThread
1b94f9b77cb1a241b42f894572d819cc1153932f 19-Jan-2016 John Reck <jreck@google.com> Revert "Switch to new rendering pipeline"

This reverts commit 3daf4d3272f2cc6ce3b5a572b9d4dcce1654086d.

Temporarily disable due to high rate of crashes from endLayer check

Bug: 26609444
Change-Id: I7583a77bf5cc1e722fa4042db0542f80cd978760
ndroid.mk
c0a0e1a66da20a18045d59451b59ec32685bcf18 18-Jan-2016 Thomas Buhot <thomas.buhot@intel.com> fix race condition between HWUI cache and renderThread

getMaximumBitmapWidth() and getMaximumBitmapHeight() of DisplayListCanvas
need HWUI cache instance. Since the initialization of the cache is
asynchronous it may crash if not yet ready. Add a staticFence() call
to guarantee the cache has been created prior issuing the call.

Change-Id: I5ed9e5cc084444c8d1872a77fef50e294ae14e93
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
ndroid_view_DisplayListCanvas.cpp
8c2dd1f7e7771c61e5aeb4570e097e258d18cdef 18-Jan-2016 Phil Burk <philburk@google.com> Merge "Revert "Revert "AudioTrack: Add getUnderrunCount()"""
10a33e499c97767f8d6bfc6514ba8b5f485394da 08-Jan-2016 Phil Burk <philburk@google.com> AudioTrack: add setBufferSizeInFrames()

Also add getBufferCapacityInFrames().
These can be used to dynamically raise or lower latency.
Fix JavaDocs.

Bug: 21019153
Change-Id: I5c795c23826f7f29038d0de7004f4b7f365cd67e
Signed-off-by: Phil Burk <philburk@google.com>
ndroid_media_AudioTrack.cpp
03f61bbb2e7293592ad4a304b0f0b8e6ee8e6aac 17-Jan-2016 Phil Burk <philburk@google.com> Revert "Revert "AudioTrack: Add getUnderrunCount()""

This reverts commit 0ac70888d3f08b694e3e31939f2cfb90ce5e0f58.

The first revert was not needed. It was made to fix a broken build. But the break was from a different CL. SO I am reverting the revert.

Change-Id: Iad30209a38f9a0af18d684e44f033a49f32af778
ndroid_media_AudioTrack.cpp
0ac70888d3f08b694e3e31939f2cfb90ce5e0f58 17-Jan-2016 Phil Burk <philburk@google.com> Revert "AudioTrack: Add getUnderrunCount()"

This reverts commit e08c454a8929c13206833cb3422f136f4847a6ff.

JavaDoc error

Change-Id: Ic389be67c8fc8a365948984e9cc7648ee8058371
ndroid_media_AudioTrack.cpp
77e01bd3ad92eb2290e942a58042e08683b5acaf 17-Jan-2016 Phil Burk <philburk@google.com> Revert "AudioTrack: add setBufferSizeInFrames()"

This reverts commit adfb7f62dda47100e1023503d3492e4894f832fa.

Due to JavaDoc error

Change-Id: I41acaa83b7800f88f000291c8deba18d7394be94
ndroid_media_AudioTrack.cpp
e08c454a8929c13206833cb3422f136f4847a6ff 14-Jan-2016 Phil Burk <philburk@google.com> AudioTrack: Add getUnderrunCount()

This allows an app to detect application-level output glitches.

Change-Id: I4fb1eafff19a3dd776efae04ddd2e3514184d17f
Bug: 25641253
Signed-off-by: Phil Burk <philburk@google.com>
ndroid_media_AudioTrack.cpp
adfb7f62dda47100e1023503d3492e4894f832fa 08-Jan-2016 Phil Burk <philburk@google.com> AudioTrack: add setBufferSizeInFrames()

Also add getBufferCapacityInFrames().
These can be used to dynamically raise or lower latency.

Bug: 21019153
Change-Id: I3403982894c5fe101f45d0466b00ff3036b28417
Signed-off-by: Phil Burk <philburk@google.com>
ndroid_media_AudioTrack.cpp
56178b8fcbeed358ce2361708c0e91d6707ec016 15-Jan-2016 Richard Uhler <ruhler@google.com> Merge "Use NativeAllocationRegistry for Paint, Canvas, and Bitmap"
75431fbe361e16cfdc43c16cc65b86b8dab39e82 07-Jan-2016 Rubin Xu <rubinxu@google.com> Add JNI bridge to the new logd security buffer.

Bug: 26127031
Bug: 22860162
Change-Id: I14e08850ece7d9c0229b7213ee2e25cd089defc1
ndroid.mk
ndroidRuntime.cpp
ndroid_auditing_SecurityLog.cpp
c95d2d1bd6047cc8e246f80994c34dddd93801c0 14-Jan-2016 Leon Scroggins III <scroggo@google.com> Restore old behavior of setLocalMatrix

We updated the API of SkShader (changed in
https://codereview.chromium.org/1553743002) but the function still does
the same thing. As such, undo the changes in
f4eca05cdc19c095cdc0a9140d512737533a87c5 which call the method
differently.

BUG:26549769

This partially reverts commit f4eca05cdc19c095cdc0a9140d512737533a87c5.

Change-Id: I52f2fab7da748cfe351e2fa27ade24aa572176a7
ndroid/graphics/Shader.cpp
775873a66a946fae2b0535abb51df9817bd1b20c 29-Dec-2015 Richard Uhler <ruhler@google.com> Use NativeAllocationRegistry for Paint, Canvas, and Bitmap

Bug: 23130675
Change-Id: I3fbd84ba417ac63df75f87ee2c56e3e7f3c9eb46
ndroidRuntime.cpp
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Paint.cpp
ndroid_graphics_Canvas.cpp
8ee246b4c744ab83188ecf0e432c224901f913a0 12-Jan-2016 Mike Reed <reed@google.com> CreateLightingFilter is now on SkColorMatrixFilter

Change-Id: Ic53071aa5dc618ce1a72c531180d18304c7e522a
ndroid/graphics/ColorFilter.cpp
477e26cf931290f6b3353fab43a05406eea223f9 13-Jan-2016 Chris Craik <ccraik@google.com> Merge "Switch to new rendering pipeline"
c1a1823cb89052be3c7c941ca3d0279616b15783 13-Jan-2016 Thierry Strudel <tstrudel@google.com> Merge changes I96415ec6,I5d3aa7f9,I6294915e,I361928c0

* changes:
Report SwapPss in dumpsys meminfo when requested and available
Report SwapPss in am_pss reports
Add Swap and SwapPss to meminfo checkin dump.
Report SwapPss usage if available as part of Pss
de41d3cd5a28cce3ba7f0fa23ba7c41ef93b223d 13-Jan-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge changes from topic 'recordingcallback'

* changes:
Audio recording notification API
AudioManager event dispatcher: make more generic
3daf4d3272f2cc6ce3b5a572b9d4dcce1654086d 13-Jan-2016 Chris Craik <ccraik@google.com> Switch to new rendering pipeline

bug:22480459

Change-Id: I3ca94c4b6c556ba6d133e2314ac0307e874651fa
ndroid.mk
d3c71f075b139024e2bea39bbd75e3b976bfb7cb 07-Dec-2015 Jean-Michel Trivi <jmtrivi@google.com> Audio recording notification API

AudioService can register a recording callback with AudioSystem.
Callbacks are handled in a new class, RecordingActivityMonitor.
This class notifies registered AudioManager instances
of updates, only if this AudioManager has client callbacks.
Each AudioManager dispatches updates to its registered
callbacks.

Bug 22876530

Change-Id: I95c6e5ec0631e53af53a490bcecca96089490089
ndroid_media_AudioSystem.cpp
e1721099b5bbb6a1dbd50c1d6cd0cacb10159a59 05-Jan-2016 Derek Sollenberger <djsollen@google.com> Fix build breakage due to API update in SkShader.

bug: 25344771
Change-Id: I64198a77c75d6768091dafd5c045b02ef66dfdad
(cherry picked from commit f4eca05cdc19c095cdc0a9140d512737533a87c5)
ndroid/graphics/Shader.cpp
e076485754dc30f9f798fb1242e6f7d5a0b6d39b 08-Jan-2016 Martijn Coenen <maco@google.com> Report SwapPss usage if available as part of Pss

Parse "SwapPss:" lines from /proc/pid/smaps if it exist, and store them
in a seperate stat entry.
Report SwapPss if made available by kernel, otherwise we fall back to
legacy Swap.

Fix getTotalSwappablePss documentation.

Change-Id: I361928c0f44c7dc9b959b91c127c916215063866
Signed-off-by: Thierry Strudel <tstrudel@google.com>
ndroid_os_Debug.cpp
867b3396605421708dbcb0595b8954a3f96858ed 09-Jan-2016 Andy Hung <hunga@google.com> Merge "Add setMasterMono and getMasterMono"
f04b84d4c66ea377ec6fe2b36f3a0994f3e94eba 19-Dec-2015 Andy Hung <hunga@google.com> Add setMasterMono and getMasterMono

Bug: 15283594
Bug: 22700363
Change-Id: I5d0552938ec2a54be4450512974d92ff8c77b1e9
ndroid_media_AudioSystem.cpp
931fde4291afb05fca3d23214d19a883782ed22b 08-Jan-2016 Glenn Kasten <gkasten@google.com> Better fix for unregistered JNI method

Bug: 26445503
Change-Id: I0de5c34a86f14aeb786a12df8488511c4a280912
ndroid_media_AudioTrack.cpp
25d3c7c49bafb22723138bfab2e315d2d0a926fb 07-Jan-2016 Glenn Kasten <gkasten@google.com> Revert "Short-term fix for unregistered JNI method"

This reverts commit 7922be86e29002dc3714824b2b669a9760de0528.
ndroid_media_AudioTrack.cpp
8c04e18c9a69bee3e328ab41a8f2032c29fe6285 07-Jan-2016 Glenn Kasten <gkasten@google.com> Merge "Short-term fix for unregistered JNI method"
7922be86e29002dc3714824b2b669a9760de0528 07-Jan-2016 Glenn Kasten <gkasten@google.com> Short-term fix for unregistered JNI method

Bug: 26445503
Change-Id: Id40d4f026572538e3481d8e4c7142fd5489670a3
ndroid_media_AudioTrack.cpp
3b1b68d6c764a4f60d034e57a94879b7df65fd43 14-Dec-2015 Matt Sarett <msarett@google.com> Allow ninepatches to be encoded using non-RGBA modes

The original intention for forcing ninepatches to be encoded as
RGBA (with alpha) was to avoid the possibility of the decoder
producing 565 output.

565 output is bad for ninepatches because dithering tiny images
that we intend to scale later leads to bad results. I would
argue that, since the new BitmapFactory does not dither, we might
now be ok to allow 565 decodes for ninepatches. However, we
will maintain the old behavior by disabling 565 decodes for
ninepatch.

There are two changes to PNG encodings:
(1) Allows ninepatch images to be encoded in any mode. Forcing
them to RGBA makes things awkward for the decoder. Currently,
BitmapFactory's png decoder checks every pixel for alpha.
That way, RGBA images that are actually opaque can be marked
as opaque, in order to optimize drawing. We want to remove
this complexity from the decoder.
(2) Make sure ninepatch chunks are stored in the png header. That
way we know immediately that the png is a ninepatch, and can
refuse to decode to 565 (if we feel this is best).

Change-Id: I724f5dbefb1be7b412f9b362dff83cbc0603f0bf
ndroid/graphics/BitmapFactory.cpp
d713c9d65ac19b659b7fcb6b72f0d2c5d311559a 07-Jan-2016 Glenn Kasten <gkasten@google.com> Merge "Use FCC_2 and FCC_8 to highlight channel count assumptions"
225257abec534ac25275c4101ae1633f062b04b5 18-Dec-2015 Chien-Yu Chen <cychen@google.com> Camera: update connect call

Update connect call to include client PID.

Bug: 24511454
Change-Id: I20ddd5ea7419b786c70a901029e7677d62f0b708
ndroid_hardware_Camera.cpp
bd2c3d65d6b62b5a359268246e7ebe96904bd851 14-Dec-2015 Glenn Kasten <gkasten@google.com> Use FCC_2 and FCC_8 to highlight channel count assumptions

Bug: 21656069
Change-Id: I20a74575eddf6e28f1777d04eeab396f28bcc0cc
ndroid_media_AudioTrack.cpp
771bc90e435943d39ead9686febad4920a363026 05-Jan-2016 Roozbeh Pournader <roozbeh@google.com> Merge "Move Language normalization code from Paint.cpp to Minikin."
4fac76803050be83db9df07f5d37f70a7557b49a 05-Jan-2016 Roozbeh Pournader <roozbeh@google.com> Merge "Avoid matching system locales in locale negotiation"
4ea7d1d2ab51fd7f67087db669dbaf693560b838 15-Dec-2015 Seigo Nonaka <nona@google.com> Move Language normalization code from Paint.cpp to Minikin.

This is 2nd attempt of I277a08b5a17d45c3edb8fb597fdf6786bbe9f83b

The language code to BCP47 conversion is done by Minikin.

Also this CL addresses the signature changes by
I8df992a6851021903478972601a9a5c9424b100c

Bug: 26168983
Change-Id: Id106e9bb5c3eaa6652b44a1735f427accaca1368
ndroid/graphics/FontFamily.cpp
ndroid/graphics/Paint.cpp
e3b8f255cf8e74cccaee49235333994f51852125 04-Jan-2016 Matt Sarett <msarett@google.com> Merge "Make BitmapFactory.Options API Changes"
5e2496bcee239ce9ebeff6022b7badf81d87492c 18-Dec-2015 Matt Sarett <msarett@google.com> Make BitmapFactory.Options API Changes

This changes the documentation for inPreferQualityOverSpeed,
inDither, and requestCancelDecode().

These changes are a result of modifying the backends of
BitmapFactory and BitmapRegionDecoder to be faster, higher quality,
and to use standard libraries.

BUG:26266063
BUG:25556965
Change-Id: I9008fd276a38c737e242bcc6930ffe4e36d9fd1d
ndroid/graphics/BitmapFactory.cpp
1c686f2ce6cbfa3fdb598f452aa31d38f3eb2320 18-Dec-2015 Roozbeh Pournader <roozbeh@google.com> Avoid matching system locales in locale negotiation

Also:
1. Add AssetManager method for finding non-system locales: This is
used in per-app locale negotiation. (Normally,
AssetManager#getLocales() returns both system and non-system
locales.)

2. Match pseudolocales correctly in locale negotiation.

Bug: 25800576
Bug: 26236938
Change-Id: I116caf3a91c290deb4ad68b291c65b7035b18dd4
ndroid_util_AssetManager.cpp
91fc6d1f9cd5e83eec5753ef92960d03367c33a6 29-Dec-2015 Pavlin Radoslavov <pavlin@google.com> Merge "Use GID "wakelock" to control access to kernel wakelock"
am: 60d142c54b

* commit '60d142c54b16be08d8352c7fd1510538014839f7':
Use GID "wakelock" to control access to kernel wakelock
4bbc2931263b232fba61807fca00e127573eff42 02-Dec-2015 Doris Liu <tianliu@google.com> VectorDrawable native rendering - Step 3 of MANY

- Refactored VPathRenderer & VectorDrawableState
- Moved all the VD rendering into native
- Set up hooks for VD's property changes in JNI for animated VD

TODO: JNI calls can be further reduced when we convert the animation
in AVD to use RenderNodeAnimator, in which case animation will be
driven from native and therefore most of the JNI hooks for changing
VD's properties during animation will no longer be needed.

Change-Id: I52021f4d7bea057b83ace54085d870dd45acae0f
ndroid.mk
ndroidRuntime.cpp
ndroid_graphics_drawable_VectorDrawable.cpp
fbd5904ce690491b813ebf815a7e33083bc59ea0 24-Nov-2015 Pavlin Radoslavov <pavlin@google.com> Use GID "wakelock" to control access to kernel wakelock

* Added GID "wakelock" (3010) to the list of groups the System Server
belongs to.

* Added GID "wakelock" to the list of assigned groups for the
"android.permission.BLUETOOTH_STACK" Android permission.

* Grant CAP_BLOCK_SUSPEND to processes that belong to GID "wakelock"

Bug: 25864142
Change-Id: I8a9a5f11e4a9ecd1abf2d4f4b90ec89b3101332e
om_android_internal_os_Zygote.cpp
701662547341269d610ac5f093e449a4c7078e43 24-Nov-2015 Pavlin Radoslavov <pavlin@google.com> Use GID "wakelock" to control access to kernel wakelock

* Added GID "wakelock" (3010) to the list of groups the System Server
belongs to.

* Added GID "wakelock" to the list of assigned groups for the
"android.permission.BLUETOOTH_STACK" Android permission.

* Grant CAP_BLOCK_SUSPEND to processes that belong to GID "wakelock"

Bug: 25864142
Change-Id: I8a9a5f11e4a9ecd1abf2d4f4b90ec89b3101332e
om_android_internal_os_Zygote.cpp
f59c02a65e9fd529467c4e5083d94ed6453e70f7 24-Dec-2015 Narayan Kamath <narayan@google.com> Merge changes from topic \'aosp-merge-24-12\'
am: e0e81bf407

* commit 'e0e81bf407508ec096c752948f8794af5fd480ca':
Special case system_server to not create the JIT code cache.
Don't use IntegralToString
Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362.
Track API changes to java.lang.ref.Reference.
Remove merge markers from preloaded-classes
Move StrictJarFile from libcore to framework
Switch RecoverySystem impl to use sun.security.pkcs
API update for OpenJdk based libcore
Use libcore/known_oj_tags for the javadoc stage.
Stop preloading fortress classes
Use HexDump instead of java.lang.IntegralToString
Add core-oj to the list of core library jars.
a87723515627401f142aec1fd98b8863b726a1a3 11-Dec-2015 Nicolas Geoffray <ngeoffray@google.com> Special case system_server to not create the JIT code cache.

(cherry picked from commit 3c43b3863328e339dff90b216aed15194d129e4a)

Change-Id: Ic7b0887f9edcb950fad98ccbe66cab6949fbdc52
om_android_internal_os_Zygote.cpp
6a8ad6d161d6846311267f5e4aa933b8490bc821 03-Nov-2015 Przemyslaw Szczepaniak <pszczepaniak@google.com> Move StrictJarFile from libcore to framework

Bug: 25337946

(cherry picked from commit 8a7c1606d88873c5a1b5764c16cb046b6f2275b2)

Change-Id: I1bfce4129887d7cbfc02d92641b44920d7cdbbee
ndroid.mk
ndroidRuntime.cpp
ndroid_util_jar_StrictJarFile.cpp
c53d159b3e2cf96fe1fcf06c66bdb7011b65f46f 22-Dec-2015 Dimitry Ivanov <dimitry@google.com> Merge "Use shared namespace for bundled app classloader"
am: 76a9e55a8f

* commit '76a9e55a8fd751e747511a9c7d02dddca31964c3':
Use shared namespace for bundled app classloader
cd9a18c7f864901400c6017c892bfd3bc48c3a4b 17-Dec-2015 Robert Carr <racarr@google.com> Set SCALING_MODE_NO_SCALE_CROP for SurfaceView.

When resizing SurfaceView along with a main application window,
we want to be able to update the crop of the SurfaceView without waiting
for a buffer at a new size. If we fail to do so the SurfaceView may
extend beyond the edge of the host surface.

Bug: 26010823
Change-Id: I3bb52f82c02bb729a2494a3a43b9654d9aae9532
ndroid_view_Surface.cpp
5fa4d15d27d1a4610c0202b5ce89e41a13aa331f 21-Dec-2015 Pablo Ceballos <pceballos@google.com> Merge "Add GLES32 class and JNI"
44fadb21e0de195d7d950aeb8958875c9920006e 12-Dec-2015 Dimitry Ivanov <dimitry@google.com> Use shared namespace for bundled app classloader

Allow bundled apps to reference platform native libraries
located in subdirectories of the default library path
(/system/lib/hw/* for example).

In addition to this bundled apps need to share native
libraries with default namespace. Added parameter to
ApplicationLoaders.createClassLoader() to do just that.

Bug: 26165097
Bug: 26164393
(cherry picked from commit 75b10ecccdd1881390075dd22c1d4f9bdf1c5828)

Change-Id: I836e5fed4713f2a605a5de673c40970ef6d988dd
ndroid_app_NativeActivity.cpp
20e082c7dd83c2b61ac7f6b18141b06e05fa51b1 19-Dec-2015 Dimitry Ivanov <dimitry@google.com> Merge "Use shared namespace for bundled app classloader"
38c1a7e732660212687cf375f5e5ed354b91e431 30-Oct-2015 Pablo Ceballos <pceballos@google.com> Add GLES32 class and JNI

Change-Id: I05ff0c14a35f51c2015edbd762dc9e6fe43347b9
ndroid.mk
ndroidRuntime.cpp
ndroid_opengl_GLES32.cpp
8413db8c36f4ba5979cdc2b1c3e1429e6ba34d6a 14-Dec-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Change android.util.Log multiline logging

To avoid long stacktraces being truncated, add code to split up
large chunks along line breaks.

Introduce LineBreakBufferedWriter to chunk up log output. Add a
core test for it.

Change-Id: I34160fbce853c21329f7fa109a9c42506b2066af
ndroid.mk
ndroid_util_Log.cpp
5caba3360c03436ca52b7ddc081c293499ecee8c 17-Dec-2015 Chris Craik <ccraik@google.com> Merge "Add temporary switch for new renderer in JNI"
15d556e5d3729a287718c7be5c36079a7f8633c6 17-Dec-2015 Chris Craik <ccraik@google.com> Add temporary switch for new renderer in JNI

bug:22480459

Change-Id: I6cb19332cb09650f20b1cc2da3473a2618a50b1e
ndroid_view_DisplayListCanvas.cpp
d31512b9a6d9d6913b1d45ad2fb029a98c1804bf 09-Dec-2015 Matt Sarett <msarett@google.com> Clean-ups for BitmapRegionDecoder

Check for OOM after calling encodedFormatToString().

Do not correct Alpha8 to Gray8. This will be handled in Skia.

Change-Id: Id573548608fbd5fbeef2898844480d8f8f73e1d0
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
bf4b31f7b23b0bc7a2ed4fc779aac37c9c486eb2 16-Dec-2015 John Reck <jreck@google.com> resolve merge conflicts of 04ce46db64 to master.

Change-Id: I935bb47718f0e7d5fb48945dd8de6e28dac136e5
04ce46db647724b7c30c9a593bf717888d59081c 16-Dec-2015 John Reck <jreck@google.com> Merge "libhwui: make setSurface asynchronous"
am: 738a5d4f18

* commit '738a5d4f18e69c03700b77af0ea7e2a101da2c34':
libhwui: make setSurface asynchronous
738a5d4f18e69c03700b77af0ea7e2a101da2c34 16-Dec-2015 John Reck <jreck@google.com> Merge "libhwui: make setSurface asynchronous"
938562500707b461506191d1336f634037addd20 16-Dec-2015 Matt Sarett <msarett@google.com> Merge changes from topic 'BitmapFactory'

* changes:
Allow SkAndroidCodec to compute the decode color type and alpha type
Modify BitmapFactory to use SkAndroidCodec
Make NinePatchPeeker inherit from SkPngChunkReader
75b10ecccdd1881390075dd22c1d4f9bdf1c5828 12-Dec-2015 Dimitry Ivanov <dimitry@google.com> Use shared namespace for bundled app classloader

Allow bundled apps to reference platform native libraries
located in subdirectories of the default library path
(/system/lib/hw/* for example).

In addition to this bundled apps need to share native
libraries with default namespace. Added parameter to
ApplicationLoaders.createClassLoader() to do just that.

Bug: 26165097
Bug: 26164393
Change-Id: I833b4f758c4df8f8958d72eafd5d47ef14079ce1
ndroid_app_NativeActivity.cpp
d4eaef7f4c5a5d281de4fff272cd33e892e26264 30-Oct-2015 Jun Mukai <mukai@google.com> Make public pointer icon API with custom icons.

BUG: 25778347, 23804184
Change-Id: If138b97c750c912e9848412c27b65004899961eb
ndroid_view_PointerIcon.cpp
ndroid_view_PointerIcon.h
9e7cd6351b8245d3b0eff902beb89dc4c6d3ed19 11-Dec-2015 Matt Sarett <msarett@google.com> Allow SkAndroidCodec to compute the decode color type and alpha type

This CL will not cause a behavior change. SkAndroidCodec implements
the same logic.

Change-Id: I81ef12748d165f4c7a6e86a6e2562a949378940a
ndroid/graphics/BitmapFactory.cpp
b8adc9a37fc92006ebc3c621316f4cd233d4bb83 02-Dec-2015 Matt Sarett <msarett@google.com> Modify BitmapFactory to use SkAndroidCodec

Change-Id: Ifa7c1e2f2a22a0af5426dacdc50a82beecf0e2e3
ndroid.mk
ndroid/graphics/AutoDecodeCancel.cpp
ndroid/graphics/AutoDecodeCancel.h
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapFactory.h
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/NinePatchPeeker.h
6f634e54c8296223c1a72324a1f299ee1b4111a6 23-Nov-2015 Leon Scroggins III <scroggo@google.com> Make NinePatchPeeker inherit from SkPngChunkReader

SkImageDecoder is being phased out. The SkImageDecoder::Peeker has been
repurposed as SkPngChunkReader, which is shared by SkImageDecoder and
SkCodec (SkImageDecoder's replacement). Make NinePatchPeeker inherit
from the new class, and make its SkImageDecoder mHost optional, so we
can easily switch to SkCodec.

Change-Id: I74eeb909d1a4f4fe928d079857f92c142351b496
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/NinePatchPeeker.h
93444eb74f9548231032405e7afb500c3ef3461d 14-Dec-2015 Nicolas Geoffray <ngeoffray@google.com> Merge "Special case system_server to not create the JIT code cache."
048a0db7b512326d0fae0efa7fef7ea2d17a3dd8 15-Nov-2015 Dmitriy Ivanov <dimitry@google.com> Use nativeloader to load NativeActivity

System apps are the exception and they can
access internal platform libraries (this
is needed for bundled apps to work correctly).

Also fix the way NativeActivity loads the native
library to correspond to the way BaseDexClassloader
does it.

Bug: http://b/22548808
Bub: http://b/25777936
Change-Id: Idc94cdded182ea2cb1cbebc76c336cc3394c7ebe
(cherry picked from commit 6f06ad7df1362e9e5b252689f452bdeee2e5af46)
ndroid.mk
ndroid_app_NativeActivity.cpp
e3ca5ac40d96c88818d2004a688c7d06877186b2 11-Dec-2015 Dimitry Ivanov <dimitry@google.com> Merge "Use nativeloader to load NativeActivity"
am: 317456bc52

* commit '317456bc520549cbc1ac4ad102df8b0d22b22a99':
Use nativeloader to load NativeActivity
6f06ad7df1362e9e5b252689f452bdeee2e5af46 15-Nov-2015 Dmitriy Ivanov <dimitry@google.com> Use nativeloader to load NativeActivity

System apps are the exception and they can
access internal platform libraries (this
is needed for bundled apps to work correctly).

Also fix the way NativeActivity loads the native
library to correspond to the way BaseDexClassloader
does it.

Bug: http://b/22548808
Bub: http://b/25777936
Change-Id: Idc94cdded182ea2cb1cbebc76c336cc3394c7ebe
ndroid.mk
ndroid_app_NativeActivity.cpp
3c43b3863328e339dff90b216aed15194d129e4a 11-Dec-2015 Nicolas Geoffray <ngeoffray@google.com> Special case system_server to not create the JIT code cache.

Change-Id: I7d2622f560435b2b6d133b0acd2659f3410acd2e
om_android_internal_os_Zygote.cpp
3fa667e22401bf3ba96957fe31167bf05d164c55 10-Dec-2015 Seigo Nonaka <nona@google.com> Introduce ttcIndex attribute into system font configuration.

ttcIndex is used for specifying index of the TrueType Collection.
No user visible change is expected with this CL.

BUG: 10861108
Change-Id: I76a1c890164bb55a7ece7b9c7db2ce2bac3f8b89
ndroid/graphics/FontFamily.cpp
0bcd0cb6b1193168fa2840855195347488daab9e 04-Dec-2015 Thomas Buhot <thomas.buhot@intel.com> libhwui: make setSurface asynchronous

On the critical path of the cold launch of applications
the main thread of the started application tells the RenderThread
to create a surface. This process is synchronous and blocks
the main thread of the application until the creation
of the EGLContext is complete.
As a consequence the launch time of the application is delayed
by time spent allocating the EGL Context in the RenderThread.

With this optimization the launch time of any application
is improved (for example settings by 20 to 40 ms).

Change-Id: Ibf47aaa0abb8dedf7aa00693073db3785d9d6b08
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
ndroid_view_ThreadedRenderer.cpp
228fa5f30fc9f7ec7d00742943b507465a40b46b 10-Dec-2015 Greg Hackmann <ghackmann@google.com> Return long long from get_zram_mem_used()

Commit 187a6aeb112ecbf85387a21ea75cf6beb3f9fc76 replaced atoll() with
fscanf("%ld"). Though unlikely, there could theoretically be 32-bit
devices with >2GB zram where the type difference matters.

Bug: 25951511

Change-Id: I902e27a214038fea1396185ef9a521316b0009f9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ndroid_os_Debug.cpp
7aa8aef5f6982805a455a9f057f693e7310d6db2 10-Dec-2015 Greg Hackmann <ghackmann@google.com> Merge "Prefer new zram ABI"
187a6aeb112ecbf85387a21ea75cf6beb3f9fc76 09-Dec-2015 Greg Hackmann <ghackmann@google.com> Prefer new zram ABI

Starting with Linux 4.1, reading from /dev/block/zram*/mem_used_total
logs this warning:

"Attribute mem_used_total (and others) will be removed. See zram
documentation."

mem_used_total and several related counters are now consolidated under a
new node mm_stat. Prefer that when it's available.

Bug: 25951511

Change-Id: I0862c3cd1af5d003158aca6be42db25e4bebe7c7
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ndroid_os_Debug.cpp
44581ff4db54bbaa30365ed210e67a0369576100 08-Dec-2015 Yin-Chia Yeh <yinchiayeh@google.com> Camera: add RAW_PRIVATE format

Also add necessary plumbing for RAW_PRIVATE to work for ImageReader.

Bug: 25596619
Change-Id: Ic90f3f44264ac46fae1fafbc27ac64b5319f0970
ndroid_view_Surface.cpp
cfc607cf57d453f977c9c4bf09b41ac481c4bbec 02-Dec-2015 Seigo Nonaka <nona@google.com> Introduce cache mechanism for LocaleList.

Setting the LocaleList to the native Paint object is not a lightweight
operation since it needs to propagate a string object to the native code
which then needs to parse it for making minikin language list.

To avoid performance regressions, cache the minikin language ID in
android.graphics.Paint and send the LocaleList with cached ID
instead of a string the next time native code is called.

BUG: 25122318
Change-Id: Ib5ce8bcff8a1c0a2b1a1c3d1868ea8be5a0e642f
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
fdadaa25eb602ae4ee6fa8e51146fe2296f91cb3 03-Dec-2015 Christopher Wiley <wiley@google.com> Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am: 0ded0da517 am: 4ff2cc0898
am: d295e94dad

* commit 'd295e94dade5123354761c5f2577913799b5b2c5':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
d295e94dade5123354761c5f2577913799b5b2c5 03-Dec-2015 Christopher Wiley <wiley@google.com> Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am: 0ded0da517
am: 4ff2cc0898

* commit '4ff2cc0898891488dce3917d105f15264b7742ce':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
4ff2cc0898891488dce3917d105f15264b7742ce 03-Dec-2015 Christopher Wiley <wiley@google.com> Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException"
am: 0ded0da517

* commit '0ded0da51743a24707bece4b0be05f49db3b9981':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
5c3252ec97977f9e554d9395527637069e4b71cd 23-Nov-2015 Matt Sarett <msarett@google.com> Change dependency to match renamed libjpeg-turbo

Change-Id: Ie5a88e0e011dc655cff564de28928938112a3073
ndroid.mk
00d70d36f998d67cf7ab8e2d3041b8f7354a96b3 03-Dec-2015 Matt Sarett <msarett@google.com> Merge "Merge new implementation of BitmapRegionDecoder."
a94fc5243721350787ad405a94a64eec5dc61f7c 22-Nov-2015 Christopher Wiley <wiley@google.com> Map Errors.h's UNEXPECTED_NULL to NullPointerException

Many native services reject null references with this status_t.
Map it to an appropriate exception for Java Binder clients.

Bug: 25615695
Change-Id: I16a4f44da35839892fc4d332f95382f06485b2a7
ndroid_util_Binder.cpp
8a7c1606d88873c5a1b5764c16cb046b6f2275b2 03-Nov-2015 Przemyslaw Szczepaniak <pszczepaniak@google.com> Move StrictJarFile from libcore to framework

Bug: 25337946
Change-Id: Ib4fac6fa9f534b8654e5ca158bbaedb2393772ba
(cherrypicked from 43ea2cc2a81926a6b2ca13d41f4eab089640129e)
ndroid.mk
ndroidRuntime.cpp
ndroid_util_jar_StrictJarFile.cpp
7dac5d5488855813035becc05a959b0365e81cad 21-Nov-2015 Chris Craik <ccraik@google.com> Merge "Initial text support in new reorderer/renderer"
a1717271caac5e8ea3808c331d4141ac01a42134 19-Nov-2015 Chris Craik <ccraik@google.com> Initial text support in new reorderer/renderer

Removes obsolete drawPosText codepath, and unifies text decoration behavior.

Change-Id: I9c563249ab688a3394445a0e7fe1b9d0661f6f7c
ndroid_graphics_Canvas.cpp
f58bc8d1591c614e2f021c73bf198a7f661f47fc 20-Nov-2015 Seigo Nonaka <nona@google.com> Merge "Make Paint.hasGlyph variation selector aware."
0faf1bc43cadc1c1ed0a5379573f260598dcf770 19-Nov-2015 Nicolas Geoffray <ngeoffray@google.com> Merge "Update framework code after new ART options." am: d7d2817ade am: 9da4055766
am: 5d5f055eb6

* commit '5d5f055eb6783dceb51cdb71630aac40feacfedd':
Update framework code after new ART options.
642c5da4f0bfdc40ba65e00d35e0f7486eb581d5 19-Nov-2015 Nicolas Geoffray <ngeoffray@google.com> Merge "Update framework code after new ART options." am: d7d2817ade
am: 9da4055766

* commit '9da4055766fc7acf81dcd238204589ea1f484d50':
Update framework code after new ART options.
5d5f055eb6783dceb51cdb71630aac40feacfedd 19-Nov-2015 Nicolas Geoffray <ngeoffray@google.com> Merge "Update framework code after new ART options." am: d7d2817ade
am: 9da4055766

* commit '9da4055766fc7acf81dcd238204589ea1f484d50':
Update framework code after new ART options.
9da4055766fc7acf81dcd238204589ea1f484d50 19-Nov-2015 Nicolas Geoffray <ngeoffray@google.com> Merge "Update framework code after new ART options."
am: d7d2817ade

* commit 'd7d2817ade8459a8f6872ff814d3208613502858':
Update framework code after new ART options.
1f979639c168ebdf77ad8d7771786fc321ce8234 27-Oct-2015 Matt Sarett <msarett@google.com> Merge new implementation of BitmapRegionDecoder.

This is a combination of the following 4 commits.

=====================================================================

Make SkBitmapRegionDecoder use SkAndroidCodec

The current implementation of SkBitmapRegionDecoder relies
on SkImageDecoder::decodeSubset() which itself relies on
forked copies of libjpeg and libpng.

This implementation has caused numerous correctness and memory
bugs, and also prevented us from updating to the latest
optimized versions of libjpeg-turbo and libpng.
https://docs.google.com/a/google.com/document/d/1w0vdC9sPPquwgJLY4wjBvzwm8QZIqIgg1q3tDEvOoUU/edit?usp=sharing

The SkAndroidCodec implementation fixes known correctness and
memory bugs, at least matches the performance of the
the old implementation (and in many cases improves upon it),
and uses standard copies of libjpeg-turbo and libpng.

In addition to improving region decodes, switching to new
copies of libjpeg-turbo and libpng will improve performance
of full image decodes significantly. Jpeg, in particular,
will be about 2x faster.

Change-Id: Ia51645009b243607d3022d49e8e0c82ec4e959bc

=====================================================================

Make JavaPixelAllocator and RCPAllocator implement SkBRDAllocator

This will allow us to optimize decodes when destination memory
is zero initialized.

Change-Id: I1e56cd5410d1e9b6544b0e47aac8da740bca5252

=====================================================================

Fix build by using SkBRDAllocator

Change-Id: Icf031409f0e58496d80b9bdc91def8ff97f7d0d2

=====================================================================

Fix bug in RecyclingPixelAllocator::copyIfNecessary()

This was exposed by a new test that I hope to add to
the BitmapRegionDecoderTests.

Change-Id: Ic5a32e095ff3ce457abab7216a8da1acf17db27b

=====================================================================

Depends on adding libjpeg-turbo to the manifest.
Change-Id: Ic8ffa339722bfa9f40f44f68d03ce9a3faef1ee2

Depends on update to Skia.
Change-Id: I4bdaacb8a04e2dee5e3eccc58033601384c77b7d

BUG:25424175
BUG:25344771
http://skbug.com/1243
http://skbug.com/4475
https://code.google.com/p/android/issues/detail?id=77195
http://skbug.com/4417
https://code.google.com/p/android/issues/detail?id=162760
http://skbug.com/4264
https://code.google.com/p/android/issues/detail?id=76976
http://skbug.com/4418
http://skbug.com/1282
https://code.google.com/p/android/issues/detail?id=189248
https://code.google.com/p/android/issues/detail?id=80316
https://buganizer.corp.google.com/u/0/issues/20224409
http://skbug.com/4319
http://skbug.com/4361
https://code.google.com/p/android/issues/detail?id=165546
https://code.google.com/p/android/issues/detail?id=81068
https://buganizer.corp.google.com/u/0/issues/22527238
https://buganizer.corp.google.com/u/0/issues/23731509
https://code.google.com/p/skia/issues/detail?id=4469
http://skbug.com/4360
http://skbug.com/4489
http://skbug.com/4490
ndroid.mk
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
cdf1dfff8f850da7b1ae3a34b78de7313064f5e0 19-Nov-2015 Nicolas Geoffray <ngeoffray@google.com> Update framework code after new ART options.

Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59
ndroidRuntime.cpp
57db2c0dc624e8f16fedfb0717b825959f648a69 19-Nov-2015 Andreas Gampe <agampe@google.com> resolve merge conflicts of e3ad4409a6 to master.

Change-Id: Idc19d27ee359e5434d55d9a29ecdb4b1e30cbfe1
b10a1d8a934365e2efd57069f6341bca450baba3 18-Nov-2015 Doris Liu <tianliu@google.com> Merge "VectorDrawable native rendering - Step 2 of MANY"
804618d0863a5d8ad1b08a846bd5319be864a1cb 17-Nov-2015 Doris Liu <tianliu@google.com> VectorDrawable native rendering - Step 2 of MANY

Introduced PathData in Java, which is effectively a thin layer around the
native instance. PathData holds the verbs and points which is being used
in path morphing/interpolation. The verbs and points can be interpreted
into skia path commands, which is now done in native and therefore saves
a handful of JNI calls during path creation.

Removed the old PathDataNode mechanism and changed the PathEvaluator
to use PathData instead.

Also added tests and a microbench. Also ran CTS tests for VectorDrawable
and AnimatedVectorDrawable, and passed all of the existing tests.

Change-Id: Ia166f5172ff031fe18b154327967f911a62caec1
ndroid_util_PathParser.cpp
e2c2eea6aa71e70705f257d6de0c6b736c7e7833 18-Nov-2015 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Make RuntimeAbort more expressive" am: b61d3dd8a7
am: a7e9f174c1

* commit 'a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c':
Frameworks/base: Make RuntimeAbort more expressive
e3ad4409a6c094b7464ffada770463f677dfd013 18-Nov-2015 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Make RuntimeAbort more expressive" am: b61d3dd8a7
am: a7e9f174c1

* commit 'a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c':
Frameworks/base: Make RuntimeAbort more expressive
a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c 18-Nov-2015 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Make RuntimeAbort more expressive"
am: b61d3dd8a7

* commit 'b61d3dd8a773be393c738675cff28fc799497535':
Frameworks/base: Make RuntimeAbort more expressive
bb1a96647a82df5a134bf631fc9db342e7ef61de 21-Oct-2015 Seigo Nonaka <nona@google.com> Make Paint.hasGlyph variation selector aware.

With this CL, Paint.hasGlyph returns true if the typeface supports
the passed code point and variation selector pair.

Bug: 11256006

Change-Id: If29cd0c5942dc78bd862804106e29539bdeee569
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
28d56151474bb97093a4bae482f7d8752030d8fa 18-Nov-2015 Jun Mukai <mukai@google.com> Merge "Introduce animated pointer icon for STYLE_WAIT."
808196f139e93395f1f331f6c7e92ddd66c05979 29-Oct-2015 Jun Mukai <mukai@google.com> Introduce animated pointer icon for STYLE_WAIT.

Change-Id: I893f8276e09351db6187c553f349008794b95690
ndroid_view_PointerIcon.cpp
ndroid_view_PointerIcon.h
b053cce7ae343feeb6c0908920692904f3b0b94c 18-Nov-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Make RuntimeAbort more expressive

Pass a message to FatalError, which will be more prominent in
aborts than "RuntimeAbort."

Change-Id: Icb3b8f50ca0cc15fd1346c530cd8e6452e951879
om_android_internal_os_Zygote.cpp
8d40c367b05f485cbf3492e8add7c00deba6809b 18-Nov-2015 Calin Juravle <calin@google.com> Merge "Remove obsolete profile handling from AndroidRuntime." am: 360e95a90d am: e20120031f
am: c3a70ce001

* commit 'c3a70ce0015e9117268040378c6adb6239ead897':
Remove obsolete profile handling from AndroidRuntime.
fa17e612911a131a356dd80cd4be801bdc6b39dd 16-Nov-2015 Erik Wolsheimer <ewol@google.com> Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c am: 7698dd970f
am: ae4ab3501a

* commit 'ae4ab3501a0400940ace2d0bfdf0d7021c740603':
Log errno when dup fd cannot be allocated BUG: 25165471
2fba776ee0227e54f750dc6b87c8ca1bc1fd556f 16-Nov-2015 Erik Wolsheimer <ewol@google.com> Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9
am: b45defae8e

* commit 'b45defae8e61a4fa3aba9dd08480861d10f5982a':
Log errno when dup fd cannot be allocated BUG: 25165471
211abad3b92b70dd094949c79f67e686c940fa0c 13-Nov-2015 Erik Wolsheimer <ewol@google.com> Log errno when dup fd cannot be allocated
BUG: 25165471

Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
ndroid/graphics/Bitmap.cpp
45f88d02deb8b78f72b7315b5d42567639ad7ece 16-Nov-2015 Mark Salyzyn <salyzyn@google.com> Merge "Revert "jni: is loggable speedup, not within signal"" am: 3c54ed00f3
am: c53dad8d16

* commit 'c53dad8d16c552d06ac4acb8ddbd937bda2d26d7':
Revert "jni: is loggable speedup, not within signal"
c53dad8d16c552d06ac4acb8ddbd937bda2d26d7 16-Nov-2015 Mark Salyzyn <salyzyn@google.com> Merge "Revert "jni: is loggable speedup, not within signal""
am: 3c54ed00f3

* commit '3c54ed00f390e0ce9c555eb517594628b362705f':
Revert "jni: is loggable speedup, not within signal"
3c54ed00f390e0ce9c555eb517594628b362705f 16-Nov-2015 Mark Salyzyn <salyzyn@google.com> Merge "Revert "jni: is loggable speedup, not within signal""
9f5de191e8eef87a0a6eca6d217db5302a6ba586 16-Nov-2015 Mark Salyzyn <salyzyn@google.com> Merge "Revert "jni: is loggable speedup, not within signal""
b761d048243e41889cbeb28256c07b3f649469bd 16-Nov-2015 Mark Salyzyn <salyzyn@google.com> Revert "jni: is loggable speedup, not within signal"

(cherry pick of commit 421d434818aae0977b5b044dd88555a2261efac1)

This reverts commit c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.

Bug: 25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
ndroid_util_Log.cpp
421d434818aae0977b5b044dd88555a2261efac1 16-Nov-2015 Mark Salyzyn <salyzyn@google.com> Revert "jni: is loggable speedup, not within signal"

This reverts commit c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.

Bug: 25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
ndroid_util_Log.cpp
c3a70ce0015e9117268040378c6adb6239ead897 16-Nov-2015 Calin Juravle <calin@google.com> Merge "Remove obsolete profile handling from AndroidRuntime." am: 360e95a90d
am: e20120031f

* commit 'e20120031fd573c3beef4892f6917ba1553db6a8':
Remove obsolete profile handling from AndroidRuntime.
e20120031fd573c3beef4892f6917ba1553db6a8 16-Nov-2015 Calin Juravle <calin@google.com> Merge "Remove obsolete profile handling from AndroidRuntime."
am: 360e95a90d

* commit '360e95a90dab2c2522aa3ba13c6b2a3df737e626':
Remove obsolete profile handling from AndroidRuntime.
360e95a90dab2c2522aa3ba13c6b2a3df737e626 16-Nov-2015 Calin Juravle <calin@google.com> Merge "Remove obsolete profile handling from AndroidRuntime."
4bc507851c42d33b8bbfc2d6ab603b79533a53da 14-Nov-2015 Chris Craik <ccraik@google.com> Merge "Add error check for float parsing and fix tests"
1e67f08963cc245660049b6a588483a148955e08 13-Nov-2015 Doris Liu <tianliu@google.com> Add error check for float parsing and fix tests

Change-Id: Ia4f4863d415536b3796edbcdb83c951b6cff02cf
ndroid_util_PathParser.cpp
530dcda9a5e0d3698e5c42956a6238eb55ae51e3 13-Nov-2015 Mark Salyzyn <salyzyn@google.com> Merge "jni: is loggable speedup, not within signal" am: 96e780c99c am: 33a0db92aa
am: 5f6b645985

* commit '5f6b6459853700c85d71906eb7b758a17ffb32ba':
jni: is loggable speedup, not within signal
5f6b6459853700c85d71906eb7b758a17ffb32ba 13-Nov-2015 Mark Salyzyn <salyzyn@google.com> Merge "jni: is loggable speedup, not within signal" am: 96e780c99c
am: 33a0db92aa

* commit '33a0db92aaf1f50cefaab0215b59e7e513f55d32':
jni: is loggable speedup, not within signal
33a0db92aaf1f50cefaab0215b59e7e513f55d32 13-Nov-2015 Mark Salyzyn <salyzyn@google.com> Merge "jni: is loggable speedup, not within signal"
am: 96e780c99c

* commit '96e780c99c46e805989b7f1d6486cef96c7d2c27':
jni: is loggable speedup, not within signal
c954fde0b6e31ec99509faf0bbc33c4c9e4d012a 10-Nov-2015 Mark Salyzyn <salyzyn@google.com> jni: is loggable speedup, not within signal

Speedup by telling __android_is_loggable interface it will not
be called within a signal handler. This saves two system calls.

Bug: 25563384
Change-Id: Ib8188641c8c76e5aa848476da98596be6b8e5040
ndroid_util_Log.cpp
cdd23f9d45ea2974c3f295754b89f5462bdd2c0d 11-Nov-2015 Doris Liu <tianliu@google.com> Add hooks in JNI to start using native path parsing

Change-Id: Iaa0d3c2c1936c248146ed7f186a13e8e79be818e
ndroid.mk
ndroidRuntime.cpp
ndroid_util_PathParser.cpp
9c99c7935d17115e94e183e040d97b818f0621b5 11-Nov-2015 Calin Juravle <calin@google.com> Merge "Parse method-trace properties only in debug builds." am: 8fa7e93050 am: 61abae774e
am: d75fdb6fe3

* commit 'd75fdb6fe3745805561dec630540e8449d97e2f8':
Parse method-trace properties only in debug builds.
d75fdb6fe3745805561dec630540e8449d97e2f8 11-Nov-2015 Calin Juravle <calin@google.com> Merge "Parse method-trace properties only in debug builds." am: 8fa7e93050
am: 61abae774e

* commit '61abae774e7cf3fd298ecab821692ac17417f4c5':
Parse method-trace properties only in debug builds.
61abae774e7cf3fd298ecab821692ac17417f4c5 11-Nov-2015 Calin Juravle <calin@google.com> Merge "Parse method-trace properties only in debug builds."
am: 8fa7e93050

* commit '8fa7e93050f5b3d7ccac8775fee302f1f4394d4f':
Parse method-trace properties only in debug builds.
92290b8963e55dac1be729dc2424b356794733e3 10-Nov-2015 Calin Juravle <calin@google.com> Parse method-trace properties only in debug builds.

Bug: 25612377
Change-Id: Ia1d8e6c5afbdd70486d5aa8c059e70e27b03367d
ndroidRuntime.cpp
4873103e7553b2525b1aede237c92181258aab12 10-Nov-2015 Pablo Ceballos <pceballos@google.com> Merge "jni: Regenerated EGL/GLES JNI files to support null arguments"
0d02bd8442f6c062130aa6b9e6be5f87fddf7fb3 07-Nov-2015 Roozbeh Pournader <roozbeh@google.com> Removed unused setLocale() method.

The setLocale() method in android.content.res.AssetManager was not
used. Removing it to reduce maintenance cost.

Change-Id: I1b168fe84c2465d1ebc2b62bb965eda885e1220a
ndroid_util_AssetManager.cpp
746f86815b241b5e5b7b1af899a5dc642ee5b020 06-Nov-2015 Matt Sarett <msarett@google.com> Rename SkBitmapRegionDecoder to BitmapRegionDecoder

This is temporary, we are planning to delete this class.
Renaming will allow us to have an SkBitmapRegionDecoder class
in Skia.

Change-Id: I8d24d481d4e8cf782f578fa6deb6e3245c998a37
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
6aff9068f91fdfef0bc55fda0721c180c0de9284 02-Oct-2015 Pablo Ceballos <pceballos@google.com> jni: Regenerated EGL/GLES JNI files to support null arguments

Bug 9321681

Change-Id: I397c1fbdfcc38a697b4f608546822a739e55e1d9
ndroid_opengl_EGL14.cpp
ndroid_opengl_GLES20.cpp
ndroid_opengl_GLES30.cpp
ndroid_opengl_GLES31.cpp
ndroid_opengl_GLES31Ext.cpp
a00acdd1b444d379c5f3699cd307f3a50f530194 06-Nov-2015 Sanket Agarwal <sanketa@google.com> Fix signature for a function in java (int (I) -> long (L) ).

Change-Id: Icd632ca9ba79be7f4dc322b35c25ca9f853258a3
ndroid_hardware_Radio.cpp
7058e4ca585a06462a495d021d61e1fd27f85cd2 08-Oct-2015 Sanket Agarwal <sanketa@google.com> Radio features for Automotive usecase.

1. Add clock to metadata - If the CAR does not have a clock (no network
or bad clock) then Radio RDS could be used as a proxy.
2. Add support for emergency announcement - If the CAR wants to make an
emergency announcement.
2.1 Add support for callbacks.

Bug: b/24807501
Bug: b/22701655

Change-Id: Ib3131de03a022181559fd31da6701d9d3fa8698d
(cherry picked from commit 659688a129189f2a9aa353ddf9e107d5f293c4ca)
ndroid_hardware_Radio.cpp
a76bafdc44b7f97a03a1e9f74c69f9a8514bc228 05-Nov-2015 Dan Albert <danalbert@google.com> Merge "Don\'t apply clang flag to gcc builds." am: d9a1b35df6 am: a41288b88f
am: e0bcc4efe9

* commit 'e0bcc4efe96f196104e6de681b28de295d70fb84':
Don't apply clang flag to gcc builds.
e0bcc4efe96f196104e6de681b28de295d70fb84 05-Nov-2015 Dan Albert <danalbert@google.com> Merge "Don\'t apply clang flag to gcc builds." am: d9a1b35df6
am: a41288b88f

* commit 'a41288b88f18273a61ed0af977408761598216cf':
Don't apply clang flag to gcc builds.
a41288b88f18273a61ed0af977408761598216cf 05-Nov-2015 Dan Albert <danalbert@google.com> Merge "Don\'t apply clang flag to gcc builds."
am: d9a1b35df6

* commit 'd9a1b35df62eddc56f69281aea1534d187b63205':
Don't apply clang flag to gcc builds.
0eadf57cadf2f39db1923c25767e4a00e7f00135 05-Nov-2015 Dan Albert <danalbert@google.com> Don't apply clang flag to gcc builds.

For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).

Bug: http://b/22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
ndroid.mk
8e6714ba2bc136f2e40b8b6af5704dc87fcde58e 04-Nov-2015 Calin Juravle <calin@google.com> Remove obsolete profile handling from AndroidRuntime.

Bug: 24698874
Change-Id: I61193800e8b1f285b0a8edd05a0430a3c779e5b1
ndroidRuntime.cpp
18896e08938bc1e1fcb7928996803af935b826b7 04-Nov-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 am: d6f3e38738
am: 87455c7397

* commit '87455c7397605fba4bf3ad04af8df3c599a7a6ba':
Limit persistent ashmem backed fds to a minimum of 128kB.
87455c7397605fba4bf3ad04af8df3c599a7a6ba 03-Nov-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029
am: d6f3e38738

* commit 'd6f3e38738c88821b28b2571d034fc1b189a35de':
Limit persistent ashmem backed fds to a minimum of 128kB.
ac465cef41bbc618bc81bd331deb7c845af9b8dd 03-Nov-2015 Nicolas Capens <capn@google.com> Assume OpenGL ES 2.0 support for qemu.gles > 0

Bug 25435727

Change-Id: I1d11c2f03849f1244bdd83e47aa53776acfba6fd
ndroid_view_DisplayListCanvas.cpp
95fc53b0293a6361c7ff8a412897a869f07664c6 03-Nov-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
am: 966d6040c6

* commit '966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
Limit persistent ashmem backed fds to a minimum of 128kB.
069fb3a03ad579ab3aa0ebcbe45a256f8185838f 03-Nov-2015 John Reck <jreck@google.com> Revert "Check GLES2 support using EGL instead of qemu.gles"

This reverts commit 0f897d2fea84c1632377b84f6241d54a8d85f7a3.

Change-Id: Iaf5b22b6b1a5bdb16dd0aaf674d90c09d1bc24a7
ndroid_view_DisplayListCanvas.cpp
8cee7c17119b204be88860feb812f2374d0de732 02-Nov-2015 Riley Andrews <riandrews@android.com> Limit persistent ashmem backed fds to a minimum of 128kB.

Bug 25256717

Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
ndroid/graphics/Bitmap.cpp
0f897d2fea84c1632377b84f6241d54a8d85f7a3 03-Nov-2015 Nicolas Capens <capn@google.com> Check GLES2 support using EGL instead of qemu.gles

Bug 25435727

Change-Id: I9b8816cc8bfc2567ac475888cd57f2b9e62dad4f
ndroid_view_DisplayListCanvas.cpp
602940dc6ee28cf570c1922493114b9f6916feb5 03-Nov-2015 Jeff Sharkey <jsharkey@google.com> Merge "Let's sprinkle some FastJNI into Resources."
46cfd93aa22b5a4acab4626c140415eef922445c 03-Nov-2015 Jeff Sharkey <jsharkey@android.com> Let's sprinkle some FastJNI into Resources.

Before:

benchmark us linear runtime
GetColor 14.9 ===========
GetInteger 19.9 ===============
GetLayoutAndTraverse 38.4 =============================
GetString 38.5 ==============================

After:

benchmark us linear runtime
GetColor 13.9 ==========
GetInteger 18.8 ==============
GetLayoutAndTraverse 38.1 =============================
GetString 38.2 ==============================

Change-Id: I8c20e14182d2645bc62a0e7fc6345e298b11933c
ndroid_util_AssetManager.cpp
ndroid_util_XmlBlock.cpp
2f40cdc5dc08797436d7cbd25fa392a7353f6c3c 03-Nov-2015 Jeff Sharkey <jsharkey@google.com> Merge "Let's sprinkle some FastJNI into Parcel."
0a7a913683cb52cc847d52e4217b6637646a3c49 03-Nov-2015 Jeff Sharkey <jsharkey@android.com> Let's sprinkle some FastJNI into Parcel.

Before:

benchmark ns linear runtime
ReadByte 918 ===========================
ReadInt 877 ==========================
ReadLong 880 ==========================
WriteByte 1002 ==============================
WriteInt 945 ============================
WriteLong 957 ============================
vm: app_process

After:

benchmark ns linear runtime
ReadByte 824 ===========================
ReadInt 780 =========================
ReadLong 780 =========================
WriteByte 895 =============================
WriteInt 907 ==============================
WriteLong 851 ============================
vm: app_process

Change-Id: I746fe8ea3607e29d86007bd144339c84b063c360
ndroid_os_Parcel.cpp
64e516f5fa56d71bf6b5076e5620c30dc5810ba1 29-Oct-2015 Rob Carr <racarr@google.com> Sync SurfaceView position changes to parent render.

In order to provide pixel perfect movement of SurfaceViews
'within' other views (e.g. scrolling) we need to be able to
synchronize the attached (parent window) painting with the
movement of the SurfaceView (recall, SurfaceViews are positioned
behind their attached windows and the parent must render a
transparent region for the SurfaceView to appear). Provide
a new WindowManager method to reposition an attaching window
(that is to say, a window which has an attached window like
SurfaceView) and defer the transaction until the parent frame.
SurfaceView is hooked up to use this for movement. This is still
'racy' in the hardware accelerated case as the render thread
could be on either side of dequeing the frame we are working on.

Bug: 22802885
Change-Id: I025d2bdcbe15c1c11047cc0dbca2cf2b7d67c632
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
f35b989d26bb98900f6c5fa2e586326b30b6e161 31-Jul-2015 Leon Scroggins III <scroggo@google.com> Merge six commits from master-skia to master

Also corrects some code under development behind the HWUI_NEW_OPS flags
to match the updated Skia API.

Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap

previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
previous-Change-Id: I85de3462ad1e4877784df38edc4bcd0acbd24e5e
Change-Id: Ide8e2f669e91a13c32521af3a16efdaa085c81d0
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
d8f904f256b82e48e9a85561eb96e15399b0b2d9 28-Oct-2015 Tom Hudson <tomhudson@google.com> Revert "Merge six commits from master-skia to master"

This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
550780745fa28ae9a87d02331841ca5ce4f9c763 31-Jul-2015 Leon Scroggins III <scroggo@google.com> Merge six commits from master-skia to master

Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap

Change-Id: I519f54f97321a7a365ea81a3b78cb03b9bdca021
previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
eba81d0f88f52ca097204ca526e796a83fdd57d5 26-Oct-2015 Derek Sollenberger <djsollen@google.com> Add missing include for SkPath

Change-Id: Ib1577714d0e5c7e7c7d0e6593debe30e78f0df59
ndroid/graphics/Paint.cpp
f8ae610e8ccdc22a843a062507508ee1ed040e88 23-Oct-2015 Adrian Roos <roosa@google.com> Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b am: 5e5f718d23
am: 989b719e64

* commit '989b719e649266f41353ff5266cabd5b42a297a5':
Revert "Revert "Track ashmem memory usage in Parcel""
989b719e649266f41353ff5266cabd5b42a297a5 23-Oct-2015 Adrian Roos <roosa@google.com> Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b
am: 5e5f718d23

* commit '5e5f718d236234f3a4bc5826dc805b6b8c53283c':
Revert "Revert "Track ashmem memory usage in Parcel""
a53bbb652b875e02ce8e5cfd55591adeac033417 23-Oct-2015 Adrian Roos <roosa@google.com> Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
am: 93a6b4c129

* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
Revert "Revert "Track ashmem memory usage in Parcel""
e1e654d09e2b2638b98612e05e879811401012f2 23-Oct-2015 Roozbeh Pournader <roozbeh@google.com> Merge "Pass the whole locale list down to Minikin."
0450565d9a6de0f0828c9ad8ce16c8645c6f394c 23-Oct-2015 Adrian Roos <roosa@google.com> Revert "Revert "Track ashmem memory usage in Parcel""

This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
ndroid_os_Parcel.cpp
ab49c51342effda610a6c5b151fd7705bf67e136 23-Oct-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 am: 07129d53b5
am: d3511518f9

* commit 'd3511518f927eead41fb33c56803104672dcffc2':
Revert "Track ashmem memory usage in Parcel"
d3511518f927eead41fb33c56803104672dcffc2 23-Oct-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0
am: 07129d53b5

* commit '07129d53b5380ec556fa14c7506a26b6776e629a':
Revert "Track ashmem memory usage in Parcel"
b402735fc0eb246233814bce76118fba99bb9f87 23-Oct-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
am: 09fd4ecf90

* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
Revert "Track ashmem memory usage in Parcel"
e2adb2cf0f2c90c77fab3f09285a92e05e70b567 23-Oct-2015 Ian Pedowitz <ijpedowitz@google.com> Revert "Track ashmem memory usage in Parcel"

This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
ndroid_os_Parcel.cpp
f036ead2a218ffa43697fcaa999b666a4c6d13cf 20-Oct-2015 Roozbeh Pournader <roozbeh@google.com> Pass the whole locale list down to Minikin.

Also, compute LocaleList's string representation at construction.
This is to further push the cost of doing costly operations related
to LocaleLists to construction time.

Change-Id: Ia55b8ce66b1088ff54cb42eb1e11149b5bd10f17
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
b531762c89e45b9ac5c401a2e90f9330bcdf629e 22-Oct-2015 Adrian Roos <roosa@google.com> Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0
am: fda65d780e

* commit 'fda65d780eea9f696b087deb8d532b87e44877b6':
Track ashmem memory usage in Parcel
655c12edb0312933249659ab6b23191adcba4fa3 22-Oct-2015 Adrian Roos <roosa@google.com> Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev
am: 33e1d376eb

* commit '33e1d376ebd643cba5b507d0005b87d49e246bb5':
Track ashmem memory usage in Parcel
ab3f9724035046d65124a72db2a09c824b3d5c67 21-Oct-2015 Adrian Roos <roosa@google.com> Track ashmem memory usage in Parcel

Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit 4701a496a5477a7de01fbc9eaf4af9812f83770c)
ndroid_os_Parcel.cpp
bc14a194e0d21232e41a86fcc2a014bec05a536b 22-Oct-2015 Adrian Roos <roosa@google.com> Merge "Track ashmem memory usage in Parcel"
4701a496a5477a7de01fbc9eaf4af9812f83770c 21-Oct-2015 Adrian Roos <roosa@google.com> Track ashmem memory usage in Parcel

Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
ndroid_os_Parcel.cpp
1d67f3d3f18c59927d4b96cad7939a599b0649f0 20-Oct-2015 Mathieu Chartier <mathieuc@google.com> Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b am: efa447e1ab
am: a6358d93a0

* commit 'a6358d93a0f1cbc6469c226f7a77858e00b7de77':
Fix read_mapinfo to recognize free list large object space
7acf8c21d848305400f645126918100f1d99f921 20-Oct-2015 Mathieu Chartier <mathieuc@google.com> Merge "Fix read_mapinfo to recognize free list large object space"
am: 59d548e1e5

* commit '59d548e1e54fa753d3776647b98dc34ea7c27685':
Fix read_mapinfo to recognize free list large object space
a6358d93a0f1cbc6469c226f7a77858e00b7de77 20-Oct-2015 Mathieu Chartier <mathieuc@google.com> Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b
am: efa447e1ab

* commit 'efa447e1ab5a51c96219fc1d6204c128dbbaf661':
Fix read_mapinfo to recognize free list large object space
df0cc41a7bfa480ce5584420bceda850ad0c56c8 20-Oct-2015 Mathieu Chartier <mathieuc@google.com> Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
am: 7f2deeeef5

* commit '7f2deeeef53887dcad74b8aed86936983353cec4':
Fix read_mapinfo to recognize free list large object space
2e2069d053d43767662953298e7781ffede79fa1 19-Oct-2015 Mathieu Chartier <mathieuc@google.com> Fix read_mapinfo to recognize free list large object space

Bug: 25081604

(cherry picked from commit 6421da8f46e2a60da55939d8a4f7d91ab286dfcf)

Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
ndroid_os_Debug.cpp
6421da8f46e2a60da55939d8a4f7d91ab286dfcf 19-Oct-2015 Mathieu Chartier <mathieuc@google.com> Fix read_mapinfo to recognize free list large object space

Bug: 25081604
Change-Id: Ie277fd964afcdc80b97432cbd611a8136a2059d7
ndroid_os_Debug.cpp
63afb863815a80b05c6f1acd6b0e99a3508540f4 19-Oct-2015 Pablo Ceballos <pceballos@google.com> Merge "Remove GLTrace support"
04cb787762a957aa3b978d73d7174072be0e5db1 19-Oct-2015 Seigo Nonaka <nona@google.com> Merge "Remove MinikinSkiaFont::GetGlyph."
78591f03b7314faf3626f2d40892419433aa8b58 17-Oct-2015 Ruben Brunk <rubenbrunk@google.com> am 462b8b39: am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation.

* commit '462b8b3986fd194e08c78d66b6cc547af7388830':
Fix lens shading map origin calculation.
462b8b3986fd194e08c78d66b6cc547af7388830 17-Oct-2015 Ruben Brunk <rubenbrunk@google.com> am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation.

* commit '55dd957d87e847c1ae7d4ddeff68fdb0b18ee23b':
Fix lens shading map origin calculation.
7a027807a73aaa578d8f7a457438daac73158af0 17-Oct-2015 Ruben Brunk <rubenbrunk@google.com> am c03443b2: Fix lens shading map origin calculation.

* commit 'c03443b23de0b474080168d892cd685283c3285b':
Fix lens shading map origin calculation.
c03443b23de0b474080168d892cd685283c3285b 15-Oct-2015 Ruben Brunk <rubenbrunk@google.com> Fix lens shading map origin calculation.

Bug: 24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
ndroid_hardware_camera2_DngCreator.cpp
cb45c10b81e3cadd51da9c728bd21e5ec5e74054 16-Oct-2015 Chris Craik <ccraik@google.com> Merge "Use FastJNI for trivial MotionEvent native methods"
0fc1065af7e923540e3f693fa2b64e368b604c93 16-Oct-2015 Chris Craik <ccraik@google.com> Use FastJNI for trivial MotionEvent native methods

Change-Id: I97d0643a6e34cb66ca5b5948ed47ebfee14fc038
ndroid_view_MotionEvent.cpp
78327393ac6840ec6494c023f1513aa7b10b77bb 16-Oct-2015 Chris Craik <ccraik@google.com> Merge "Rename DisplayListData to DisplayList"
afae1463b3870d989e2e83428f384af398496c44 16-Oct-2015 Chris Craik <ccraik@google.com> Merge "Revert "Use FastJNI for trivial MotionEvent native methods""
526cf826528e2a31923cee4640d009370c7cefb9 16-Oct-2015 Chris Craik <ccraik@google.com> Revert "Use FastJNI for trivial MotionEvent native methods"

This reverts commit a44cd33b98ed011a62a912406eddc051f8b3ded1.

Change-Id: I9a907b0a880368dd61b481b642b50ab57ad08de8
ndroid_view_MotionEvent.cpp
003cc3dec8e2a92e51086fbcd5ee1bb236efa701 16-Oct-2015 Chris Craik <ccraik@google.com> Rename DisplayListData to DisplayList

Change-Id: I25f6bb88ffdf9baf7e8e4e2a294aa8c9d2a4605b
ndroid_view_RenderNode.cpp
c4c7aa14afa704952babd9808b8fc17e4f96890e 16-Oct-2015 Chris Craik <ccraik@google.com> Merge "Use FastJNI for trivial MotionEvent native methods"
cbc4e08fb53aacbe028228086d7344780fe81129 16-Oct-2015 Rob Carr <racarr@google.com> Merge "Revert "Sync SurfaceView position changes to parent render.""
7e1d861a9a3f76e1f79eb6806d4aa8bbeb560773 16-Oct-2015 Rob Carr <racarr@google.com> Revert "Sync SurfaceView position changes to parent render."

This reverts commit 6104dc95606b3399356dd011ca6d71fcd954154c.

Change-Id: If9d709bc65e7a817bd2c1b5768c7c33a9317638f
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
70b7073fea4f1a342aeb19ea9ebe2d472ada2b99 16-Oct-2015 Rob Carr <racarr@google.com> Merge "Sync SurfaceView position changes to parent render."
6104dc95606b3399356dd011ca6d71fcd954154c 28-Sep-2015 Robert Carr <racarr@google.com> Sync SurfaceView position changes to parent render.

In order to provide pixel perfect movement of SurfaceViews
'within' other views (e.g. scrolling) we need to be able to
synchronize the attached (parent window) painting with the
movement of the SurfaceView (recall, SurfaceViews are positioned
behind their attached windows and the parent must render a
transparent region for the SurfaceView to appear). Provide
a new WindowManager method to reposition an attaching window
(that is to say, a window which has an attached window like
SurfaceView) and defer the transaction until the parent frame.
SurfaceView is hooked up to use this for movement. This is still
'racy' in the hardware accelerated case as the render thread
could be on either side of dequeing the frame we are working on.

Change-Id: Ic33915043380ab8cd9eb4920e224b35234ed867d
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
1db5397d88e722b1ab82ccb2b429ceec1179ccd8 12-Sep-2015 Jun Mukai <mukai@google.com> Allow changing mouse pointer icon for the current context.

Right now, it only supports I-beam on EditText, but further
rules will come in the future.

The png files for the icons are from chromium.

Bug: 24180385
Change-Id: I8de4ec8a5412b4830c08aa232c5083841c5c751c
ndroid_view_PointerIcon.h
2d047808039b4848550159720bfb64e7b55e6e5a 13-Oct-2015 Seigo Nonaka <nona@google.com> Remove MinikinSkiaFont::GetGlyph.

MinikinSkiaFont::GetGlyph is no longer used and MinikinFont:GetGlyph
interface is removed by I13398503841ac06f930b04815017d4b33338efa1.
No behavior chnages are expected with this CL.

Change-Id: I8496aad446c6809f74a5effc7ef1baa25c4381b8
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinSkia.h
97c9c484959bd4b2fc6bac99c544d8b562e8f1c8 15-Oct-2015 Roozbeh Pournader <roozbeh@google.com> am f12a7499: am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev

* commit 'f12a7499dee29904ef15d4f7f9ef60e0ebc4c341':
Load binary hyphen data files
9407aa7cf0b369d31bd6c69f9c26bdf6a1f44fe9 15-Oct-2015 Roozbeh Pournader <roozbeh@google.com> am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev

* commit '63aa02e47fa0fdd877b9fde7f1f6eda75b645f92':
Load binary hyphen data files
35e026929b10bf05c4c78fce6f05d7569972c5cb 01-Sep-2015 Raph Levien <raph@google.com> Load binary hyphen data files

Support for loading the pre-compiled binary format for hyphenation
patterns.

Bug: 21562869
Bug: 21826930
Bug: 24570591
Change-Id: Iaeaa9c9ac9dac236af6b0d7894c2e2396bc8447d
(cherry picked from commit 091dba2de1e5fa7d4db9f8ccbf1f86e5825d0f52)
ndroid_text_StaticLayout.cpp
a44cd33b98ed011a62a912406eddc051f8b3ded1 13-Oct-2015 Chris Craik <ccraik@google.com> Use FastJNI for trivial MotionEvent native methods

Change-Id: I4f1b1ee913e994808986fc177da5857c902f8976
ndroid_view_MotionEvent.cpp
4ffea4e4da10c14203a690d67cadf5b39489f84c 13-Oct-2015 Adam Lesinski <adamlesinski@google.com> am d0c806b1: am 6029dfa8: am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"

* commit 'd0c806b10c8e45dcfa950adc36742b15edababea':
Make 'idmap --scan' accept more than one input directory
6029dfa81a01ab41318a8e9601448387179f8703 12-Oct-2015 Adam Lesinski <adamlesinski@google.com> am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"

* commit '7caa8f14a78d279e0392089dca2f54f27e7f5d15':
Make 'idmap --scan' accept more than one input directory
83ab0d7c1824f3a29e41af8a95a954c73f48c287 20-Mar-2015 Mårten Kongstad <marten.kongstad@sonymobile.com> Make 'idmap --scan' accept more than one input directory

The 'idmap --scan' command was limited to only scan a single directory
for overlay packages. Update idmap to support any number of directories.

Change-Id: I851f5720a3c1d844235911a0833670652a20a3c8
ndroid_util_AssetManager.cpp
a4d4e82927ceadc23863e74b7e1160e4497504a7 05-Oct-2015 Pablo Ceballos <pceballos@google.com> Remove GLTrace support

GLTrace is defunct, it does not support newer GL features, breaks
security requirements, and has no supported tooling now that Eclipse
is at end of life.

Bug 22329852

Change-Id: I64c58464f8c2c7ae6125f5d5c7884e3fd34d68ea
ndroid/opengl/util.cpp
0dba1f611410e5075a910fb73ff3d3c703bbc5ce 05-Oct-2015 John Reck <jreck@google.com> FastJNI canvas

Change-Id: Iae33a4785e52efe6f8bbe5bee258f4df830feceb
ndroid_graphics_Canvas.cpp
ndroid_view_DisplayEventReceiver.cpp
ndroid_view_DisplayListCanvas.cpp
dbffd250003e60c0f11ac3ad2b63f91f67962610 01-Oct-2015 John Reck <jreck@google.com> Fix Paint's JNI

Bug: 22409077
Change-Id: I99e1a11bf14f5b62c41107528f573eaf9f2d4b2f
ndroid/graphics/Paint.cpp
b816087962aba0019b022303330f03b897b580ed 22-Sep-2015 Skuhne <skuhne@google.com> Rendering the window frame with a second thread

Using a multi threaded render node to render the window frame
asynchronously from the application relayout.

Bug: 22527834
Bug: 24400680
Bug: 24459827
Bug: 24409773
Bug: 24537510
Change-Id: I1010fc6a8b6e38424178140afa3ca124433ab7e4
ndroid_view_ThreadedRenderer.cpp
f8f9c10247b32c0075f0e0e30c1f38d7a61a030d 01-Oct-2015 Raph Levien <raph@google.com> Merge "Load binary hyphen data files"
091dba2de1e5fa7d4db9f8ccbf1f86e5825d0f52 01-Sep-2015 Raph Levien <raph@google.com> Load binary hyphen data files

Support for loading the pre-compiled binary format for hyphenation
patterns.

Bug: 21562869
Bug: 21826930
Change-Id: Iaeaa9c9ac9dac236af6b0d7894c2e2396bc8447d
ndroid_text_StaticLayout.cpp
2c53a0759742eeec8f123ad81b7a26aef222c378 29-Sep-2015 Keisuke Kuroyanagi <ksk@google.com> Merge "Consolidate native methods for text measurement."
536afe6ef79a663e59c3b9781c561f7029ee9319 29-Sep-2015 Keisuke Kuroyanagi <ksk@google.com> Consolidate native methods for text measurement.

Bug: 24505153

Change-Id: I6a00b0516442f7d6108ed0598516365310bd85e8
ndroid/graphics/Paint.cpp
f05de8f3b245ba5d788831e41684668d215968dd 28-Sep-2015 Dan Willemsen <dwillemsen@google.com> am cd72b8be: am f21beb12: am 899110f3: Merge "Add exported include dir for libandroid_runtime"

* commit 'cd72b8be4653841f34a8d757cf27b055f40105bd':
Add exported include dir for libandroid_runtime
cd72b8be4653841f34a8d757cf27b055f40105bd 28-Sep-2015 Dan Willemsen <dwillemsen@google.com> am f21beb12: am 899110f3: Merge "Add exported include dir for libandroid_runtime"

* commit 'f21beb12f95b311ae20f2b5058252eb386a8b7b8':
Add exported include dir for libandroid_runtime
f21beb12f95b311ae20f2b5058252eb386a8b7b8 28-Sep-2015 Dan Willemsen <dwillemsen@google.com> am 899110f3: Merge "Add exported include dir for libandroid_runtime"

* commit '899110f3012eb9ab2056d8ee182d5bdab0ecae19':
Add exported include dir for libandroid_runtime
81944da434de1966670242638edd2a5d4547e0b4 25-Sep-2015 Dan Willemsen <dwillemsen@google.com> Add exported include dir for libandroid_runtime

The libnativehelper global include dir is being removed.

Bug: 18903857
Change-Id: I6f1bed76372ccedbe7feb4d215ba8c1c0fc0a87f
ndroid.mk
434a481b2191562582c79be29f24c2e0b5ca60d0 24-Sep-2015 Elliott Hughes <enh@google.com> am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

* commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5':
constify JNINativeMethod function pointer tables
ea1831d211ea0e6b2d161c714bb0786369ef2df5 24-Sep-2015 Elliott Hughes <enh@google.com> am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
constify JNINativeMethod function pointer tables
b57dd722f1dc0663417da37d3a82f8283ad3c982 24-Sep-2015 Elliott Hughes <enh@google.com> resolved conflicts for a884d81e to stage-aosp-master

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
76f6a86de25e1bf74717e047e55fd44b089673f3 19-Sep-2015 Daniel Micay <danielmicay@gmail.com> constify JNINativeMethod function pointer tables

Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
ndroidRuntime.cpp
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/CanvasProperty.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/FontFamily.cpp
ndroid/graphics/Interpolator.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/PathMeasure.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/SurfaceTexture.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Xfermode.cpp
ndroid/graphics/YuvToJpegEncoder.cpp
ndroid/graphics/pdf/PdfDocument.cpp
ndroid/graphics/pdf/PdfEditor.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
ndroid/opengl/util.cpp
ndroid_animation_PropertyValuesHolder.cpp
ndroid_content_res_ObbScanner.cpp
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteConnection.cpp
ndroid_database_SQLiteDebug.cpp
ndroid_database_SQLiteGlobal.cpp
ndroid_ddm_DdmHandleNativeHeap.cpp
ndroid_graphics_Canvas.cpp
ndroid_graphics_Picture.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_SensorManager.cpp
ndroid_hardware_SerialPort.cpp
ndroid_hardware_SoundTrigger.cpp
ndroid_hardware_UsbDevice.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_hardware_UsbRequest.cpp
ndroid_hardware_camera2_CameraMetadata.cpp
ndroid_hardware_camera2_DngCreator.cpp
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
ndroid_hardware_camera2_legacy_PerfMeasurement.cpp
ndroid_hardware_location_ActivityRecognitionHardware.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_RemoteDisplay.cpp
ndroid_media_ToneGenerator.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_net_NetUtils.cpp
ndroid_net_TrafficStats.cpp
ndroid_opengl_EGL14.cpp
ndroid_opengl_EGLExt.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
ndroid_opengl_GLES30.cpp
ndroid_opengl_GLES31.cpp
ndroid_opengl_GLES31Ext.cpp
ndroid_os_Debug.cpp
ndroid_os_MessageQueue.cpp
ndroid_os_SELinux.cpp
ndroid_os_SystemClock.cpp
ndroid_os_SystemProperties.cpp
ndroid_os_Trace.cpp
ndroid_os_UEventObserver.cpp
ndroid_server_NetworkManagementSocketTagger.cpp
ndroid_text_AndroidBidi.cpp
ndroid_text_AndroidCharacter.cpp
ndroid_text_StaticLayout.cpp
ndroid_util_AssetManager.cpp
ndroid_util_EventLog.cpp
ndroid_util_FileObserver.cpp
ndroid_util_Log.cpp
ndroid_util_StringBlock.cpp
ndroid_util_XmlBlock.cpp
ndroid_view_DisplayEventReceiver.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_InputChannel.cpp
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputEventSender.cpp
ndroid_view_KeyCharacterMap.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_RenderNode.cpp
ndroid_view_RenderNodeAnimator.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_SurfaceSession.cpp
ndroid_view_TextureView.cpp
ndroid_view_ThreadedRenderer.cpp
ndroid_view_VelocityTracker.cpp
om_android_internal_content_NativeLibraryHelper.cpp
om_android_internal_net_NetworkStatsFactory.cpp
om_android_internal_os_Zygote.cpp
om_android_internal_util_VirtualRefBasePtr.cpp
om_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp
om_google_android_gles_jni_EGLImpl.cpp
om_google_android_gles_jni_GLImpl.cpp
fe1f99c2b292c90236d7e907c8a86bab0b90bfe4 22-Sep-2015 Stefan Kuhne <skuhne@google.com> Merge "MultiThreaded rendering of different renderNodes"
ea7a7fb75acb7305eb774ca7bc7e96103bd49323 28-Aug-2015 Skuhne <skuhne@google.com> MultiThreaded rendering of different renderNodes

This is adding the renderer side infrastructure to allow
rendering multiple render nodes with different threads.
This is a pre-step for decoupling a non client decor
resize reder from a content resize render.

Multiple render nodes can be added to be drawn, and to
prevent overdrawing, a content bounds area can be set

Bug: 22527834

Change-Id: Ie7271e20895bf38957e5a84aeefc883e282039ad
ndroid_view_ThreadedRenderer.cpp
1fa606b86712c0d6e1668d41d90a3329eea31040 19-Sep-2015 Matthew Dempsky <mdempsky@google.com> Eliminate uses of Skia's SkDELETE macro

Skia no longer uses these macros internally. They're now only
provided for backwards compatibility, so remove their uses within
Android.

See thread on skia-discuss:
https://groups.google.com/d/msg/skia-discuss/l9TSgpYCHpU/sNpA1y8YCQAJ

Change-Id: Ia7313f5bbdf4d2d9fb4a10fc5bdc1572e6b84f6c
ndroid/graphics/BitmapRegionDecoder.cpp
3aa8ede9e17aad7c9f9e19c90d00e571109c5bb1 16-Sep-2015 Pablo Ceballos <pceballos@google.com> Merge "Implement single buffer mode using setMaxBufferCount"
ab5bca1519cb9acb4fd140e99a250fc50868ff2f 09-Sep-2015 Tao Bai <michaelbai@google.com> Merge "Load app resource as shared library."
a6d7e3fb9c9233b9ae46b702d17433854c43d6a0 02-Sep-2015 Tao Bai <michaelbai@google.com> Load app resource as shared library.

- Added aapt command line flag --app-as-shared-lib to build app resources
that could be loaded as shared lib at runtime.
- Added new method AssetManager.addAssetPathAsSharedLibrary() to load an
app resource as shared library.

Bug 22487604

Change-Id: Ib9b33c35f9c2b7129f3ba205de03d4564623ea39
ndroid_util_AssetManager.cpp
4b4d29a6fa63b685ec107af90766d5ea16566151 04-Sep-2015 Dan Stoza <stoza@google.com> am 8dcd14cd: am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev

* commit '8dcd14cdc95a5b71597fa428b9c2a45c3a86944c':
SurfaceControl: Add colorTransform to DisplayInfo
8dcd14cdc95a5b71597fa428b9c2a45c3a86944c 04-Sep-2015 Dan Stoza <stoza@google.com> am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev

* commit '4a90942ea75039f916d8371111fdc41a80039b98':
SurfaceControl: Add colorTransform to DisplayInfo
db8a6ee56b8e40d0a743e929739fb19a8b3ec456 04-Sep-2015 Sharvil Nanavati <sharvil@google.com> am 80770c09: am 16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev

* commit '80770c099144b65e9c7768bbdb56608eebf03b01':
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
f615872cb49062de9113c7c5be31d3b1d1b423af 04-Sep-2015 Dan Stoza <stoza@google.com> am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev

* commit '0b887e579b766012c09626e7089a3fade5415ee6':
SurfaceControl: Add colorTransform to DisplayInfo
16db4101829c7beee42a09fcaf87fa4e31bc1d5a 03-Sep-2015 Sharvil Nanavati <sharvil@google.com> Merge "DO NOT MERGE Add 'bluetooth' user to the 'system' group." into cw-e-dev
904f485bc6013060e81b627be61314b3d7fe5ef8 31-Aug-2015 Dan Stoza <stoza@google.com> SurfaceControl: Add colorTransform to DisplayInfo

Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.

Bug: 20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
ndroid_view_SurfaceControl.cpp
e442b63c837c8852546f9fa7ba28985e8eea7290 20-Aug-2015 Pablo Ceballos <pceballos@google.com> Implement single buffer mode using setMaxBufferCount

Bug 13174928

Change-Id: I5319c3d7d07b8ddeaf8fd8e8efe0dbfb58d5c1ac
ndroid/graphics/SurfaceTexture.cpp
6d444185e55315a0111162609b1f619ee268bf3a 02-Sep-2015 Yasuhiro Matsuda <mazda@google.com> resolved conflicts for merge of fcf9ab5a to master

Change-Id: I69ad6e525430c5c4fc3c274b8bf6ebf653716124
fcf9ab5ab3e158cea2559ed4e7274dbfeb0a6e77 02-Sep-2015 Yasuhiro Matsuda <mazda@google.com> am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master

* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
Add trace code to system server.
ebf9465d213336819b15e3b21d02afce64470d4f 02-Sep-2015 Yasuhiro Matsuda <mazda@google.com> resolved conflicts for merge of ef57e5e0 to stage-aosp-master

Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
ef57e5e03b042065e69c65e910065df7306d930c 02-Sep-2015 Yasuhiro Matsuda <mazda@google.com> Merge "Add trace code to system server."
1eaecf5c6dc692426f187b5e2edecc6ef3ea21c8 01-Sep-2015 Christopher Ferris <cferris@google.com> am 7dd51792: am d6597cb4: am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev

* commit '7dd51792e2131891d402b4f86c78afa86b6d5758':
Save/restore errno in SIGCHLD handler.
babe81546ef001ae26a5c4b572f1480ba737ae32 01-Sep-2015 Sharvil Nanavati <sharvil@google.com> DO NOT MERGE Add 'bluetooth' user to the 'system' group.

Also grant the Bluetooth process CAP_BLOCK_SUSPEND so it can acquire
wake locks directly from /sys/power/wake_lock.

Bug: 23375670
Change-Id: Ib094c5752d49488c2560897ff6bb821daf98a281
om_android_internal_os_Zygote.cpp
7dd51792e2131891d402b4f86c78afa86b6d5758 01-Sep-2015 Christopher Ferris <cferris@google.com> am d6597cb4: am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev

* commit 'd6597cb43c1985ec955f2f5c5daf7be52a9f12a2':
Save/restore errno in SIGCHLD handler.
a8a795428acf5cbe1cd348aa766243203ca78b80 01-Sep-2015 Christopher Ferris <cferris@google.com> Save/restore errno in SIGCHLD handler.

The SIGCHLD handler can set the errno, which can change the errno found
on the thread on which the signal handler is invoked. Most of the time
this is harmless, but it's possible that if the main thread was making
a system call, and allows certain failures based on errno, that logic
can fail. The fix is to save/restore errno in the handler.

Bug: 23572286
Bug: 23689391
Change-Id: I4542fd60cc1398ce0a8902d8df98a3d089fb6efe
om_android_internal_os_Zygote.cpp
847370ce61c08eefc1ada78339c2d112bb36c720 29-Aug-2015 Ruben Brunk <rubenbrunk@google.com> am 7ba74bf2: am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev

* commit '7ba74bf2600d3227521c4a1a61197df4a48cc805':
Fix DngCreator default crop calculations.
7ba74bf2600d3227521c4a1a61197df4a48cc805 29-Aug-2015 Ruben Brunk <rubenbrunk@google.com> am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev

* commit 'e65066d30eb52d2ef938501890ba4cf99d8f1b7b':
Fix DngCreator default crop calculations.
96990d0cdd7f7757ba16b927766854e0dc6fa994 28-Aug-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
a4ff47ced1ebed01722b77bc417d5a4eb51d0af9 27-Aug-2015 Ruben Brunk <rubenbrunk@google.com> Fix DngCreator default crop calculations.

Bug: 23591407
Change-Id: I1b0e46e7371b3db63e8d68230964d09d7537c3ce
ndroid_hardware_camera2_DngCreator.cpp
43c2091a65ff825071206d6cfd7b7b3caddcb6d0 28-Aug-2015 John Reck <jreck@google.com> Merge "Serializing display lists"
4803708270d067ca8dfe502a2ce8eb78536742eb 27-Aug-2015 Eric Laurent <elaurent@google.com> am 155c1ad1: am 38f6f487: am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()

* commit '155c1ad113dd6ec6bab9fdcb0934db255603237a':
AudioTrack: error reporting for getTimestamp()
aef51d09ef33eb3f03789c71edc25a7b103728d1 27-Aug-2015 Eric Laurent <elaurent@google.com> am 4a8034ca: AudioTrack: error reporting for getTimestamp()

* commit '4a8034caea13a90c01800ff554539772c6ff5523':
AudioTrack: error reporting for getTimestamp()
4a8034caea13a90c01800ff554539772c6ff5523 02-Jul-2015 Eric Laurent <elaurent@google.com> AudioTrack: error reporting for getTimestamp()

Add a new getTimestamp() method that returns an error code.

Bug: 21886109.
Bug: 22202349.
Bug: 17548098.

Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
(cherry picked from commit 4e1ccd370fc268f3207c5baee08ac8c943c3fdf9)
ndroid_media_AudioErrors.h
1ab43d5978813f56899dbd3115fd7d9f96b4fe55 30-Jun-2015 Yasuhiro Matsuda <mazda@google.com> Add trace code to system server.

- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.

BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327
ndroidRuntime.cpp
e248bd1b2c3fcf8088429507e73b31f45ee2544b 05-Aug-2015 John Reck <jreck@google.com> Serializing display lists

This is a WIP prototype

Change-Id: Id4bfcf2b7bf905221c3734b7b6887c9b2efd37e6
ndroid_view_ThreadedRenderer.cpp
2a4db1327ea4ccf9592eb4d842ec7db5d5ed59f2 26-Aug-2015 Matt Sarett <msarett@google.com> Build fix for change in skia headers

Change-Id: I3cfb15cd31186a90ee60f89035efa6b237c1d3ec
ndroid/graphics/HarfBuzzNGFaceSkia.cpp
a39f61359f6ae8816ef08e024c2b99d1833b5ed9 26-Aug-2015 Pablo Ceballos <pceballos@google.com> Merge "Explicitly construct all Rects"
61483d885a1746db2faae48d2d9d550545d47f38 24-Aug-2015 Eric Laurent <elaurent@google.com> Merge "AudioTrack: error reporting for getTimestamp()"
4e1ccd370fc268f3207c5baee08ac8c943c3fdf9 02-Jul-2015 Eric Laurent <elaurent@google.com> AudioTrack: error reporting for getTimestamp()

Add a new getTimestamp() method that returns an error code.

Bug: 21886109.
Bug: 22202349.
Bug: 17548098.

Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
ndroid_media_AudioErrors.h
86c03ca534755b2ed5fbbddabccb041f11eeacdf 21-Aug-2015 Chris Craik <ccraik@google.com> Fixup DisplayListCanvas jni variable names

Change-Id: I279833f5fe4525ebbab3330c5b36582560ca87e9
ndroid_view_DisplayListCanvas.cpp
3aadd60521960be063ee06208562ccb63dc414e3 20-Aug-2015 Chris Craik <ccraik@google.com> Revert "Revert "Simplify TextureView draw path""

Fixed build breakage

This reverts commit d35dcb13115ca1dd8c07e397f43a186cd7fd1a01.

Change-Id: Id3a103fbaac15a05f558bce2161ce17b6e8d2ea3
ndroid_view_DisplayListCanvas.cpp
ndroid_view_HardwareLayer.cpp
1262059c072375cd5bd48e86b7ee69d66848494d 20-Aug-2015 Elliott Hughes <enh@google.com> am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process"

* commit '260cb53fdb751dd6997b6b6f60a358257c4df82a':
zygote: fix memory leak when fork process
1ad545d207db840d0e403569ce214431eead4217 20-Aug-2015 Derek Sollenberger <djsollen@google.com> Fix path direction enum to match native SkPath values

Change-Id: I4010e400cef0baf6dd23d7f7e837a2bfb7154059
ndroid/graphics/Path.cpp
b03198de9f3c1e6f16367d25e9b2ae8bf540b379 20-Aug-2015 Ben Wagner <bungeman@google.com> Merge "Use static_assert instead of SK_COMPILE_ASSERT."
3b1c32eb5d96c9a13e101cc7207f27d045c6bd8b 20-Aug-2015 Bart Sears <bsears@google.com> Merge "Revert "Simplify TextureView draw path""
d35dcb13115ca1dd8c07e397f43a186cd7fd1a01 20-Aug-2015 Bart Sears <bsears@google.com> Revert "Simplify TextureView draw path"

This reverts commit 20a248934c67b19c8734362dba76a5cc94254686.

Change-Id: Iaa3ebb1d868acbe184080087aec312b43e87e3c7
ndroid_view_DisplayListCanvas.cpp
ndroid_view_HardwareLayer.cpp
45793a71e7449a54bda0b7248b2a9997aa9a1b5b 20-Aug-2015 Elliott Hughes <enh@google.com> am 31b1b276: am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process"

* commit '31b1b2766d80a9a1979488e57a49d1015cfb5538':
zygote: fix memory leak when fork process
31b1b2766d80a9a1979488e57a49d1015cfb5538 20-Aug-2015 Elliott Hughes <enh@google.com> am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process"

* commit '260cb53fdb751dd6997b6b6f60a358257c4df82a':
zygote: fix memory leak when fork process
ce4fbb4da675c447ec839deaad05c0e88701bc2c 20-Aug-2015 Elliott Hughes <enh@google.com> Merge "zygote: fix memory leak when fork process"
20a248934c67b19c8734362dba76a5cc94254686 19-Aug-2015 Chris Craik <ccraik@google.com> Simplify TextureView draw path

bug:20461288

Change-Id: I239fbd26ab2177481c84feb62a1da68faeb634ac
ndroid_view_DisplayListCanvas.cpp
ndroid_view_HardwareLayer.cpp
e3a40ea488c7cfa396d5901255719a6ddab791d4 19-Aug-2015 Ben Wagner <bungeman@google.com> Use static_assert instead of SK_COMPILE_ASSERT.

Now that static_assert is allowed, there is no need to use a non-
standard compile time assertion.

Change-Id: I0b294efcf494983f8241e9d5a2c476e2f2a9fff0
ndroid/graphics/Paint.cpp
ndroid/graphics/PorterDuff.cpp
d1cbc1608906302130158acc4c72c82c89b49e10 19-Aug-2015 Ben Wagner <bungeman@google.com> Use 'new' instead of 'SkNEW'.

There isn't any good reason for Android code to be using SkNEW,
and in some places it is potentially an issue. Also, SkNEW really
should be considered private to Skia at this point.

Change-Id: I35c675bd2c45b7a65c526508c202a30e30859491
ndroid/graphics/AvoidXfermode.h
1ca062f21e466b5e8b5defe12033c65b2b4276cb 31-Jul-2015 Mykola Kondratenko <mykola.kondratenko@sonymobile.com> zygote: fix memory leak when fork process

Release memory allocated by GetIntArrayElements.

Change-Id: If7ce2a78a480e58b0376352ce438dbe51f664f3a
om_android_internal_os_Zygote.cpp
4c5efe9290543b723b76a8bd48518da1ae1dcb26 10-Jul-2015 Derek Sollenberger <djsollen@google.com> Add ninePatch support to Canvas.h

Change-Id: Ic095291fe55911c6501c1bdefa4b8da973c77319
ndroid.mk
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_DisplayListCanvas.cpp
5fa6c7424a041e78a8d4976ec52ef6f684fa3270 18-Aug-2015 Sebastien Hertz <shertz@google.com> am 60a2716f: am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '60a2716f720e843a7de6e7209c2021d95538711e':
Allow debugging only for apps forked from zygote
60a2716f720e843a7de6e7209c2021d95538711e 18-Aug-2015 Sebastien Hertz <shertz@google.com> am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '3244dc229af4d4c8b764bf9ca1e108b5cd933d90':
Allow debugging only for apps forked from zygote
e95386852e70995e3356177c7e0d507fd1d01b65 18-Aug-2015 Sebastien Hertz <shertz@google.com> am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
Allow debugging only for apps forked from zygote
e9de1b4cef10922180cfe06049cf906160e2c315 18-Aug-2015 Sebastien Hertz <shertz@google.com> am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
Allow debugging only for apps forked from zygote
9a010d0a4157f97870bc38bd3dd0a8f4fd18a172 18-Aug-2015 Sebastien Hertz <shertz@google.com> Merge "Allow debugging only for apps forked from zygote" into mnc-dev
773bbe0357b17a16d095ce57c30980992a9c977f 18-Aug-2015 John Reck <jreck@google.com> Revert "Add ninePatch support to Canvas.h"

This reverts commit edca320a2b42011f98c308fdf25fc0494c6a5454.

Change-Id: I30ee93cfc1cac391ce152f03e9e13a1ad24dc91b
ndroid.mk
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_DisplayListCanvas.cpp
deead00082df4839e71026750e55c1af4d62782f 17-Aug-2015 Derek Sollenberger <djsollen@google.com> Merge "Add ninePatch support to Canvas.h"
db86989dfc569b9108249a74d85fafdcc76aefea 16-Aug-2015 Eino-Ville Talvala <etalvala@google.com> am 3a94b2d2: am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit '3a94b2d22e8346a884b2521f7e7682f2953d1515':
Camera2: Add camera type to getNumberOfCameras.
3a94b2d22e8346a884b2521f7e7682f2953d1515 16-Aug-2015 Eino-Ville Talvala <etalvala@google.com> am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit '028c2e4e264d1d2235e4d0f95d178fdf77510e7e':
Camera2: Add camera type to getNumberOfCameras.
eec25a4ffecc0c9a726aa284d29d0b7a1e58a888 16-Aug-2015 Eino-Ville Talvala <etalvala@google.com> am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
Camera2: Add camera type to getNumberOfCameras.
c964884eb73cd1c903809bfa3393fbf51f38a133 15-Aug-2015 Eino-Ville Talvala <etalvala@google.com> am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
Camera2: Add camera type to getNumberOfCameras.
827029228667507c69c7a430798d7ac88e438c33 08-Aug-2015 Pablo Ceballos <pceballos@google.com> Explicitly construct all Rects

Don't rely on the default constructor.

Bug 18173359

Change-Id: I182c54a49f5eba896ddcb15cec124ecd14f347f9
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
5717612ba9ac78021e81f5b45ca7903c318499f9 14-Aug-2015 Eino-Ville Talvala <etalvala@google.com> Camera2: Add camera type to getNumberOfCameras.

Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
ndroid_hardware_Camera.cpp
edca320a2b42011f98c308fdf25fc0494c6a5454 10-Jul-2015 Derek Sollenberger <djsollen@google.com> Add ninePatch support to Canvas.h

Change-Id: Ib3202fd7c5b9f35853f286abe84b3ed009df1a81
ndroid.mk
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_DisplayListCanvas.cpp
ae61c26534a3dd3a71bc4c7ab3993e6923f1a201 12-Aug-2015 Narayan Kamath <narayan@google.com> am 0d2e3d3e: am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.

* commit '0d2e3d3ea3cd1bd0f77b3fdd8da6b17261cdd799':
Fall back to persist.sys.language/country if locale isn't set.
0d2e3d3ea3cd1bd0f77b3fdd8da6b17261cdd799 12-Aug-2015 Narayan Kamath <narayan@google.com> am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.

* commit 'c42acbdb65d89b1e5fc1cafde4cbe0996c104f7a':
Fall back to persist.sys.language/country if locale isn't set.
d29382aaf0dc68eb5a41621fedabeca4406efe06 12-Aug-2015 Narayan Kamath <narayan@google.com> am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.

* commit 'bf88205bef88f78ade5c6830e6203aa343387820':
Fall back to persist.sys.language/country if locale isn't set.
86b6d204a5321bf2874c2cbee3452e674605c21f 12-Aug-2015 Narayan Kamath <narayan@google.com> am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.

* commit 'bf88205bef88f78ade5c6830e6203aa343387820':
Fall back to persist.sys.language/country if locale isn't set.
bf88205bef88f78ade5c6830e6203aa343387820 11-Aug-2015 Narayan Kamath <narayan@google.com> Fall back to persist.sys.language/country if locale isn't set.

This will prevent users from losing their language setting when they
take an OTA to M.

bug: 23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
ndroidRuntime.cpp
d38110bdcd49170424135c5f94fbd525e5c9efca 11-Aug-2015 Andreas Gampe <agampe@google.com> am 1be6e1c7: am 9502cc54: am d0669693: am b08c24a3: Frameworks/base: Disable Clang in core/jni

* commit '1be6e1c7643859839157534d45677fa20169fd1d':
Frameworks/base: Disable Clang in core/jni
d06696939b922a7849c90e5421e2100340a8e913 11-Aug-2015 Andreas Gampe <agampe@google.com> am b08c24a3: Frameworks/base: Disable Clang in core/jni

* commit 'b08c24a3e4f5362bbddc3735802e844e1992cd46':
Frameworks/base: Disable Clang in core/jni
af7855ff854b8112ed3598c4686187bb643e9d53 11-Aug-2015 Andreas Gampe <agampe@google.com> am b08c24a3: Frameworks/base: Disable Clang in core/jni

* commit 'b08c24a3e4f5362bbddc3735802e844e1992cd46':
Frameworks/base: Disable Clang in core/jni
b08c24a3e4f5362bbddc3735802e844e1992cd46 11-Jul-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Disable Clang in core/jni

thread_local does not work with Clang at the moment.

Bug: 22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
(cherry picked from commit 2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
ndroid.mk
2349332f9f69189d7889692b9aafd6f80070e352 30-Jul-2015 Filip Gruszczynski <gruszczy@google.com> Only relaunch activity on significant size configuration changes.

Currently if the configuration width/height/smallest width changes, we
relaunch the activity or invoke onConfigurationChanged callback. When it
comes to size based configuration changes it might not be necessary: if
the size change doesn't pass one of the threshold defined by the
resources, it means there is no need to relaunch the activity.

In this CL the ActivityManager will receive the thresholds from the
application and use them to decide, whether to relaunch the activity.
The application reads the thresholds from the resources, specifically
from resource qualifiers used by the app.

Change-Id: Ie3cf0a172dc1ba0b865cf30c2962e7cfd9ad8436
ndroid_util_AssetManager.cpp
7a09b8322cab26d6e3da1362d3c74964ae66b5d4 10-Aug-2015 Sebastien Hertz <shertz@google.com> Allow debugging only for apps forked from zygote

When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463
Change-Id: If8ea719063a65db4cdeed69a838b52e87b078b08
ndroidRuntime.cpp
9226fd541499dd8a532edd37cefa578282580436 08-Aug-2015 Ruben Brunk <rubenbrunk@google.com> am ffbe7943: am 1a232510: am 3b006485: am ae81ebf8: Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev

* commit 'ffbe7943538ba67030ea7d90524cf85888be2052':
camera2: Update DngCreator with bad pixel opcode.
ffbe7943538ba67030ea7d90524cf85888be2052 08-Aug-2015 Ruben Brunk <rubenbrunk@google.com> am 1a232510: am 3b006485: am ae81ebf8: Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev

* commit '1a2325105f88b6160409299ca9b6668e128a1beb':
camera2: Update DngCreator with bad pixel opcode.
ae81ebf8921073ab8279d8fca478d9b335c36bcb 08-Aug-2015 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev
736716af43360eeb92e1438bff383fd7b3083221 08-Aug-2015 Ben Wagner <bungeman@google.com> Merge "Use unique_ptr instead of SkAutoTDelete."
60126efd7d905ca24822765c6dafac17fef278ab 07-Aug-2015 Ben Wagner <bungeman@google.com> Use unique_ptr instead of SkAutoTDelete.

Skia would like to make SkAutoTDelete private, given that unique_ptr
now exists and is a better standard alternative.

Change-Id: Ie21bc4546c93e2096c1e43b26eb3ef80b8f11de4
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/Interpolator.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/Picture.h
ndroid/graphics/Shader.cpp
ndroid_graphics_Picture.cpp
ndroid_view_SurfaceControl.cpp
708cde15564adc485d38e6ad37fd274021f93e64 07-Aug-2015 Roozbeh Pournader <roozbeh@google.com> Merge "Remove EmojiFactory and its mentions from frameworks."
112d9c7f116bec0a52badde81bd778e59e88cb63 07-Aug-2015 Roozbeh Pournader <roozbeh@google.com> Remove EmojiFactory and its mentions from frameworks.

Bug: 18134313
Bug: 20158206
Change-Id: If46cdbd9d558e6592280b2b95f00b87d04de70a2
ndroid.mk
ndroidRuntime.cpp
ndroid_emoji_EmojiFactory.cpp
c3ae08ab18499467da3f3a42124269e2ab9444ba 06-Aug-2015 Jeff Sharkey <jsharkey@google.com> am ce8f8edc: am 48697332: am 0c2df694: am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev

* commit 'ce8f8edcc41d65fd0ba9ad136baeeef18fcabb39':
Protect runtime storage mount points.
ce8f8edcc41d65fd0ba9ad136baeeef18fcabb39 06-Aug-2015 Jeff Sharkey <jsharkey@google.com> am 48697332: am 0c2df694: am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev

* commit '48697332c7793d17a12887b5d508aeb96049c7f7':
Protect runtime storage mount points.
3d4f4b33fdb86ad457e8bde878787025597d222b 06-Aug-2015 Jeff Sharkey <jsharkey@google.com> am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev

* commit 'cb54ffb2cb9583eaf6b58dcc636681c4e4e07a7d':
Protect runtime storage mount points.
7d28ad9b638a8184ab499cbe708d3427025e569b 06-Aug-2015 Jeff Sharkey <jsharkey@google.com> am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev

* commit 'cb54ffb2cb9583eaf6b58dcc636681c4e4e07a7d':
Protect runtime storage mount points.
928e1ecfe2ca8deb7421f06c80bb4ae02d27f030 06-Aug-2015 Jeff Sharkey <jsharkey@android.com> Protect runtime storage mount points.

We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.

This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.

Also add CTS tests to verify that we're protecting access to
internal mount points like this.

Bug: 22964288
Change-Id: I74dbdcb01d4fabe92166b8043a74c6a1e93c6d5f
om_android_internal_os_Zygote.cpp
1d75a76f667f8c716d9931588b7d988ed7545fff 06-Aug-2015 Tim Murray <timmurray@google.com> am edd15f39: am 34f4e88d: am ffd8889a: am f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev

* commit 'edd15f39f57306ac1ca54fd50640f45eccf7d3e0':
Add boost to increase the load on newly-forked zygote processes.
edd15f39f57306ac1ca54fd50640f45eccf7d3e0 06-Aug-2015 Tim Murray <timmurray@google.com> am 34f4e88d: am ffd8889a: am f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev

* commit '34f4e88d7e08b2c2cbfb28b3c7f7aa627709f95b':
Add boost to increase the load on newly-forked zygote processes.
6d43a861d01ef48f37c69f96346a13d23164a585 05-Aug-2015 Tim Murray <timmurray@google.com> Add boost to increase the load on newly-forked zygote processes.

Makes it more likely for app launches to end up on a large core in
an HMP environment.

bug 21915482

Change-Id: Ieac192a4bc1237dd03b9492fcad3a78de5510a58
ndroid.mk
om_android_internal_os_Zygote.cpp
10fdfb18152d9b7e0f1757c503e9829e40d3eeee 04-Aug-2015 John Reck <jreck@google.com> am 7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev

* commit '7290d93df99de9d21ac8a9ddf72bc095b319af4b':
Yell loudly about undefined behind in Bitmap, but work anyway
fac589451fde46db2fc3282f4a6991b7cf6b155a 04-Aug-2015 John Reck <jreck@google.com> am 3b68ca16: am 96160dea: am 8e645d58: am 649c3c44: am 7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev

* commit '3b68ca168acc09b54fa3f6ed73e7ded10e5b8105':
Yell loudly about undefined behind in Bitmap, but work anyway
3b68ca168acc09b54fa3f6ed73e7ded10e5b8105 04-Aug-2015 John Reck <jreck@google.com> am 96160dea: am 8e645d58: am 649c3c44: am 7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev

* commit '96160dea490ade7ac6ba106457c9ce3f29d719d9':
Yell loudly about undefined behind in Bitmap, but work anyway
649c3c440e97f94971f5f2c8c4b08338c785c582 04-Aug-2015 John Reck <jreck@google.com> am 7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev

* commit '7290d93df99de9d21ac8a9ddf72bc095b319af4b':
Yell loudly about undefined behind in Bitmap, but work anyway
957c23775f46c26142bc6d4f9a592ac4586a9ef8 04-Aug-2015 Yusuke Sato <yusukes@google.com> Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files

for better performance. Without the optimization, these two functions
may check more than 100k file names in the pre-installed APK files,
which can take a few seconds to finish even on a recent device.

(cherry-pick of 34fe3df8519523dbb4bc27010fa57f259d5e868d)

Bug: 21957428
Change-Id: I5ebe0438019958d883a7fda6bd92ea4484211d23
om_android_internal_content_NativeLibraryHelper.cpp
01a0af31d7d418f400ce5d3f752eba6a35aa00e2 31-Jul-2015 John Reck <jreck@google.com> Yell loudly about undefined behind in Bitmap, but work anyway

Bug: 22214367

Previous releases would let the getters on a recycle()'d bitmap to still
work despite being firmly in undefined behavior per the documentation
on Bitmap#recycle().

As there are apps relying on this, yell very loudly about this behavior
in the log and give them a bit of time to fix it

Change-Id: I857be7e74cb217877973d9c6f03eb761d12fd056
ndroid/graphics/Bitmap.cpp
9ce22a095685a581823316457217a318fb40c754 03-Aug-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Update DngCreator with bad pixel opcode.

Bug: 22463079
Change-Id: Id40f02f565d5ce3427479968bc8c3a9e78c04816
ndroid_hardware_camera2_DngCreator.cpp
f489020fed3f45df4645ff4a23843c7463b3e0f0 03-Aug-2015 Ruben Brunk <rubenbrunk@google.com> am 1055dbe4: am a9b4ed9e: am 20733ba9: am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev

* commit '1055dbe46927b1dfab84a08550f1fa3a09bf84cd':
Make vendor keys visible in Camera2 java APIs.
1055dbe46927b1dfab84a08550f1fa3a09bf84cd 03-Aug-2015 Ruben Brunk <rubenbrunk@google.com> am a9b4ed9e: am 20733ba9: am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev

* commit 'a9b4ed9ee65c3db1975defe1b6bb1afd91cd7ba6':
Make vendor keys visible in Camera2 java APIs.
7cf5a0f698a4c0ad109581fb4c6087c740976226 03-Aug-2015 Ruben Brunk <rubenbrunk@google.com> am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev

* commit '7469060e7855ca5b32f66fbad1a0a4f88737c754':
Make vendor keys visible in Camera2 java APIs.
b1286a7a7202388c307469344e0079c1651fd8d6 03-Aug-2015 Ruben Brunk <rubenbrunk@google.com> am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev

* commit '7469060e7855ca5b32f66fbad1a0a4f88737c754':
Make vendor keys visible in Camera2 java APIs.
7469060e7855ca5b32f66fbad1a0a4f88737c754 03-Aug-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
c620eb7e864e5505f5a6f867223fa8e525669d0b 30-Jul-2015 Ruben Brunk <rubenbrunk@google.com> Make vendor keys visible in Camera2 java APIs.

- Add vendor keys to getKeys() calls for CameraCharacteristics,
CaptureRequest, and CaptureResult.
- Vendors can specify whether custom keys show up by listing
visible keys in the REQUEST_AVAILABLE_RESULT_KEYS field.
- Vendor key types are always treated as a primitive (or Rational)
array type corresponding to one of the valid types for
a camera metadata entry.

Bug: 22067625
Change-Id: I6e7dd3db7a8bf533c2ec15ff69ca38824134e971
ndroid_hardware_camera2_CameraMetadata.cpp
7e4613ede8ea0daa0428063566ff1cd99e45b50b 31-Jul-2015 Aravind Akella <aakella@google.com> am eb648679: am e01a4afb: am e025f4d9: am ccaf066d: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dr-dev

* commit 'eb648679bfc13f036af459c7365295bfa5c04d66':
Call getInstanceForPackage instead of creating a new SensorManager instance.
eb648679bfc13f036af459c7365295bfa5c04d66 31-Jul-2015 Aravind Akella <aakella@google.com> am e01a4afb: am e025f4d9: am ccaf066d: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dr-dev

* commit 'e01a4afb618159d68b5b5b00e29cbd8ced56f3dd':
Call getInstanceForPackage instead of creating a new SensorManager instance.
2af91d0e104b3a80f3e832e464e52893a55a715f 30-Jul-2015 Aravind Akella <aakella@google.com> Call getInstanceForPackage instead of creating a new SensorManager instance.

Bug: 22529981
Change-Id: If077e042a4af940dfb1fc9c4ac8b9d352dd32685
ndroid_hardware_SensorManager.cpp
70cfdc9137b70628ba5db1dc3f7f6b0ff60f6489 30-Jul-2015 Chris Craik <ccraik@google.com> Merge "Add fast path for roundrect Outline changes"
6578a989566e585eee053095dc80e2552e125db2 13-Jul-2015 Derek Sollenberger <djsollen@google.com> Support High Contrast Text for all canvas types

Change-Id: Iee324446798fe1a1cb32cb991f181a4af24aa93c
ndroid_graphics_Canvas.cpp
ndroid_view_DisplayListCanvas.cpp
40de9f28f48f80674ae64b7f165b56281e8b9038 29-Jul-2015 Chris Craik <ccraik@google.com> Add fast path for roundrect Outline changes

bug:22724385

Additionally, move all outline/related methods on RenderNode to use
fast JNI.

Change-Id: Idc462099638bdae0391d35975f3161a2f0540b9b
ndroid_view_RenderNode.cpp
c9a6ca5d6b488d1d57c0404856673d7ce1fd0fab 29-Jul-2015 Chris Craik <ccraik@google.com> Merge "Revert "Support High Contrast Text for all canvas types""
749e67438c7e2dbe2bb362dc07522a1702810455 29-Jul-2015 Chris Craik <ccraik@google.com> Revert "Support High Contrast Text for all canvas types"

bug:22820834

This reverts commit 876d56612ab8ec7032f702905d694670e6c4febd.

Change-Id: I4e07a0894095caaaf2fd36bfa6073d033542bfc4
ndroid_graphics_Canvas.cpp
2d35cf953a235c2bd47fd68aef0209a5b776f8d8 29-Jul-2015 Derek Sollenberger <djsollen@google.com> Merge "Support High Contrast Text for all canvas types"
fed06b130d9aa0b3484d80d8bbb34854267088b9 29-Jul-2015 Narayan Kamath <narayan@google.com> am 7cd90763: am 4aac30fa: am 8fcb5697: am ff01fcec: am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

* commit '7cd90763d136dd6d72107f5ec8ca3baa04980dba':
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
7cd90763d136dd6d72107f5ec8ca3baa04980dba 29-Jul-2015 Narayan Kamath <narayan@google.com> am 4aac30fa: am 8fcb5697: am ff01fcec: am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

* commit '4aac30faf253047fb68358ae6acb7a76e7023c81':
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
f1fce87a2859093df25a139b99d0ed3369ea8b20 29-Jul-2015 Narayan Kamath <narayan@google.com> am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

* commit '7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6':
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6 29-Jul-2015 Narayan Kamath <narayan@google.com> Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev
8d1e344f400fa35f3ddfef78a1dd1d805f3718b0 29-Jul-2015 Narayan Kamath <narayan@google.com> Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."

This reverts commit 5967ddbf05f146bdb6744207e3daed1aa76fc637.

Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
ndroid_hardware_SensorManager.cpp
920b1ee76d12fe0762396ff2b7c39e59f052722c 29-Jul-2015 Aravind Akella <aakella@google.com> am 79d0d7c1: am 25931a50: am 33aeb1fe: am 822456eb: am 15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev

* commit '79d0d7c13df7662d92e8d536d8d3a77e9b4a5f46':
Call getInstanceForPackage instead of creating a new SensorManager instance.
79d0d7c13df7662d92e8d536d8d3a77e9b4a5f46 29-Jul-2015 Aravind Akella <aakella@google.com> am 25931a50: am 33aeb1fe: am 822456eb: am 15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev

* commit '25931a507722a15383f5a554eee37eebe61488a7':
Call getInstanceForPackage instead of creating a new SensorManager instance.
4633f37107980378b1583b22437a31168cf359e8 29-Jul-2015 Aravind Akella <aakella@google.com> am 15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev

* commit '15938235d25a879ebb000cb3671fd75cb092e981':
Call getInstanceForPackage instead of creating a new SensorManager instance.
15938235d25a879ebb000cb3671fd75cb092e981 29-Jul-2015 Aravind Akella <aakella@google.com> Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
2f221c2a610abf5279160914e50bbf1ffe617dec 28-Jul-2015 Ruben Brunk <rubenbrunk@google.com> am 37f29f07: am 54f37477: am 0e3ab7b4: am 2384e2a4: am ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev

* commit '37f29f07a5eff61ae70b5d77a78ba59c7ea9ab17':
Update DngCreator to correctly handle array sizes.
37f29f07a5eff61ae70b5d77a78ba59c7ea9ab17 28-Jul-2015 Ruben Brunk <rubenbrunk@google.com> am 54f37477: am 0e3ab7b4: am 2384e2a4: am ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev

* commit '54f3747738e68a92da42855d1cf5d941e2eb95a6':
Update DngCreator to correctly handle array sizes.
ba140949ad27642a7e94c82511508d740fa1fa11 28-Jul-2015 Ruben Brunk <rubenbrunk@google.com> am ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev

* commit 'ee2a16b551a2203deda6250836d8e75a9a046b7e':
Update DngCreator to correctly handle array sizes.
ee2a16b551a2203deda6250836d8e75a9a046b7e 28-Jul-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Update DngCreator to correctly handle array sizes." into mnc-dev
2079612e5851d73f4672ae3729c883a58adc4ddd 22-Jul-2015 Ruben Brunk <rubenbrunk@google.com> Update DngCreator to correctly handle array sizes.

- Allow both pixelArraySize and preCorrectionArraySize
buffer dimensions for input buffers.
- Adjust crop, active area, and dimensions used for
opcode lists based on the input buffer size.

Bug: 22302614
Bug: 22210811
Change-Id: I16fb8921a144b0a251d555037ca45fdc12f7dd18
ndroid_hardware_camera2_DngCreator.cpp
5967ddbf05f146bdb6744207e3daed1aa76fc637 25-Jul-2015 Aravind Akella <aakella@google.com> Call getInstanceForPackage instead of creating a new SensorManager instance.

Bug: 22529981
Change-Id: Id3adfbcf55d1268db1a555c72a06456a5219c086
ndroid_hardware_SensorManager.cpp
8e1ae26bf1862645fff0f9962163dff45510b6ca 27-Jul-2015 Chris Craik <ccraik@google.com> am 6c3fc22c: am 5a70e76f: am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '6c3fc22c6206fe883c0252c02c69090ffc3360f3':
Fix bitmap get/set pixels for ALPHA_8
6c3fc22c6206fe883c0252c02c69090ffc3360f3 27-Jul-2015 Chris Craik <ccraik@google.com> am 5a70e76f: am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '5a70e76f40c19555a7ca09bd30a89b7bbaf985b5':
Fix bitmap get/set pixels for ALPHA_8
71fb7e5927a6f90bf18da7e8c040be529c167688 27-Jul-2015 Chris Craik <ccraik@google.com> am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '4604c1dc67f634e1fac37f623f5b093615d49f0f':
Fix bitmap get/set pixels for ALPHA_8
4604c1dc67f634e1fac37f623f5b093615d49f0f 27-Jul-2015 Chris Craik <ccraik@google.com> Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
457672d5f0ff39c3762d970860d0612e7e19542c 27-Jul-2015 Derek Sollenberger <djsollen@google.com> Merge "switch to new signature for NewWithProc"
3e0c1c48047e2a23e2215866c8c7037f45052393 25-Jul-2015 Andreas Gampe <agampe@google.com> am d1fffe1c: am 505a252c: am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev

* commit 'd1fffe1c898c2de3b78a82b504c739c60b1ce31a':
Frameworks/base: Hand fingerprint to ART
1f105a6b27f7b4036a559482a2341ab85a4719a5 24-Jul-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Hand fingerprint to ART

To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.

Bug: 22693991

(cherry picked from commit e60825033fdde9eefaeec768a28b907e2d22f10c)

Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
ndroidRuntime.cpp
d1fffe1c898c2de3b78a82b504c739c60b1ce31a 25-Jul-2015 Andreas Gampe <agampe@google.com> am 505a252c: am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev

* commit '505a252cf7120dda0f1afb72f532bd99ada23baa':
Frameworks/base: Hand fingerprint to ART
6260b22501996d2e7a0323b493ae6c4badb93c28 25-Jul-2015 Chris Craik <ccraik@google.com> Fix bitmap get/set pixels for ALPHA_8

bug:22724734

Change-Id: If8307854f6bad6fac9ee0b394bf0b044c61183e5
ndroid/graphics/Bitmap.cpp
7d33ecc147f0476fbe9c229faf06becabfb3e8fe 24-Jul-2015 Andreas Gampe <agampe@google.com> am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev

* commit '9a755e3650270439861f5ac1e0c51caa7c4a7d3d':
Frameworks/base: Hand fingerprint to ART
e60825033fdde9eefaeec768a28b907e2d22f10c 24-Jul-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Hand fingerprint to ART

To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.

Bug: 22693991
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
ndroidRuntime.cpp
2f02dc5a15013a5ccc6b07b90c9e59dbde92c4d0 18-Jun-2015 Mike Reed <reed@google.com> switch to new signature for NewWithProc

Change-Id: I57fed92d4425317eb6808820a8d578856124c916
(cherry picked from commit 18dadfb42b0b7361624a344f21293918905432c1)
ndroid/graphics/FontFamily.cpp
d6edf918c5cb5d899afea27c60fd9b2652d5aa8c 14-Jul-2015 John Reck <jreck@google.com> am cbb968cc: am dc7368cb: am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit 'cbb968ccd7318aa61849366a8f170a37f1b8be58':
JNI optimization tweaks to Paint high-frequency methods
cbb968ccd7318aa61849366a8f170a37f1b8be58 14-Jul-2015 John Reck <jreck@google.com> am dc7368cb: am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit 'dc7368cb856025b4c9813bc6ff96d5b7c311b690':
JNI optimization tweaks to Paint high-frequency methods
876d56612ab8ec7032f702905d694670e6c4febd 13-Jul-2015 Derek Sollenberger <djsollen@google.com> Support High Contrast Text for all canvas types

Change-Id: Ib46ba3d7c67e081872e6a4b11d294fe9a61f5bbd
ndroid_graphics_Canvas.cpp
1f4fb3c4684965156aa5cd3e9bca71a188056447 13-Jul-2015 Derek Sollenberger <djsollen@google.com> Merge "Move drawRegion from DisplayList to Canvas"
94394b3fb048d5349a77b57950ab7f6b6e92ce34 10-Jul-2015 Derek Sollenberger <djsollen@google.com> Move drawRegion from DisplayList to Canvas

Change-Id: I9f401dc5b24732938ac2ca7ed829796e2d7ef3e8
ndroid_graphics_Canvas.cpp
ndroid_view_DisplayListCanvas.cpp
fcd6558370708711df6cb5a9f16a5a08ec66787b 13-Jul-2015 Neil Fuller <nfuller@google.com> am b662579e: am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."

* commit 'b662579ec04c69bfd79ab7f9beaceca9135da57d':
Switch shutdownInput / shutdownOutput to using Os.shutdown.
f6db67c8f3fd0c57944a51289b5ef63c4f746f8a 13-Jul-2015 Neil Fuller <nfuller@google.com> am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."

* commit '3ecbca5081f26ca03ef6b8b68767753343e67f38':
Switch shutdownInput / shutdownOutput to using Os.shutdown.
b662579ec04c69bfd79ab7f9beaceca9135da57d 13-Jul-2015 Neil Fuller <nfuller@google.com> am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."

* commit '3ecbca5081f26ca03ef6b8b68767753343e67f38':
Switch shutdownInput / shutdownOutput to using Os.shutdown.
1d6924866718e821a89199f981a651f72219d4c3 13-Jul-2015 Derek Sollenberger <djsollen@google.com> Merge "Remove unused functions and variables from DisplayListCanvas"
523be5f83280dbd90cec28d7c2674e7b341caf64 13-Jul-2015 John Reck <jreck@google.com> am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit '8657d9e8a56af7847578b65a881016da985b3531':
JNI optimization tweaks to Paint high-frequency methods
2bc67a1b5f9d4662ef7da4645ca8e580302b3553 11-Jul-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Disable Clang in core/jni

thread_local does not work with Clang at the moment.

Bug: 22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
ndroid.mk
cc882b6518129a11fa007f8c9343e972f03607b4 09-Jul-2015 Derek Sollenberger <djsollen@google.com> Remove unused functions and variables from DisplayListCanvas

This also moves some functions that are only called when creating/completing
a displayList into the appropriate constructors and endRecording calls.

Change-Id: I9f6add156d7f476a52766934af713b0f852c8dea
ndroid_view_DisplayListCanvas.cpp
46b9d339218f612487ca87e5920b17c5f77bfdec 10-Jul-2015 John Reck <jreck@google.com> am ee3c1ea5: am 4108f565: am b25c0bb7: am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev

* commit 'ee3c1ea59dfe357b9ac59b4aae056280ccc6417b':
Create a thread_local cache for textLocale
8e83b783fab5c257b0577a0bd4396be2f4e2779c 10-Jul-2015 John Reck <jreck@google.com> am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev

* commit '525ac80d2dda4ce7a902b67d082ed26d0986f525':
Create a thread_local cache for textLocale
c6024cdd3553760aa99bfbabecc6a3d8443f5c47 10-Jul-2015 John Reck <jreck@google.com> JNI optimization tweaks to Paint high-frequency methods

Bug: 22378829

Use fast-jni for getFontMetrics, drops from 35us -> 30us
Note the "heavy" part of the method, getMetricsInternal, is
already called by other fast-jni methods.

Use critical array access for getRunAdvance_* methods. This
will avoid the copy and the access is appropriately scoped
and fast enough to not significantly block the moving GC.
Improves from 88us -> 79us on short text

Change-Id: I7c1481c23f6dba3420fbcf48220f6335cf9f6d10
ndroid/graphics/Paint.cpp
476f7158222e49ec24a5fc08f0bbb33fb8ca10bf 10-Jul-2015 John Reck <jreck@google.com> Create a thread_local cache for textLocale

Bug:22378829

toLanguageTag is significantly more expensive than previously
thought (note ULOC_FULLNAME_CAPACITY is 157) and weighs
in at around 40us. Given that this is called on every Paint
and that there are typically thousands of Paint objects
created this adds up very quickly.

Given that the locale is almost always Locale.getDefault(),
a very simple thread_local cache of size 1 fixes this trivially

Change-Id: I819e60cac7a4b27e9dd5538332c22ce5bbd0851c
ndroid/graphics/Paint.cpp
a7f7c248c719a5e9b7dbe629e016ef73f89ce0e7 08-Jul-2015 Neil Fuller <nfuller@google.com> Switch shutdownInput / shutdownOutput to using Os.shutdown.

Bug: 3106438
Change-Id: I2c4817e435c6b253d6c507ea57bdfdfe45df8862
ndroid_net_LocalSocketImpl.cpp
9af52f0da628b93595b8b1e14f41bda559135a39 10-Jul-2015 John Reck <jreck@google.com> am b3d012b9: am ef6be305: am 31b81b3c: am 6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev

* commit 'b3d012b9835c615fcb86ed77b7e32dc9524e35dc':
Deep-copying sucks when all you want is a borrow
2a018b01af0c4cd18c8ce8a6cdf63c120604d9a2 10-Jul-2015 John Reck <jreck@google.com> am 6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev

* commit '6ed4b9dfd6130f4517af5a99d99c5cb125600baa':
Deep-copying sucks when all you want is a borrow
bea77a07834f30c3652e2a708856796082245c4b 10-Jul-2015 John Reck <jreck@google.com> Deep-copying sucks when all you want is a borrow

Bug: 22378829

std::string only knows how to move & deep-copy, and we really
don't want either here since the Paint object for certain outlives
the stack scope so use a const reference instead.

Change-Id: I1c822c6ba9647953899cfe89dcc670d7265e3973
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/Paint.h
a90b9aaf56182e93ef180145d279810f7ee03d7f 09-Jul-2015 Neil Fuller <nfuller@google.com> am b27c379b: am 2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"

* commit 'b27c379b259d42a1e90eb4b4d79abc2426def731':
Switch LocalSocketImpl.accept() over to using Os.accept()
f74d27af876ce45bc8fee8254f836d58beae992f 09-Jul-2015 Neil Fuller <nfuller@google.com> am b27c379b: am 2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"

* commit 'b27c379b259d42a1e90eb4b4d79abc2426def731':
Switch LocalSocketImpl.accept() over to using Os.accept()
c1eaeb93379fc8940f595cf21844fa24b8cd1734 08-Jul-2015 Neil Fuller <nfuller@google.com> Switch LocalSocketImpl.accept() over to using Os.accept()

Bug: 3106438
Change-Id: I3b4a07cc2283c3cfdbaf3d2460f37264f67690e3
ndroid_net_LocalSocketImpl.cpp
24bfdf356cd76437b2c7ab6142730a2c5703449d 08-Jul-2015 Elliott Hughes <enh@google.com> am 7b12deb5: am 07e1c409: Merge "Android always has <malloc.h>."

* commit '7b12deb50b32bced71a9472027350fafbbe40bd4':
Android always has <malloc.h>.
6bc5c3e1a5945762c61359884938d554c6c0aeb3 08-Jul-2015 Elliott Hughes <enh@google.com> am 7b12deb5: am 07e1c409: Merge "Android always has <malloc.h>."

* commit '7b12deb50b32bced71a9472027350fafbbe40bd4':
Android always has <malloc.h>.
07e1c409acc375ae88b6cc73fe4541db529c9638 08-Jul-2015 Elliott Hughes <enh@google.com> Merge "Android always has <malloc.h>."
849558b72711e57a06fa4df2d6c5a2294df5d49e 08-Jul-2015 Neil Fuller <nfuller@google.com> am 26e58f09: am b05c2beb: Merge "Move listen() over to using android.system.Os"

* commit '26e58f09d9c040b8abaa5184a16ec52e5f401b4c':
Move listen() over to using android.system.Os
93492e02cc4e5884cd7de8dcec14493255734c29 08-Jul-2015 Neil Fuller <nfuller@google.com> am 26e58f09: am b05c2beb: Merge "Move listen() over to using android.system.Os"

* commit '26e58f09d9c040b8abaa5184a16ec52e5f401b4c':
Move listen() over to using android.system.Os
b05c2bebf85619aaedaa39593acc53eaaed22493 08-Jul-2015 Neil Fuller <nfuller@google.com> Merge "Move listen() over to using android.system.Os"
c64df290e439eaba5d710d24ca89fff241b67dca 08-Jul-2015 Elliott Hughes <enh@google.com> Android always has <malloc.h>.

Change-Id: I9e18daeec26380c439f823e6a55ee61773c1b680
ndroid_os_Debug.cpp
f606595c7697060663b234dc31fbf2cb79419ed5 08-Jul-2015 Aravind Akella <aakella@google.com> am 5444b6be: am 1656c024: am 2ea6c646: am c5889757: Merge "Clean up get sensorList." into mnc-dev

* commit '5444b6be805d51964f19c8437e322a676ad8ea2a':
Clean up get sensorList.
8e2a15a31e7f36b8e9af063e3badc2eb06122f95 07-Jul-2015 Aravind Akella <aakella@google.com> am c5889757: Merge "Clean up get sensorList." into mnc-dev

* commit 'c5889757cb7474b613db22cc7a0af44fe50661fd':
Clean up get sensorList.
b66e74857703ca88ba32ec1cefae292a5444d654 07-Jul-2015 Neil Fuller <nfuller@google.com> am 23325440: am 50d11ded: Merge "Reimplement LocalSocket methods using android.system.Os"

* commit '2332544040d294ee81f64aabebe49c4f548c1337':
Reimplement LocalSocket methods using android.system.Os
1108c06aca42137c930f54bfe9effd2b59b4f9a5 07-Jul-2015 Neil Fuller <nfuller@google.com> am 23325440: am 50d11ded: Merge "Reimplement LocalSocket methods using android.system.Os"

* commit '2332544040d294ee81f64aabebe49c4f548c1337':
Reimplement LocalSocket methods using android.system.Os
50d11ded0d219ea9b128557080e4ffd49ebea5ab 07-Jul-2015 Neil Fuller <nfuller@google.com> Merge "Reimplement LocalSocket methods using android.system.Os"
a8f4499c54f3375bc72a180bf19b932f114563c3 04-Jul-2015 Neil Fuller <nfuller@google.com> am 93bb2bf2: am 761e39e1: Merge "Switch to using android.system.Os for more calls"

* commit '93bb2bf2e835f714d09b53dea3ca5d9e4451021e':
Switch to using android.system.Os for more calls
bef809c4ba9cbf4654faf2d6c1ebfbc0a38c56fe 04-Jul-2015 Narayan Kamath <narayan@google.com> am 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework."

* commit '4da086ee7f4eba64265b28cdc5df9f690d97a7ac':
Delete unused testing scripts and WithFramework.
4fa438ef72d125b4c0e7eb37a6667ca51ed325e4 03-Jul-2015 Neil Fuller <nfuller@google.com> Move listen() over to using android.system.Os

Bug: 3106438
Change-Id: I9b4d1d58d84a28828555ae863e86530995191f2c
ndroid_net_LocalSocketImpl.cpp
d2df87eb4424ec25ab5c9a8f47cb09a8f191e87f 03-Jul-2015 Neil Fuller <nfuller@google.com> Reimplement LocalSocket methods using android.system.Os

InputStream.available()
OutputStream.flush()

Bug: 3106438
Change-Id: I3a9425c323229e27bb72f6232dd13f7579586840
ndroid_net_LocalSocketImpl.cpp
761e39e18990b657c488c78a6c048f625bd6b74a 03-Jul-2015 Neil Fuller <nfuller@google.com> Merge "Switch to using android.system.Os for more calls"
c80af6d84d8fb729f17028ac533fac07bb7c4c5d 03-Jul-2015 Neil Fuller <nfuller@google.com> Switch to using android.system.Os for more calls

The methods being switched here should involve no important
semantic changes. socket.getSoTimeout() is now implemented:
previously it would have returned 0 in all cases.

Some tidy up of unimplemented / commented code.

Switching other calls to use Os would carry more risk and
will be handled separately they can be switched safely.

Bug: 3106438
Change-Id: I5526249395565fee6e43f159a2b5975b0d41d058
ndroid_net_LocalSocketImpl.cpp
c21dab9dcbfce40879b86d5a757b749e77f5b244 25-Jun-2015 Narayan Kamath <narayan@google.com> Delete unused testing scripts and WithFramework.

These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.

If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java

This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.

bug: 22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
ndroidRuntime.cpp
b35522f77d0d3d5ed2090214c776c476c8fc76cc 02-Jul-2015 Aravind Akella <aakella@google.com> am fce3bc83: am 32207e3c: Merge "Changes to Data Injection mode APIs" into mnc-dev

* commit 'fce3bc838f0db1122fee563b14d1c7c7b7d46a9f':
Changes to Data Injection mode APIs
516e40ea5d73cf577d8dec559c7902b79cf483d0 02-Jul-2015 Aravind Akella <aakella@google.com> Clean up get sensorList.

Change-Id: I46da79cc50b5130a3f21bd567f50b29bf22196f9
ndroid_hardware_SensorManager.cpp
32207e3c66f9b7979a6d465b87eb531327916081 01-Jul-2015 Aravind Akella <aakella@google.com> Merge "Changes to Data Injection mode APIs" into mnc-dev
3ac45a1c4ebdb537f83a78dd4c1550da4fb94d74 01-Jul-2015 Jeff Sharkey <jsharkey@android.com> am f6af3057: am ca2f2fed: Merge "Fully unmount existing storage in Zygote." into mnc-dev

* commit 'f6af305706e0ef4ed2ca303c2c7030c0a3580520':
Fully unmount existing storage in Zygote.
faf3f692174be30ef9226981e640bc9a09c4da97 01-Jul-2015 Jeff Sharkey <jsharkey@android.com> Fully unmount existing storage in Zygote.

Before mounting the requested storage into place, fully unmount all
existing mounts inherited from the root namespace.

Bug: 22192518
Change-Id: I6f7f12c1219d25ee487a031d37c60fb4051d24ad
om_android_internal_os_Zygote.cpp
d123b51f8b14047804612cb1b15288cca81ed4f9 29-Jun-2015 Aravind Akella <aakella@google.com> Changes to Data Injection mode APIs

Change-Id: Id55eaf03656d2d55df7f38d4cac643d97354fe9b
ndroid_hardware_SensorManager.cpp
0515ad6ac0806d88ac371730c064a0ae5bc5db42 29-Jun-2015 Christopher Tate <ctate@google.com> am 1cd343f2: am 795d95ec: Merge "Throw DeadObjectException on failed transaction, not RuntimeException" into mnc-dev

* commit '1cd343f28caf2bec6d17ce0857df3bd0d7720c1f':
Throw DeadObjectException on failed transaction, not RuntimeException
ffd5864202a7c85620b7eb5032dc0120481705e5 29-Jun-2015 Christopher Tate <ctate@google.com> Throw DeadObjectException on failed transaction, not RuntimeException

In practice we only see failed transactions with small payloads when
the remote dies while the binder operation is in flight. Throw the
applicable exception type rather than the generic "oops binder went
haywire" one.

Bug 22104446

Change-Id: I785c15617db7a1f4d505aa11f16e61551c8357ba
ndroid_util_Binder.cpp
b02c73d582fbfc1f48425b2bd53ac26e9ea22cea 26-Jun-2015 Jeff Sharkey <jsharkey@android.com> am df6fd4c2: am d2c41457: Merge "Let\'s reinvent storage, yet again!" into mnc-dev

* commit 'df6fd4c2631e06f3469eb77b2ffdff0d3cc04a68':
Let's reinvent storage, yet again!
9527b223a9d4a4d149bb005afc77148dbeeff785 25-Jun-2015 Jeff Sharkey <jsharkey@android.com> Let's reinvent storage, yet again!

Now that we're treating storage as a runtime permission, we need to
grant read/write access without killing the app. This is really
tricky, since we had been using GIDs for access control, and they're
set in stone once Zygote drops privileges.

The only thing left that can change dynamically is the filesystem
itself, so let's do that. This means changing the FUSE daemon to
present itself as three different views:

/mnt/runtime_default/foo - view for apps with no access
/mnt/runtime_read/foo - view for apps with read access
/mnt/runtime_write/foo - view for apps with write access

There is still a single location for all the backing files, and
filesystem permissions are derived the same way for each view, but
the file modes are masked off differently for each mountpoint.

During Zygote fork, it wires up the appropriate storage access into
an isolated mount namespace based on the current app permissions. When
the app is granted permissions dynamically at runtime, the system
asks vold to jump into the existing mount namespace and bind mount
the newly granted access model into place.

Bug: 21858077
Change-Id: I62fb25d126dd815aea699b33d580e3afb90f8fd2
om_android_internal_os_Zygote.cpp
7435a1a384790ef687678881a048e733785869c8 26-Jun-2015 Christopher Tate <ctate@google.com> am 0884cd11: am 9a600725: Merge "Don\'t throw TransactionTooLargeException for small payloads" into mnc-dev

* commit '0884cd113d07f87d4223c1ab3bbe79481cf86492':
Don't throw TransactionTooLargeException for small payloads
9a600725532c3fcf71f3be2610a34f02c88bb16b 26-Jun-2015 Christopher Tate <ctate@google.com> Merge "Don't throw TransactionTooLargeException for small payloads" into mnc-dev
4095f6432b68a014c9f60943a02f396cc362cf16 25-Jun-2015 Yusuke Sato <yusukes@google.com> am 482bcbe5: am 0f61c7dc: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev

* commit '482bcbe58cbceca8749e50e174c60c5511af265b':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
02ca7a7db04b000a8e403d130781fe65b4e0d091 25-Jun-2015 Christopher Tate <ctate@google.com> Don't throw TransactionTooLargeException for small payloads

In practice, if we ever see an apparent transaction-too-large result
with a modest-sized payload, it means that the remote process died at
just the right time (with the binder transaction already in flight
so it wasn't detected as a DEAD_OBJECT up front). Don't throw
TransactionTooLargeException in this case, because we really do need
to distinguish that from dead-remote more accurately.

In particular, certain common execution patterns on existing hardware
trigger this circumstance, and they wind up crashing the system.
This is bad, so now we avoid it unless we're pretty sure that is
really what happened.

Bug 21801759

Change-Id: Id05f1eecc0d23dc8d0505c402e2cb68396782135
ndroid_util_Binder.cpp
0f61c7dcc40276788f58300d5d8ca85be2ce0e59 25-Jun-2015 Yusuke Sato <yusukes@google.com> Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev
e7df463c0074d4bc85c43cd19a7417304cb8ca28 25-Jun-2015 Andreas Gampe <agampe@google.com> am 51fe757e: am 8f7ae66e: Merge "Frameworks/base: Add tracing system properties" into mnc-dev

* commit '51fe757ef106b65218c04be8d73333b959fae545':
Frameworks/base: Add tracing system properties
cadcd51e0548b21adc4c3e6bd6e31d5e4ee591c1 23-Jun-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Add tracing system properties

Add system properties to support zygote-started method tracing.
These are needed as the limit on system properties does not allow
the reuse of the runtime extra options system property.

Bug: 21760614

(cherry picked from commit 98f406f6f31660d0f5ee32113ffadc720b426dc6)

Change-Id: I3785cc5715acadbee81ef7b45081ed780f1351d3
ndroidRuntime.cpp
8f7ae66e47181ee87985da63d8aa6ef0cad20ab2 25-Jun-2015 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Add tracing system properties" into mnc-dev
b9d00da051cb647142b2f37bb1852a2d765ecdea 25-Jun-2015 Tim Murray <timmurray@google.com> am c88dff63: am 948c6ecc: Merge "add cpuset support" into mnc-dev

* commit 'c88dff63e95de2fb9d8ba49093e5c3b7b211a136':
add cpuset support
948c6ecc5a460ce78dc1d012ccb3efc844699985 25-Jun-2015 Tim Murray <timmurray@google.com> Merge "add cpuset support" into mnc-dev
0789eeca9ba437e73e80ad87669437fd1ef80217 24-Jun-2015 Raph Levien <raph@google.com> am 5645df23: am 420cf236: Merge "Make measureText(String, int, int) not use context" into mnc-dev

* commit '5645df2344a42b18855ab8137bc39bc36b288fac':
Make measureText(String, int, int) not use context
1149cdc84b77d0cbe3c44a7ec6abd29fc63913b5 24-Jun-2015 Raph Levien <raph@google.com> Make measureText(String, int, int) not use context

The measureText method when applied to a string should just measure
the substring, rather than treat the entire string as context. It was
less likely to cause problems than the similar issues with char
arrays, but still wrong. This patch makes the behavior consistent.

Bug: 20087437
Change-Id: I1c6e07a694b151f4fb097edae8e271805e996d06
ndroid/graphics/Paint.cpp
701aae276fb692937c12b9442dc7586b18a1a3f9 24-Jun-2015 Brian Carlstrom <bdc@google.com> am ef3b608c: am 45ab734a: Merge "Add missing NULL check for android_os_Parcel_writeInt" into mnc-dev

* commit 'ef3b608c81a67423e94a6f3a17f33e7354ad0d9f':
Add missing NULL check for android_os_Parcel_writeInt
45ab734a7a30b53e9b76c6fd3286b71f2a35a768 24-Jun-2015 Brian Carlstrom <bdc@google.com> Merge "Add missing NULL check for android_os_Parcel_writeInt" into mnc-dev
849ea026824d51761591a18cf6689d755f70bda4 24-Jun-2015 Brian Carlstrom <bdc@google.com> Add missing NULL check for android_os_Parcel_writeInt

All other usages of nativePtr were already checked.

Bug: 21636519
Change-Id: Icc09ce4326e6b05c5a248cc4de84ae231d5690b1
ndroid_os_Parcel.cpp
0664eb56abcd4cb5b5e2cd96a1983ea734742b70 24-Jun-2015 Chris Craik <ccraik@google.com> am 2c62ad43: am c686757a: Merge "Unify clipping return value behavior - true if not empty" into mnc-dev

* commit '2c62ad43320f00ff0896eb678603f06944931a21':
Unify clipping return value behavior - true if not empty
c686757a183028deef5f27ed6c0412417f59cf35 24-Jun-2015 Chris Craik <ccraik@google.com> Merge "Unify clipping return value behavior - true if not empty" into mnc-dev
b502be75bb7a702b444c570d07df55ca7ec419c4 24-Jun-2015 Ruben Brunk <rubenbrunk@google.com> am 5b9021f2: am a39fcc58: Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev

* commit '5b9021f2fadca22cd423fbe4965e5c9b94e4bb2a':
Update DngCreator to handle pre-correction dimens.
a39fcc58753000435e963b473bad954a337604f2 24-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev
b8f4c6ab1e99a44a51af26dc522819bb833825ab 23-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Update DngCreator to handle pre-correction dimens.

Bug: 20491394
Change-Id: I0cdf7cec104bcb5683139c81fc52c8a0a7d2365c
ndroid_hardware_camera2_DngCreator.cpp
5ec6a2878b2ad933c5da6fe2341c854155acc24c 24-Jun-2015 Chris Craik <ccraik@google.com> Unify clipping return value behavior - true if not empty

bug:22035484

Change-Id: I23ecca38554a60c590181290900deb0e2c48cea1
ndroid_graphics_Canvas.cpp
7983cda5aa87e2cb5b3f9120a1235614fd5f2661 23-Jun-2015 Aravind Akella <aakella@google.com> am dc2c991a: am cfa38472: Merge "Report accuracy for Linear acceleration and gravity sensors." into mnc-dev

* commit 'dc2c991a3fe7e6fc34b6773625fe3c64b15beced':
Report accuracy for Linear acceleration and gravity sensors.
cfa3847254b34df91c9cf2b6b2052c4373ecc9e1 23-Jun-2015 Aravind Akella <aakella@google.com> Merge "Report accuracy for Linear acceleration and gravity sensors." into mnc-dev
f38226ab40feadb63b9b0c48d148db919ecec7f4 23-Jun-2015 Aravind Akella <aakella@google.com> Report accuracy for Linear acceleration and gravity sensors.

Change-Id: I57cbf5212458ee6cf4a9019331004a3e0cf71a74
ndroid_hardware_SensorManager.cpp
91c8f2086f3ed2de85391d99e7ffaf98041f105e 23-Jun-2015 Michael Wright <michaelwr@google.com> am 611136c1: am 805fc82e: Merge "Add method to set action button on MotionEvent" into mnc-dev

* commit '611136c15c54e4c9da8deea9edf55c22cd56ec0f':
Add method to set action button on MotionEvent
8022f38adaaed631ff9e57c965d7d2a6d4a6fee0 23-Jun-2015 Michael Wright <michaelwr@google.com> am 2cb8acc9: am 12119732: Merge "Add new `hid` command." into mnc-dev

* commit '2cb8acc9cf587bc0171a70e00500d89d2f577c3c':
Add new `hid` command.
805fc82ea9c12aba53af4ebda6ea3f8a349201ac 23-Jun-2015 Michael Wright <michaelwr@google.com> Merge "Add method to set action button on MotionEvent" into mnc-dev
121197326cca17b65d14ca1454e1bcbd0340061a 23-Jun-2015 Michael Wright <michaelwr@google.com> Merge "Add new `hid` command." into mnc-dev
b3e2798707d590f0b76a5ea14a0565bf8bee6d77 23-Jun-2015 Eino-Ville Talvala <etalvala@google.com> am 963b7100: am b14a1ac0: Merge changes from topic \'remove-high-res\' into mnc-dev

* commit '963b7100770aa2d7de8ed8d2cd1b14a4f64da8e3':
Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
98f406f6f31660d0f5ee32113ffadc720b426dc6 23-Jun-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Add tracing system properties

Add system properties to support zygote-started method tracing.
These are needed as the limit on system properties does not allow
the reuse of the runtime extra options system property.

Bug: 21760614
Change-Id: I3785cc5715acadbee81ef7b45081ed780f1351d3
ndroidRuntime.cpp
9e41c7479ccaedb89a89a58079570ca0ee0e3727 08-Jun-2015 Tim Murray <timmurray@google.com> add cpuset support

This moves ActivityManager from using fg/bg cgroups to fg/bg cpusets,
which improves load balancing on appropriate devices.

bug 21782794

Change-Id: Ife149ea551b8b3611a826566b8c8fc8573fdf654
ndroid.mk
ndroid_util_Process.cpp
34fe3df8519523dbb4bc27010fa57f259d5e868d 20-Jun-2015 Yusuke Sato <yusukes@google.com> Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files

for better performance. Without the optimization, these two functions
may check more than 100k file names in the pre-installed APK files,
which can take a few seconds to finish even on a recent device.

Bug: 21957428
Change-Id: I315fd3c6d5aa1076b993752525de449a9933de12
om_android_internal_content_NativeLibraryHelper.cpp
e365120aaead97567bdfbc53d3bfc2699bd2f886 20-Jun-2015 Eino-Ville Talvala <etalvala@google.com> Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth

Need to check the right configuration list if the format is a
depth format.

Also refactor code slightly to use SurfaceUtils when possible.

Bug: 21902551
Change-Id: Icca2e81d8144bede46ad9f117d5e010ed409887c
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
f32f7a3ffdbb80fb8d635c1aacaf0c7d2c2dde9f 19-Jun-2015 David Srbecky <dsrbecky@google.com> Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev
3f16c819a6b4f6aa0d8417331f6a5b1dc065dfa4 19-Jun-2015 Paul McLean <pmclean@google.com> am fcff4c38: am 2d5f41e4: Merge "Better handling of 0-length format conversions in convertAudioPortFromNative()." into mnc-dev

* commit 'fcff4c382dd0efe37f3e603820bf4a7077b65dba':
Better handling of 0-length format conversions in convertAudioPortFromNative().
065075e1f993a68579ed7f8034ab09d96ec957a9 28-May-2015 David Srbecky <dsrbecky@google.com> Replace --include-cfi with --generate-debug-info.

This follows a change in dex2oat.

(cherry picked from commit f39477b592e6e17fe41ace2e18602a69b2dd1619)

Bug: 21924613
Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
ndroidRuntime.cpp
2d5f41e4c1733ff3e606390a433a6a52be6e862a 19-Jun-2015 Paul McLean <pmclean@google.com> Merge "Better handling of 0-length format conversions in convertAudioPortFromNative()." into mnc-dev
2db94372749c4fcc9bd715f41e0b5c4045ee7c84 18-Jun-2015 Paul McLean <pmclean@google.com> Better handling of 0-length format conversions in convertAudioPortFromNative().

Bug: 21915588
Change-Id: I8eb3da2bfa94722a11cf47ba6fc5359d5e8e4916
ndroid_media_AudioSystem.cpp
0b98ac2defaaf71784e69b93fd47bb3dffa9804c 18-Jun-2015 Leon Scroggins III <scroggo@google.com> am eaec64c8: am 8c6750ff: Merge "Fixes for Region_writeToParcel." into mnc-dev

* commit 'eaec64c83703c0c28e18cb2fe602f359454e672a':
Fixes for Region_writeToParcel.
8c6750ff0eb2d07039336bf25dc87f10464c42db 18-Jun-2015 Leon Scroggins III <scroggo@google.com> Merge "Fixes for Region_writeToParcel." into mnc-dev
6b819b4147af4ec14ec08c50f83bb42f44481917 17-Jun-2015 Michael Wright <michaelwr@google.com> Add method to set action button on MotionEvent

Change-Id: Id7c547eb6d925385c7c444aa4f3cb754ddecaf6e
ndroid_view_MotionEvent.cpp
6aecbb337fb2b0d9e70c76303e08b4fe96123abf 17-Jun-2015 Paul McLean <pmclean@google.com> am 33f77d3c: am d4bd4e7f: Merge "Map >= 24bit encodings to ENCODING_PCM_FLOAT" into mnc-dev

* commit '33f77d3c5abd6c1f6e9fc1164c3ae6eca481e1cd':
Map >= 24bit encodings to ENCODING_PCM_FLOAT
d4bd4e7ffc19c14eb169a39e8cb20fc46d2551f4 17-Jun-2015 Paul McLean <pmclean@google.com> Merge "Map >= 24bit encodings to ENCODING_PCM_FLOAT" into mnc-dev
4e5e9e9405dc626a03a653161644841102ad89f1 17-Jun-2015 Paul McLean <pmclean@google.com> Map >= 24bit encodings to ENCODING_PCM_FLOAT

Bug: 21851140
Change-Id: I8203281f5ca7d194e1bd2f417e75d3ef2fd561c7
ndroid_media_AudioFormat.h
ndroid_media_AudioSystem.cpp
2a6d6e504712dcddd030a6007d9dfbb089258619 17-Jun-2015 Leon Scroggins III <scroggo@google.com> Fixes for Region_writeToParcel.

Check the return value of Parcel::writeInplace. If it is NULL, there
was a failure, so do not attempt to write to it. Instead, report the
error and return false.

If SkRegion::writeToMemory claims to have written a different amount of
memory than it claimed it needed, report that error as well.

Change uses of NULL in this function to nullptr.

BUG:21271229
BUG:20666821
Change-Id: Ia6160f74f30bf42f5ff97f716dadb01d1f0d6961
ndroid/graphics/Region.cpp
407753c456c1eb2c8556ae7891b6bef43b044e76 16-Jun-2015 Narayan Kamath <narayan@google.com> ZipFileRO: Use precise widths for zip file types.

getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.

This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.

Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".

bug: 21622286

(cherry picked from commit 4600dd053dbdbd4b95f3b11057a1cc55b99f9c77)

Change-Id: I7886cb37a229cc27c625699c80e6a6a6117d2203
om_android_internal_content_NativeLibraryHelper.cpp
4c50df66f9756017108be49fcd91be021d2baf30 17-Jun-2015 Narayan Kamath <narayan@google.com> am 5131e025: am 4600dd05: ZipFileRO: Use precise widths for zip file types.

* commit '5131e0255d676c2ead28dbfb7957d753da21e9ab':
ZipFileRO: Use precise widths for zip file types.
4600dd053dbdbd4b95f3b11057a1cc55b99f9c77 16-Jun-2015 Narayan Kamath <narayan@google.com> ZipFileRO: Use precise widths for zip file types.

getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.

This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.

Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".

bug: 21622286

Change-Id: Iae675a9601db7aae03a8b80b40321d2cc1d97f50
om_android_internal_content_NativeLibraryHelper.cpp
51219951a8e72c199fd15aad1614fc046d2a03a4 17-Jun-2015 Ruben Brunk <rubenbrunk@google.com> am de2896a5: am 5e063b1d: Merge "Move distortion correction to correct opcode list." into mnc-dev

* commit 'de2896a5da011313ed89a873b92bca0c2529a875':
Move distortion correction to correct opcode list.
5e063b1da52cca1b93b19bdf7be694aabf95d336 17-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Move distortion correction to correct opcode list." into mnc-dev
fe81662cc5c0f04ecd2ef2d96b1d8890500d69a5 17-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Move distortion correction to correct opcode list.

- Prior to this, the lens distortion correction was applying
resampling to the bayer mosaic, resulting in magenta
output images (oops).

Bug: 20491394
Change-Id: Ia244364954062d1c38ef3ec3b7a1d087904112f9
ndroid_hardware_camera2_DngCreator.cpp
e22a8042abbcce941ae82752a60c78f805db973b 17-Jun-2015 Paul McLean <pmclean@google.com> am 1f2e0e42: am 8ff232c7: Merge "Implement channel index masks in AudioDeviceInfo." into mnc-dev

* commit '1f2e0e4244485fa49d036dc54a90f08df095f428':
Implement channel index masks in AudioDeviceInfo.
8ff232c7be5e075b6b0e10b8f40b556c97b79651 16-Jun-2015 Paul McLean <pmclean@google.com> Merge "Implement channel index masks in AudioDeviceInfo." into mnc-dev
f29e5f34b39a5688925ca4654be0eab11277b1cc 15-Jun-2015 Paul McLean <pmclean@google.com> Implement channel index masks in AudioDeviceInfo.

Bug: 21146646
Change-Id: I210f6bb4a4ec0ac0820d1823cffe417141725327
ndroid_media_AudioSystem.cpp
88727a3c874ec2006eb5eafdf8bef155bbb9d63b 16-Jun-2015 Ruben Brunk <rubenbrunk@google.com> am 8d58dcc7: am 1c52669d: Merge "Add distortion correction opcodes in DngCreator." into mnc-dev

* commit '8d58dcc7f10bbfb88b3575cbb6a03f0f0af02abd':
Add distortion correction opcodes in DngCreator.
1c52669d1f35e11feaad52a65507a9c4f1f4c876 16-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Add distortion correction opcodes in DngCreator." into mnc-dev
5f2368d6def80ad18ee77cdf0e451c0e9f41e322 06-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Add distortion correction opcodes in DngCreator.

Bug: 20491394

Change-Id: Ic85470cbb1cd121db9fb9c37f012fbf9dba1a8cb
ndroid_hardware_camera2_DngCreator.cpp
34d65a513aa99671f24831495d97765de8b91766 16-Jun-2015 Mark Salyzyn <salyzyn@google.com> am b17c58dd: am 26a40606: Merge "jni: isLoggable calls __android_log_is_loggable"

* commit 'b17c58dd7f923f87f65c2c1ef644ab0f1b60c1da':
jni: isLoggable calls __android_log_is_loggable
2b3db1444ab0bb7c2a2d13febb4fa88aebecf74c 25-Apr-2015 Mark Salyzyn <salyzyn@google.com> jni: isLoggable calls __android_log_is_loggable

(cherry pick from commit 8685a4569d2bdcb1a7361e3d75f832cf3ba9d4b6)

Will inherit additional functionality and cache improvements

Bug: 17760225
Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4
ndroid_util_Log.cpp
8685a4569d2bdcb1a7361e3d75f832cf3ba9d4b6 25-Apr-2015 Mark Salyzyn <salyzyn@google.com> jni: isLoggable calls __android_log_is_loggable

Will inherit additional functionality and cache improvements

Bug: 17760225
Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4
ndroid_util_Log.cpp
1f2c7688c1f673790d61645632ae5e1838f021a4 03-Jun-2015 Michael Wright <michaelwr@google.com> Add new `hid` command.

This allows the shell user to inject HID events.

Change-Id: I37faff576299ff14092b61ed39f2a1c086f672a5
ndroid_view_DisplayEventReceiver.cpp
35b387f36008a69d1b61cc2760d464db3b898ee8 12-Jun-2015 Ruben Brunk <rubenbrunk@google.com> am 879e12a1: am dcb9e169: Merge "Set scaling mode for legacy device surfaces." into mnc-dev

* commit '879e12a14ac2bb756a3548c67ff4145a9b1aeedf':
Set scaling mode for legacy device surfaces.
dcb9e169d7b37d62112c25c65da54c2b92651f9f 12-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Set scaling mode for legacy device surfaces." into mnc-dev
a94c6033452b465a28d6bd76015d4a1de6b1bd29 11-Jun-2015 Ruben Brunk <rubenbrunk@google.com> Set scaling mode for legacy device surfaces.

Bug: 19371754
Change-Id: I0dd762e7b1485ba2d3bec9604407125c35ad1218
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
544d7b7cf1dca25cf25ddb0bd026352d0bee3a61 11-Jun-2015 Chris Craik <ccraik@google.com> am c4f8e6d5: am 1b83edc6: Merge "Workaround shader crash" into mnc-dev

* commit 'c4f8e6d5ed8394d818b99ae11a791719ad371647':
Workaround shader crash
1b83edc6160d18323c7a0e0b892e97c05914ff81 11-Jun-2015 Chris Craik <ccraik@google.com> Merge "Workaround shader crash" into mnc-dev
5a642f2b7c6d291085afd92780f9ee84f65803ca 11-Jun-2015 Eino-Ville Talvala <etalvala@google.com> am e4112744: am cd17a84a: Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev

* commit 'e411274447a266e4637ec7f5eee7262a796712a7':
Add more specific consumer names for common buffer queue endpoints.
cd17a84a860769049806c8a7fe80d274edcd950d 11-Jun-2015 Eino-Ville Talvala <etalvala@google.com> Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev
b786bbdd1164cf3ca7fcfb8448c7c619a82118a0 11-Jun-2015 Chris Craik <ccraik@google.com> Workaround shader crash

bug:21706035

Change-Id: Ia1cd4824c742b2d6fc0feb2861ccfde0b6ac2189
ndroid/graphics/Shader.cpp
6849a678bf5da623768e2ff6ef36daa0fb6c869c 10-Jun-2015 Michael Wright <michaelwr@google.com> am 299cd16b: am cc87cfa2: Merge "Fix order of initialization arguments for obtained MotionEvents." into mnc-dev

* commit '299cd16bf49b4a18f4a763038fe4c52671ba0306':
Fix order of initialization arguments for obtained MotionEvents.
7a629cc78eef76c0a80855fb69de1afaceaf553c 10-Jun-2015 Michael Wright <michaelwr@google.com> Fix order of initialization arguments for obtained MotionEvents.

Bug: 21330711
Change-Id: I308f7675d2730210228a0c01856616ce07d6374e
ndroid_view_MotionEvent.cpp
ef9db7d81b0ce1093944b9e3d5efb6ab756f5cbc 09-Jun-2015 Eino-Ville Talvala <etalvala@google.com> Add more specific consumer names for common buffer queue endpoints.

Change-Id: I744bdcba6e60e5efd8865f725b09a9f791d76160
ndroid/graphics/SurfaceTexture.cpp
2f4df690e5b67aab52d33cf7be405faaf96db74d 08-Jun-2015 Narayan Kamath <narayan@google.com> am abf7f323: am f5b7778e: Merge "Pass MUTF-8 paths to open(2) instead of UTF-8."

* commit 'abf7f323400f2b896280aea6f0d512f08feee50b':
Pass MUTF-8 paths to open(2) instead of UTF-8.
d415303c4d02c1d30dd4199bade4694bf2cb4615 02-Jun-2015 tao.pei <tao.pei@ck-telecom.com> Pass MUTF-8 paths to open(2) instead of UTF-8.

Modified UTF-8 and UTF-8 differ with respect to how they handle
non-BMP characters. Modified UTF-8 uses 2 x 3 byte encodings, one
each for the high and low surrogate, whereas UTF-8 uses a single
4 byte sequence.

File systems don't specify and encoding and therefore the file name
encoding will vary depending on how it's created. All standard
Java APIs (java.io.File / FileOutputStream etc.) use Modified UTF-8
filenames, so we assume that's the status quo.

We will also audit code from the rest of the platform to make sure
that file names are encoded consistently.

bug: 21578056

Change-Id: I8e37af7f7cc442805a48899917f8e61c8f81fba6
ndroid_os_Parcel.cpp
faa4a6b0bfc85b8d6e96264ac84aca7d68261571 06-Jun-2015 Jeff Brown <jeffbrown@google.com> am 95fe4e20: am c203e61d: Merge "Fix Bitmap parceling through ashmem." into mnc-dev

* commit '95fe4e20604a4a38651841b451e41705e2571054':
Fix Bitmap parceling through ashmem.
a316c5dfbc6355f536d765959cacb06bbfed76ad 06-Jun-2015 Jeff Brown <jeffbrown@google.com> Fix Bitmap parceling through ashmem.

Fixes a bug where the Bitmap parceling code was unable to deal with
sending bitmaps through Parcels that disallow file descriptors.
Uses extended functionality of the Parcel blob interface to pass
buffers around more efficiently while adapting to whether FDs
are allowed.

Bug: 21428802
Change-Id: If24926f4388d29aa2aac627000436beb015edcb9
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_os_Parcel.cpp
bfc8742783c4fc1a8aa082519a33aeae2fa38b38 05-Jun-2015 Svet Ganov <svetoslavganov@google.com> am acce6dda: am e0748316: Merge "Update the pdfium library - framework" into mnc-dev

* commit 'acce6dda97e57db562f751bdd5ff72ea058dd970':
Update the pdfium library - framework
fbd02886559e7ca2b619ed0d9bff76b10cdb23c3 04-Jun-2015 Svet Ganov <svetoslavganov@google.com> Update the pdfium library - framework

Change-Id: I4880e9310c02c6e26d4560fb8515f2ce51c597f4
ndroid.mk
ndroid/graphics/pdf/PdfEditor.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
76c3563fe886710d3f2ba42bea012051a072348b 04-Jun-2015 Chris Craik <ccraik@google.com> am 704b3bd4: am f1bbdf51: Merge "FastJNI for android.os.Trace" into mnc-dev

* commit '704b3bd4a28bf9ec5d69d527cc6e7d69b1dccbaf':
FastJNI for android.os.Trace
f1bbdf5182107aa7779cd1a91d8652f04fa1b399 04-Jun-2015 Chris Craik <ccraik@google.com> Merge "FastJNI for android.os.Trace" into mnc-dev
a29cb3d68ebda5669769cffe48590b9d643884a2 03-Jun-2015 Chris Craik <ccraik@google.com> am 1bd73625: am 1b54fb27: Delete MAKE_ENUM_FLAGS

* commit '1bd73625bda2fe10762911281632c1ac5ad2d3bc':
Delete MAKE_ENUM_FLAGS
a2235eedde2eb240f48a459df75a2b0d0599e7c5 03-Jun-2015 Chris Craik <ccraik@google.com> FastJNI for android.os.Trace

bug:21566713

Change-Id: I129e405fe46268b9d40974d3a43f06a1faf4cadd
ndroid_os_Trace.cpp
1b54fb27ac48495ed0b33868fda5776fb49fe0f3 03-Jun-2015 Chris Craik <ccraik@google.com> Delete MAKE_ENUM_FLAGS

bug:21595702

Settle on namespace-enum for consistency. Also removes k prefix.

Change-Id: Ib89f94cb9263de40b6e4636577dca4860867d0d8
ndroid_view_Surface.cpp
d5f58e4adc22c41ef9542cf29e7e48c293cc9d93 03-Jun-2015 Raph Levien <raph@google.com> am 8d633080: am e7934a65: Merge "Apply contextStart consistently in getRunAdvance" into mnc-dev

* commit '8d6330804826424bb99c0805657414558257419d':
Apply contextStart consistently in getRunAdvance
36ff86c9a3d61dfab43b7f35631bf86d65150252 03-Jun-2015 Raph Levien <raph@google.com> Apply contextStart consistently in getRunAdvance

The contextStart needs to be applied to all offsets relative to the
actual start of context. The code was missing "offset", which caused
mischief especially in mixed LTR and RTL text.

Bug: 21573666
Change-Id: I47a1b6cde5862442b9c7236ee72b2ceb0df9b2e9
ndroid/graphics/Paint.cpp
140f2b41af22e0b5c2a1d6e892333cd93631fc11 20-May-2015 Christopher Tate <ctate@google.com> Close race condition in binderDied()

It was possible for a binderDied() call to occur while the death
recipient list containing the object was being iterated, in which
case we could invalidate an object reference out from under the
iteration, causing a VM abort. We now interlock the binderDied()
deref operation with the list's locking semantics to prevent this.

Bug 15831054

(cherry picked from commit 090c08ff2a7525c830b4edfd1a79aa8ee3893c60)

Change-Id: If0027d3ac4da1153284a425dd9b2819a203481ab
ndroid_util_Binder.cpp
67cf94ba85a74acfb72658ca22290655aab60f0c 29-May-2015 Glenn Kasten <gkasten@google.com> am b182d570: am 626f0dc7: Merge "Deprecations are warnings not errors" into mnc-dev

* commit 'b182d570c46330e95301dd46bc15c1b631e9ca42':
Deprecations are warnings not errors
626f0dc73bc1007d16688eddf29ea58ec26f424e 29-May-2015 Glenn Kasten <gkasten@google.com> Merge "Deprecations are warnings not errors" into mnc-dev
9d698acfc487e2e161bc3e56d7ba664c329a57a3 28-May-2015 David Srbecky <dsrbecky@google.com> am efe01cc6: am 3976a569: Merge "Replace --include-cfi with --generate-debug-info."

* commit 'efe01cc62ee49f57c34726ec9c13ddaa9c1b1d8b':
Replace --include-cfi with --generate-debug-info.
f39477b592e6e17fe41ace2e18602a69b2dd1619 28-May-2015 David Srbecky <dsrbecky@google.com> Replace --include-cfi with --generate-debug-info.

This follows a change in dex2oat.

Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
ndroidRuntime.cpp
85d99546a0dd6e38c2d60903c3b3e73577e1207c 18-May-2015 Glenn Kasten <gkasten@google.com> Deprecations are warnings not errors

Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
ndroid.mk
16144ac3789f6dbe36a7011cf23305f072a7bfcb 28-May-2015 Glenn Kasten <gkasten@google.com> Merge "Add comments to indicate code review was done for bugs" into mnc-dev
0781a2f116be045ff1a3aca721c47f9fef980bea 28-May-2015 John Reck <jreck@google.com> Fix reconfigure & setPremult alpha handling

Bug: 20948129
Change-Id: Ifba35e5d87772a304fd3655e4a2363b293a6d8ac
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Bitmap.h
99fbb56a0ab81ead404480f0c2df529332a93a32 26-May-2015 Martijn Coenen <maco@google.com> Merge "Don't count lowmem mappings as memory used." into mnc-dev
fa4d547d5813a8f5c298efd089890b5b502df76d 22-May-2015 Dianne Hackborn <hackbod@google.com> Merge "Improve reporting to apps of transaction too large failures." into mnc-dev
843f1e0f94dc1a6af209d16b3a22e100925f44fb 22-May-2015 Eric Laurent <elaurent@google.com> Merge "sound trigger: fix wrong field type in JNI" into mnc-dev
89311c282abbbe647566ae4afbdb9c9851f0bec3 22-May-2015 Eric Laurent <elaurent@google.com> sound trigger: fix wrong field type in JNI

Bug: 20951546.
Change-Id: I44f6dd05888e335a70bd212eb6f9c468a338ff92
ndroid_hardware_SoundTrigger.cpp
ab3576e58a8d3965f57473e03ec8de69ae13404b 22-May-2015 Martijn Coenen <maco@google.com> Don't count lowmem mappings as memory used.

Bug: 21268095
Change-Id: I1b5f42752752584e947af710e53896203fbe477c
ndroid_os_Debug.cpp
e5c42621095a12e7d22ca5ab871dacd28c9bff41 20-May-2015 Dianne Hackborn <hackbod@google.com> Improve reporting to apps of transaction too large failures.

If the app tried to do various things with too much data --
starting an activity, starting a service, sending a broadcast --
this would fairly silently fail with little indication of what
was going on. Fix this in two ways:

- Now when the native code generates a TransactionTooLargeException,
it may include an additional message in it telling you how much
data was in the parcel being sent, to help you understand why
this happening.

- In all the framework code paths where we call to the system and
may fail, convert these failures into a a runtime exception and
rethrow them back to the app so that it will clearly get the
above message.

Change-Id: I745159b97d3edb6fca86aa09cbc40c1f15a7d128
ndroid_util_Binder.cpp
ndroid_util_Binder.h
7ca242e0b4f4abcf2f726ec3c45e3fed2a289c16 21-May-2015 Christopher Tate <ctate@google.com> Merge "Close race condition in binderDied()" into mnc-dev
aba3ecb976cacd7c92fe8f8afae20d112781d68e 21-May-2015 Leon Scroggins III <scroggo@google.com> Merge "Fix overflow in NinePatchImpl." into mnc-dev
d6c3404f597b4ea12c56554ab509e227f9722a77 21-May-2015 Paul McLean <pmclean@google.com> Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev
462dd010467fdf1ab0cb49e021a92d14f2163c8c 21-May-2015 Leon Scroggins III <scroggo@google.com> Fix overflow in NinePatchImpl.

Cast numXDivs to a size_t before adding 1, so that if numXDivs is 255
it does not overflow. Move the calculation outside of alloca().

BUG:20727488
Change-Id: I2ecc9d650338acba7316554cb72195e02816b1f8
ndroid/graphics/NinePatchImpl.cpp
cef696e8b464e6479ed352b3b490e41ee677bd91 21-May-2015 Paul McLean <pmclean@google.com> Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice().

Change-Id: Ibf77bb0757720aa25eaaf6e603ab446257430453
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
97de0c9a29f76f936e1d93f9031e178b56af514f 21-May-2015 Eric Laurent <elaurent@google.com> Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev
0867bed9ddb3bea3d7c252791f8b62ae21ad3de5 20-May-2015 Eric Laurent <elaurent@google.com> AudioService: indicate system ready to AudioFlinger

Indicate when JAVA services are ready to AudioFlinger so that
calls to power manager and scheduling service can be enabled.

Bug: 11520969.
Change-Id: Id977cab3208c34709011703d2dfdcf552e60371b
ndroid_media_AudioSystem.cpp
b14b7e188fd1cc5215d2ac0c2a1c1588089712f1 21-May-2015 Andy Hung <hunga@google.com> Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev
e90a0a88f4eabdc27c3ef033f38c91ea23362a1e 20-May-2015 Andy Hung <hunga@google.com> Fix AudioTrack, AudioRecord, AudioFormat API

Rename getNativeFrameCount to getBufferSizeInFrames
Remove throw declaration on IllegalArgumentException and
IllegalStateException

Bug: 20887665
Bug: 21304902
Change-Id: Ia85d8010be46524b9a8b93105b16b7b9480f6bd9
ndroid_media_AudioRecord.cpp
5aa384cdc8f2228ccdecf09d7f15d7f92cd23500 20-May-2015 Eric Laurent <elaurent@google.com> Merge "AudioFormat: more compressed formats" into mnc-dev
090c08ff2a7525c830b4edfd1a79aa8ee3893c60 20-May-2015 Christopher Tate <ctate@google.com> Close race condition in binderDied()

It was possible for a binderDied() call to occur while the death
recipient list containing the object was being iterated, in which
case we could invalidate an object reference out from under the
iteration, causing a VM abort. We now interlock the binderDied()
deref operation with the list's locking semantics to prevent this.

Bug 15831054

Change-Id: If0027d3ac4da1153284a425dd9b2819a203481ab
ndroid_util_Binder.cpp
cae346633321e237f824f3ca10d7e6fff2307b2f 20-May-2015 Eric Laurent <elaurent@google.com> AudioFormat: more compressed formats

Add MP3 and AAC as valid AudioFormat encodings.
Only @hide for now to allow system components to manage
audio patches with those formats.

Bug: 18649264.
Change-Id: I5ef5f151783308e31d8ac5b29454589077ef62ea
ndroid_media_AudioFormat.h
c1a9436d27e41347e6063b1cfb77eaef7e191ca4 19-May-2015 Paul Jensen <pauljensen@google.com> Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev
252893df572256657d02b08eb52596bc9e82d5cc 19-May-2015 Derek Sollenberger <djsollen@google.com> Merge "Check that the parcel contained the expected amount of region data." into mnc-dev
863e65e123e19254901871426caf39f1145ce3bd 18-May-2015 Adam Powell <adamp@google.com> Merge "Add -round and -notround qualifier to android runtime/aapt" into mnc-dev
14d226a2cd7b39e17a3f0bfdab79e645f7146f53 18-May-2015 Glenn Kasten <gkasten@google.com> Add comments to indicate code review was done for bugs

Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
721ae5fec5f1fd4f93aa2a361a0ac298e15ce353 12-May-2015 Riley Andrews <riandrews@google.com> Add internal bitmap api for creating immutable ashmem backed bitmaps.

Bug 21037890
Change-Id: I827e83dd75e301e7d93ead5efdd744f0d8435ae5
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
39d7f30ebe490c1d6aee76b0b61e3e67dec13e34 14-Nov-2014 Riley Andrews <riandrews@google.com> Use ashmem to optimize all bitmap copies.

Bug 21037890
Change-Id: Ie32ca3a0c527755f1a1b77db7548cb9629e2001b
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Bitmap.h
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
cdadfc211ddd232fde9f63d9aa3ae26af8b8f583 18-May-2015 Derek Sollenberger <djsollen@google.com> Check that the parcel contained the expected amount of region data.

bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
ndroid/graphics/Region.cpp
beda8613ad7bc01affa17857faed04d9589db34c 18-May-2015 Derek Sollenberger <djsollen@google.com> Merge "Ensure that unparcelling Region only reads the expected number of bytes" into mnc-dev
cee9b51c4beec4494d78bab784ba7e7e20c30e31 06-May-2015 Paul Jensen <pauljensen@google.com> Query HTTP proxy for network via a new API to avoid permissions exceptions

Add @hidden ConnectivityManager.getProxyForNetwork() API.

Bug:20470604
Change-Id: I6a9bc4afc8273bc43b14cdeccfedbbf3ff66be40
ndroid_net_NetUtils.cpp
58cff53a5de6bce1fd70add90a3cd0bf14f779d6 16-May-2015 Jérôme Poichet <jpoichet@google.com> Merge "SkScalarDiv and its variants are deprecated" into mnc-dev
2738c96d998dedfae5b4670d588d0cd299c4ca0f 14-May-2015 Adam Lesinski <adamlesinski@google.com> Add -round and -notround qualifier to android runtime/aapt

The round qualifier denotes a device with a screen shape that
is round. The qualifier shows up after the 'long/notlong' qualifier
and before the orientation 'port/land/square' qualifiers.

Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
ndroid_util_AssetManager.cpp
2cc4a4755fcd41900e042c75cc47879d46acecda 15-May-2015 Alan Viverette <alanv@google.com> Merge "Adjust light source for window position" into mnc-dev
50210d912925aef14e4ce69be82e4949122a3cd9 15-May-2015 Alan Viverette <alanv@google.com> Adjust light source for window position

Bug: 16523629
Change-Id: I2f3fed1edcac0a3cfd5034aded45e08ececfebaf
ndroid_view_Surface.cpp
ndroid_view_ThreadedRenderer.cpp
0e4a2b5ff0ee061c46bfe3b1f15a7067308e0da8 15-May-2015 John Reck <jreck@google.com> Merge "Check for setting to already set" into mnc-dev
6d8371e73ff6452be5a23089e7edeb8d6d96f065 15-May-2015 John Reck <jreck@google.com> Check for setting to already set

Bug: 20105644
Change-Id: Ia79d2ae5c725c139d2b7c423a899be625cb8f14f
ndroid/graphics/SurfaceTexture.cpp
1b2e5c11b6a89d56d5058907c3b0c88bf0170857 14-May-2015 Michael Wright <michaelwr@google.com> Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev
5bd69e6e6164c59a0423edd0d5243fc8c07e6af3 14-May-2015 Michael Wright <michaelwr@google.com> Revert "Revert "Add new MotionEvent actions for button press and release.""

This reverts commit 96238051621ba2dc8a1c20fa48a00ec6ec4735d6.
ndroid_view_InputEventSender.cpp
ndroid_view_MotionEvent.cpp
3d5286983447262f12b78785391681b20a71f6b2 14-May-2015 Michael Wright <michaelwr@google.com> Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
96238051621ba2dc8a1c20fa48a00ec6ec4735d6 14-May-2015 Michael Wright <michaelwr@google.com> Revert "Add new MotionEvent actions for button press and release."

This reverts commit ec0ce51b733f10c620cb9447b074f022d042e31d.
ndroid_view_InputEventSender.cpp
ndroid_view_MotionEvent.cpp
07b83f1c9e8a7692a985aa2d13ac13fc5521aa4b 14-May-2015 Michael Wright <michaelwr@google.com> Merge "Add new MotionEvent actions for button press and release." into mnc-dev
ec0ce51b733f10c620cb9447b074f022d042e31d 08-May-2015 Michael Wright <michaelwr@google.com> Add new MotionEvent actions for button press and release.

Introduce ACTION_BUTTON_PRESS and ACTION_BUTTON_RELEASE as actions to
signal a button press or release. If these actions happen
simulanteously with a DOWN or UP event then they're explicitly
ordered to happen after the DOWN or preceding the UP in order to send
them to the most recently targeted view.

Also, introduce new stylus button constants that differ from the
constants we use for mouse buttons.

Bug: 20704355
Change-Id: I5b75e5c5e692171c1c117ee687dd185a0d9dd15c
ndroid_view_InputEventSender.cpp
ndroid_view_MotionEvent.cpp
1864460bf3c495e7821326f9753324247d4c778b 14-May-2015 Andy Hung <hunga@google.com> Merge "Allow partial playback parameter settings in AudioTrack" into mnc-dev
973b8851eecbdcbab4992be01aaab568fd371a0a 14-May-2015 Andy Hung <hunga@google.com> Allow partial playback parameter settings in AudioTrack

Change-Id: Ifb12c85312e25aa74da47fe0eae2d5b1fa4bb23b
ndroid_media_AudioTrack.cpp
3b1d46e809ed38cd5662c110c511b8d98868ed72 13-May-2015 Hiroshi Yamauchi <yamauchi@google.com> Replace JNI primitive array critical calls with non-critical ones.

The files generated by glgen + manually edited util.cpp.

(cherry pick commit 5b406cb7b548443b589f0acb235c8a7465ffb82b)

Bug: 19235243
Change-Id: I9ab79c36e4ac6e123296b06ee8e4c04c4f583104
ndroid/opengl/util.cpp
ndroid_opengl_EGL14.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
ndroid_opengl_GLES30.cpp
ndroid_opengl_GLES31.cpp
ndroid_opengl_GLES31Ext.cpp
om_google_android_gles_jni_GLImpl.cpp
3082fe440f90b7a3e6e031b6641f4a71b907dd4f 13-May-2015 Derek Sollenberger <djsollen@google.com> Ensure that unparcelling Region only reads the expected number of bytes

bug: 20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
ndroid/graphics/Region.cpp
c126b8e81f5055dadfa8805d530a262a2cf05ab3 13-May-2015 Hiroshi Yamauchi <yamauchi@google.com> Merge "Replace JNI primitive array critical calls with non-critical ones." into mnc-dev
47b3441537b182a61d3a41d39095c40761d49457 13-May-2015 Mike Reed <reed@google.com> SkScalarDiv and its variants are deprecated

Change-Id: Icf2c13d0b19360753c9eed5f991b056201eb63df
(cherry picked from commit 4069f39b30084c4c907ce9921275975ff3d1b9d5)
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
38303bccb480d000fef1e42408ca4a097d47db92 13-May-2015 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix DngCreator default crop size." into mnc-dev
0e679e75a2f715f71950644797d983dba57a48d0 13-May-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Fix DngCreator default crop size.

Bug: 20090682
Change-Id: I4343fc10a4f812f706a5423b133fcd32a794976a
ndroid_hardware_camera2_DngCreator.cpp
95c7a13f2ac4f31ed3aaec9b47b9a29a3dbca978 12-May-2015 Roozbeh Pournader <roozbeh@google.com> Add hyphenationFrequency attribute to TextView and StaticLayout.

This patch adds plumbing to TextView and StaticLayout to control the
frequency of automatic hyphenation used in laying out paragraphs.

Bug: 21038249
Change-Id: Ib45de190eb0a1ed738e69fd61f2b39561b11aec7
ndroid_text_StaticLayout.cpp
5b406cb7b548443b589f0acb235c8a7465ffb82b 08-May-2015 Hiroshi Yamauchi <yamauchi@google.com> Replace JNI primitive array critical calls with non-critical ones.

The files generated by glgen + manually edited util.cpp.

Bug: 19235243

Change-Id: Id48d39bafc21c27fbf667ed0f4e082dda3a37be3
ndroid/opengl/util.cpp
ndroid_opengl_EGL14.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
ndroid_opengl_GLES30.cpp
ndroid_opengl_GLES31.cpp
ndroid_opengl_GLES31Ext.cpp
om_google_android_gles_jni_GLImpl.cpp
ea4eb326cfc4a8221be5fdab9639d468c632aee2 09-May-2015 Wei Jia <wjia@google.com> Merge "MediaSync: address API review." into mnc-dev
2d61e2b97c92ac2de80ebb3782b728ae5cdf5306 09-May-2015 Wei Jia <wjia@google.com> MediaSync: address API review.

Rename *Settings to *Params;
Remove size parameter from MediaSync.queueAudio();

Bug: 20887706
Change-Id: I4c572da92ada51458031a482b96b3f624224e608
ndroid_media_AudioTrack.cpp
6a8c79bb2b4b0c749e76dc3628ec5200efec4f40 07-May-2015 Alan Viverette <alanv@google.com> Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev
2a94a10bec186d832c2b95675cb6dc27b012c2d0 07-May-2015 Derek Sollenberger <djsollen@google.com> Update the rowBytes when reconfiguring to match the new imageInfo.

bug: 20872840
Change-Id: Ic98a9d16e095c27ddcc193a18641732c1ee4bad0
ndroid/graphics/Bitmap.cpp
b59642bf49e8703ebd88532f06628ef5a7d8b006 07-May-2015 John Reck <jreck@google.com> Merge "Add warning if an in-use Bitmap is reconfigured" into mnc-dev
ae2e8b4891491e8e89bed5f2c9626415adee09cb 06-May-2015 John Reck <jreck@google.com> Add warning if an in-use Bitmap is reconfigured

Bug: 18928352

Also fix an issue around re-configure not properly handling
mPinnedCount in android::Bitmap

Change-Id: I1815b121f1474ad931060771bb1d52ef31d2aac7
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Bitmap.h
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_view_SurfaceControl.cpp
b65cd17b0508a5a7afdd92e69437825071a1631b 06-May-2015 Eric Laurent <elaurent@google.com> Merge "Implement audio routing callbacks" into mnc-dev
e54d245b993e1347cb32c23a6bdc907a45fab324 06-May-2015 Alan Viverette <alanv@google.com> Improve keying for theme caches, rebase system theme on config change

Themes now use an array of applied styles rather than a String to store
their history. They are keyed based on a hash code computed from the
history of applied styles. The themed drawable cache has been abstracted
out into its own class.

Also updates system context to use DayNight as the default and ensures
that GlobalActions uses the correct context, which exercises the change.

CTS tests have been added in another CL.

Bug: 20421157
Change-Id: I9eb4b7dffd198ad24d02f656eaf0839570b59caa
ndroid_util_AssetManager.cpp
4bcdba848449b33d7022de527c526943aff1f5fd 01-May-2015 Eric Laurent <elaurent@google.com> Implement audio routing callbacks

Implement JNI for AudioTrack and AudioRecord routing
callbacks:
- Added files core/jni/android_media_DeviceCallback.cpp/.h
for JNI callback implementation used by both AudioTrack
and AudioRecord.
- Made AudioManager AudioPort and AudioPatch methods static
in order to call them without context.

Also added IO handle information to AudioMixPort.

Change-Id: Icee182aa68310d4b12fd1469f48e78110889acf1
ndroid.mk
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_DeviceCallback.cpp
ndroid_media_DeviceCallback.h
356b1777092e7da3ac5eae0bc94bd21e1cf9319a 05-May-2015 Chris Craik <ccraik@google.com> Merge "Cleanup properties" into mnc-dev
2507c34d91bb0d722b6012e85cb47387b2aa6873 04-May-2015 Chris Craik <ccraik@google.com> Cleanup properties

bug:19967854

Separate properties from Caches, into static, RenderThread-only class.

Also rewrites the means for java to set properties to correctly handle
threading, and adds an override for profile bars so that SysUi doesn't clutter
the screen with them.

Change-Id: I6e21a96065f52b9ecc49d1a126244804ba106fa9
ndroid_view_DisplayListCanvas.cpp
ndroid_view_ThreadedRenderer.cpp
261208e002775fe9a9f4e79e9f70b41852cfbe60 05-May-2015 Alan Viverette <alanv@google.com> Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
c1d527926e1c82828e42bdc0c7abf50f6decc0a7 05-May-2015 Alan Viverette <alanv@google.com> Add API for obtaining changing configurations bitmask from Theme

Required to know when to reload the system context's theme in response
to configuration changes, and thus needed to support the DayNight theme.

Bug: 20267825
Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514
ndroid_util_AssetManager.cpp
28a516280a59a81aeecbf4a68057019d59feb872 05-May-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioRecord JNI: use default UID / PID" into mnc-dev
60e1dc2e3e7552854302c624f4bee86ae3e82b1b 02-May-2015 Jean-Michel Trivi <jmtrivi@google.com> AudioRecord JNI: use default UID / PID

Bug 20832981

Change-Id: I887e38a4e95c9f4b9360f831b3dfc0073d151706
ndroid_media_AudioRecord.cpp
f29ed28c7b878ef28058bc730715d0d32445bc57 07-Apr-2015 John Reck <jreck@google.com> Attempt to solve the double-GC problem

Fix the issue where Bitmap requires two GC passes
to release its byte[] by using some questionable
ref-counting hacks to manage whether or not
native has a strong or weak ref to the byte[]

Change-Id: Ia90a883579f61c0b1904b5549a66bd0ef34b32c5
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Bitmap.h
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_view_SurfaceControl.cpp
05dc201ff64f6324c2726a8841af7021e7071b97 04-May-2015 John Reck <jreck@google.com> Merge "Remove Bitmap#getSkBitmap" into mnc-dev
1641c0cb0b6baf313c82846fe4f64007078c604f 04-May-2015 John Reck <jreck@google.com> Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
574f53793d6441ebf55ca8811588ad37d9451a9a 02-May-2015 Svet Ganov <svetoslavganov@google.com> Merge "Add body sensors app op - framework base" into mnc-dev
7c103a36f60b690e3fe83c40210e1cb0c76bba43 16-Apr-2015 John Reck <jreck@google.com> Remove Bitmap#getSkBitmap

Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
ndroid/graphics/NinePatch.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_DisplayListCanvas.cpp
c6e2e8ff474ae44bab5b9eb665851118abd27b68 15-Apr-2015 John Reck <jreck@google.com> Move AssetAtlas off of SkBitmap*

Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
ndroid/graphics/Bitmap.cpp
b9d71a6f89b1183f6389b1774652445a420c6cbf 30-Apr-2015 Svet Ganov <svetoslavganov@google.com> Add body sensors app op - framework base

Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
ndroid_hardware_SensorManager.cpp
3ed7643916ad8a839513355296f8203121fc91cd 01-May-2015 Mathieu Chartier <mathieuc@google.com> Look at map extensions before /dev/ + ashmem.

Prevents stuff like:
dalvik-classes.dex appearing as GC overhead.

(cherry picked from commit 9308462a5972192a1ad9abd01b36e1ad545eef99)

Bug: 20752953
Change-Id: Iab0935e882a5d938651ec2581845d8242aaf98af
ndroid_os_Debug.cpp
9308462a5972192a1ad9abd01b36e1ad545eef99 01-May-2015 Mathieu Chartier <mathieuc@google.com> Look at map extensions before /dev/ + ashmem.

Prevents stuff like:
dalvik-classes.dex appearing as GC overhead.

Bug: 20752953
Change-Id: Iab0935e882a5d938651ec2581845d8242aaf98af
ndroid_os_Debug.cpp
78760b4ae47f5d59a541cbcbf1fca623bae4508a 01-May-2015 John Reck <jreck@google.com> Merge "A bunch more cleanups" into mnc-dev
3731dc220ed457e0f1e99d7ec2589e0a43872b59 14-Apr-2015 John Reck <jreck@google.com> A bunch more cleanups

Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
ndroid/graphics/Shader.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_ThreadedRenderer.cpp
db672b03a2de26127b40dbe50c794b5697b01c37 30-Apr-2015 John Reck <jreck@google.com> Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
ed207b92747234eac88dd3664ecfb535e45d8ed1 10-Apr-2015 John Reck <jreck@google.com> Change how Java Bitmaps are accessed in a few places

Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/pdf/PdfRenderer.cpp
ndroid/opengl/util.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_PointerIcon.cpp
om_google_android_gles_jni_EGLImpl.cpp
fcda22b1fe33370922a53d6562aa15366818bd45 30-Apr-2015 Andreas Gampe <agampe@google.com> Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev
f764d219f0faf82219600761c8d0562623b8f054 30-Apr-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev
5a56109d1f5c00404c8f0e4281b9ac1392d72886 24-Apr-2015 Jean-Michel Trivi <jmtrivi@google.com> AudioService receives callback for dynamic policy mix state changes

AudioService registers a callback for dynamic policies from
AudioSystem.
AudioSystem keeps track of a single callback for dynamic policies.

Bug 20226914

Change-Id: I48899d20d1dbb47bb680e733a3bc9fd064b60f07
ndroid_media_AudioSystem.cpp
1afdbe3b77959c4b37d33c19727651ca2046a0ff 30-Apr-2015 Andy Hung <hunga@google.com> Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev
fe48e0dfb9862356cd4af645fb010236fc273a4a 28-Apr-2015 Andy Hung <hunga@google.com> Pass PlaybackSettings as class object for AudioTrack JNI

Change-Id: Ic7fb5f84ed1fc4cc2286e5c207fee5298a64a5a4
ndroid.mk
ndroid_media_AudioTrack.cpp
5686780404a41901d226cc7ba506c1c0ba284713 29-Apr-2015 Svet Ganov <svetoslavganov@google.com> Merge "Respect the record audio app op - framework" into mnc-dev
b957a742b29fa6c7a2eda7d60cf61e8af4668ef8 29-Apr-2015 Jeff Brown <jeffbrown@google.com> Merge changes from topic 'brightness' into mnc-dev

* changes:
Add code to collect data about auto-brightness adjustments.
Add float support to binary event log.
e7e9ccea3246eec3607bfc77bc8500611989e84c 28-Apr-2015 Jeff Brown <jeffbrown@google.com> Add float support to binary event log.

Bug: 20664753
Change-Id: I90456400b878f943e39cbddec45649662176e2aa
ndroid_util_EventLog.cpp
325a57218e9f13cf696215006c230cac34b3c8a1 29-Apr-2015 Mathieu Chartier <mathieuc@google.com> Merge "Properly describe exception" into mnc-dev
876b7d8fa8c587cccbe11bd30fcdb6c378776420 29-Apr-2015 Mathieu Chartier <mathieuc@google.com> Properly describe exception

Previously we used DetachCurrentThread which raised a SIGABRT from
within ART. The new approach is to use ExceptionDescribe and exit.

Bug: 20640601

(cherry picked from commit d12065f581defd9e8199593e85aa2036a0713684)

Change-Id: I00126b678ff296e0076247554af8328fe2767038
ndroid_util_Binder.cpp
97a29433c33f4e2c8ab60167a4be41664f56c314 29-Apr-2015 Mathieu Chartier <mathieuc@google.com> Fix build

Change-Id: Ie056247ee9c4ae7693f3f5f5f68d4322546ee61a
ndroid_util_Binder.cpp
fa5ecdc4ac6d7a8db2bb9e4a6a60a3189025df30 28-Apr-2015 Svet Ganov <svetoslavganov@google.com> Respect the record audio app op - framework

Change-Id: I5696d2ef22738ccffaf8bd7a0ee68cbc3dea3bf1
ndroid_media_AudioRecord.cpp
ndroid_media_RemoteDisplay.cpp
d12065f581defd9e8199593e85aa2036a0713684 29-Apr-2015 Mathieu Chartier <mathieuc@google.com> Properly describe exception

Previously we used DetachCurrentThread which raised a SIGABRT from
within ART. The new approach is to use ExceptionDescribe and exit.

Bug: 20640601
Change-Id: Ia6c2345b656b2ada29d262399798a6ed717a7f85
ndroid_util_Binder.cpp
ff623a5ab3b26cd98790e355e316a65d76197cbd 28-Apr-2015 Chris Craik <ccraik@google.com> Merge "Remove unused flags and dirty rects" into mnc-dev
27c39f1adeaf1a653fb41a5af64ee815b8048dd6 27-Apr-2015 Andreas Gampe <agampe@google.com> am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp

* commit 'b6d14a009e43a4d61ae2a4f98f6e3b914148d0a9':
Frameworks/base: Add debug.gencfi property

(cherry picked from commit a5b55a017a984608eacdf414bc1cbcd7615f1c13)
ndroidRuntime.cpp
6bd27e1a0c030e0c47d21dd4c99c3133c85685a9 24-Apr-2015 Paul McLean <pmclean@google.com> AudioRecord device select continued

Change-Id: I3b6ace370b878351d98dbdcba2db718b30de2f27
ndroid_media_AudioRecord.cpp
956f340aacc7d8fc2d10f776551f13fde2d8d3ab 28-Apr-2015 Chris Craik <ccraik@google.com> Remove unused flags and dirty rects

bug:17209071

Also update DisplayList->RenderNode naming in Editor

Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
ndroid_view_DisplayListCanvas.cpp
398e24ee14b0e818d9515f7c57691a4d02282d5f 23-Apr-2015 Martijn Coenen <maco@google.com> Fix vmalloc memory accounting (DO NOT MERGE).

VmallocUsed from meminfo sums all vmalloc'd
memory areas, but it shouldn't count the areas
that were mapped with ioremap(); ioremap()'d
ranges usually map to I/O memory, not actual
physical memory.

Binder and CMA are exceptions, but in the
common case we're more accurate not counting
those regions either.

Bug: 20483106
Change-Id: I75e74d9477a30a3de84877531b6e614a71469d24
(cherry picked from commit f33b6292168ea6e90c9d52d477c922af23001f63)
ndroid_os_Debug.cpp
398e11837be681a9b732d2a2f4aa614a54b4d84b 25-Apr-2015 Aravind Akella <aakella@google.com> Merge "Add hidden SensorManager APIs for injecting sensor data."
a876b35d485008b690578889d11e69b40d4e7170 25-Apr-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Add debug.gencfi property

Add the debug.gencfi system property that forces generation of
CFI data.

Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
ndroidRuntime.cpp
30d794360f35592554403922bcc07835fea4737b 24-Apr-2015 Andy Hung <hunga@google.com> Move channel index computation to native AudioTrack JNI

Change-Id: I047a9dcce13a38c11da165607d668dfb9d7fa335
ndroid_media_AudioTrack.cpp
18ebf732b84d0575c871db35b25bf000e0c7c6a6 21-Apr-2015 Aravind Akella <aakella@google.com> Add hidden SensorManager APIs for injecting sensor data.

Change-Id: If49467ced1a719c49bb5ac7ab670e86ff4642eaa
ndroid_hardware_SensorManager.cpp
ec4097b0caf426cf48779762848456786587f443 24-Apr-2015 Paul McLean <pmclean@google.com> Merge "Explicit routing in AudioRecord"
2d6de4c38c899707e0596b7fa4dad9bbb3eb6b60 17-Apr-2015 Paul McLean <pmclean@google.com> Explicit routing in AudioRecord

Change-Id: Ib3af1041d9f7bbccefd6b86cd3c35baf742be861
ndroid_media_AudioRecord.cpp
25d4a63983430aa2461791445d2cea9829aab5be 23-Apr-2015 Andy Hung <hunga@google.com> Merge "Add channel index mask to AudioRecord"
98d4ca62290a45ea2a66826a1a99e9a664016808 20-Apr-2015 Andy Hung <hunga@google.com> Add channel index mask to AudioRecord

Change-Id: I5d2504d3a7af6611d3ffa9a4c2d3665a2cf97fef
ndroid_media_AudioRecord.cpp
463cb818ba2df8cf934494d1655731c4a26acc1d 23-Apr-2015 Andy Hung <hunga@google.com> Merge "Add PlaybackSettings for use with AudioTrack"
263b4c97823295c41900210515d0c769a236190c 16-Apr-2015 Andy Hung <hunga@google.com> Add PlaybackSettings for use with AudioTrack

Change-Id: Ie59686d46869558d489a7600170ddace00e548d5
ndroid_media_AudioTrack.cpp
c1b33d665c8caf5760f68c45c6ca0baa649b832a 22-Apr-2015 John Reck <jreck@google.com> GraphicsJNI Canvas cleanup

Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_graphics_Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
2099ee8ab574181627b9dac81e1ec4f3f80bce05 21-Apr-2015 Chris Craik <ccraik@google.com> Merge "Rename native DisplayListRenderer to DisplayListCanvas"
aa861666ed537389e335f586bc84fe8ddb9fb026 21-Apr-2015 Dan Sandler <dsandler@android.com> Fix build.

Change-Id: I0e419fdb36cedba67fc6da7f71134d9728f66150
ndroid_os_Parcel.cpp
954863ab9b0e1a859b0442a6a76adef087b05457 21-Apr-2015 Dan Sandler <dsandler@android.com> Merge "Add ashmem stats to Parcels."
1c17ba5f83ad58e3db2aacff3c56323f6fe2bb06 21-Apr-2015 Raph Levien <raph@google.com> Merge "Add Paint methods for cursor positioning"
8222a7ec81552276de1814541201c424b392d90b 21-Apr-2015 John Reck <jreck@google.com> Merge "Revert "Change how Java Bitmaps are accessed in a few places""
edc22fba5921f5c2d3502727e707f959b8c3a460 21-Apr-2015 John Reck <jreck@google.com> Revert "Change how Java Bitmaps are accessed in a few places"

Bug: 20207616

This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.

Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/pdf/PdfRenderer.cpp
ndroid/opengl/util.cpp
ndroid_view_PointerIcon.cpp
om_google_android_gles_jni_EGLImpl.cpp
db663fe83f976107fd8fd9307d871b37d9e47370 20-Apr-2015 Chris Craik <ccraik@google.com> Rename native DisplayListRenderer to DisplayListCanvas

Change-Id: I33e6f8cc85da1e7da7ff7bf18d4ebde64222067a
ndroid_view_DisplayListCanvas.cpp
ndroid_view_RenderNode.cpp
ndroid_view_Surface.cpp
f9978f863f38736eb1cfeaace8f7319bad13d88e 18-Apr-2015 Jeff Brown <jeffbrown@google.com> Merge "Fix leaks due to GC circular references."
3b4049e79b1ea2872891cc0e87146e146111d502 18-Apr-2015 Jeff Brown <jeffbrown@google.com> Fix leaks due to GC circular references.

The DisplayEventReceiver and SensorManager event queue both get
leaked when the Looper thread they are attached to dies because
the Java object holds a strong reference to its native peer and
meanwhile the native peer holds a strong reference to the Java
object through JNI.

Fixed the issue by indirecting through a weak reference as was
done for InputEventReceiver some time ago.

Bug: 12455729
Change-Id: I3d80a2a190192d1a2981bf5ae0cad30f0f7688a5
ndroid_hardware_SensorManager.cpp
ndroid_view_DisplayEventReceiver.cpp
9d4efdf2802f06ccf7031610891f75af70ea5538 17-Apr-2015 John Reck <jreck@google.com> Revert "A bunch more cleanups"

This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Shader.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
ndroid_view_ThreadedRenderer.cpp
7809f835cae637c12eebdc92103ad88890228d97 17-Apr-2015 John Reck <jreck@google.com> Revert "Move AssetAtlas off of SkBitmap*"

This reverts commit 87ffb63d90fb6dd2689fe72dcb24fda9a6156220.

Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
ndroid/graphics/Bitmap.cpp
afbeb2c2374bf7b7f7efa120944714fab469173d 17-Apr-2015 John Reck <jreck@google.com> Merge "Revert "Remove Bitmap#getSkBitmap""
1ff961dd6d51247e82e41de052f04fd0b577f09b 17-Apr-2015 John Reck <jreck@google.com> Revert "Remove Bitmap#getSkBitmap"

This reverts commit 4bd981ec533a65e8dee053a0a709b484770b0a76.

Change-Id: I5c92cd955c6e70e197dc5cbc5dfeed8369a24a31
ndroid/graphics/NinePatch.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_DisplayListCanvas.cpp
4aacc903e3f0216a1aec00d57d34f902025d5bd0 15-Apr-2015 Andy Hung <hunga@google.com> Add non-blocking writes to AudioTrack

Change-Id: I4ff47c2851be1b085f4e758f67e391932371027d
ndroid_media_AudioTrack.cpp
0e9e2f3724b43f86bb7e41a40e665587730ce6ae 14-Apr-2015 Andy Hung <hunga@google.com> Add non-blocking reads to AudioRecord

Change-Id: I63d5345129f197f96f9a13696996071c96551efe
ndroid_media_AudioRecord.cpp
71a9cfc08cbf20ba29b84b8a3a89a3db30ff089e 17-Apr-2015 Eric Laurent <elaurent@google.com> Merge "Adding explicit routing API to AudioTrack"
88e1d86a879d8802e775dd0566ffb64425e8e3c8 07-Apr-2015 Paul McLean <pmclean@google.com> Adding explicit routing API to AudioTrack

Change-Id: Iee7e1ce79e3efd3f8aafd0a5899fe037d314e1be
ndroid_media_AudioTrack.cpp
8560630596f8273356fddc4ee0c8ff6bfae640b8 16-Apr-2015 John Reck <jreck@google.com> Merge "Remove Bitmap#getSkBitmap"
5ce0430edfc176de29c0cf503975570dfda8111f 10-Apr-2015 Dan Sandler <dsandler@android.com> Add ashmem stats to Parcels.

Developers can now analyze the true RAM cost of the parcels
they create when those parcels contain ashmem blobs (such as
Bitmap data).

Requires change Ifaf115da in frameworks/native.

Bug: 20079551
Change-Id: Ifaf115dabd1a59cdb1b46e2d49c41f64ac107de4
ndroid_os_Parcel.cpp
e319d5a3627aa3cd73c6ec0c76f8593ddefbab9d 15-Apr-2015 Raph Levien <raph@google.com> Add left and right indent arrays to TextView

In support of layout of paragraphs to non-rectangular regions, add
arrays for left and right indents to TextView, along with supporting
StaticLayout builder setters.

Bug: 20182243
Change-Id: I015bcef8f258c89001fcf8a54c179d2dfc0d7943
ndroid_text_StaticLayout.cpp
4bd981ec533a65e8dee053a0a709b484770b0a76 16-Apr-2015 John Reck <jreck@google.com> Remove Bitmap#getSkBitmap

Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
ndroid/graphics/NinePatch.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_DisplayListCanvas.cpp
87ffb63d90fb6dd2689fe72dcb24fda9a6156220 15-Apr-2015 John Reck <jreck@google.com> Move AssetAtlas off of SkBitmap*

Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
ndroid/graphics/Bitmap.cpp
f7a61483bc2a763145b0f1b6e6809c44cdc97187 15-Apr-2015 John Reck <jreck@google.com> Merge "A bunch more cleanups"
cc3c34c9675fdf02da23326b0788e8a587bb399d 15-Apr-2015 Wale Ogunwale <ogunwale@google.com> Merge "Added watchdog monitor for Binder threads availability."
a027ec5c2dbfbbf10cac9ea538f5e230b093be2f 07-Apr-2015 Raph Levien <raph@google.com> Add Paint methods for cursor positioning

Adds methods to Paint for finding an offset corresponding to an
advance, and for finding the advance corresponding to an offset,
useful for positioning and drawing a cursor.

Change-Id: Id57402ddd1980650f1d0d2f8bbdb75e43612ec51
ndroid/graphics/Paint.cpp
d7fdd0228e6abdbc079f9cf08b780e4222dfe7c5 14-Apr-2015 Wale Ogunwale <ogunwale@google.com> Added watchdog monitor for Binder threads availability.

The watchdog will trigger if all binder threads in the system_server
are stuck for a long time (1min) preventing the process from
handling additional IPC requests.

Bug: 19297165
Change-Id: I5909a9c230bf23917feaed53f2b54bd50425bf3c
ndroid_util_Binder.cpp
864ae678521cc26801a1611b3d4eabe90c0a17f7 14-Apr-2015 Andy Hung <hunga@google.com> Default to minimum buffer size for AudioRecord.Builder

Add AudioRecord.getNativeFrameCount to allow apps to
retrieve the size of the buffer created.

Change-Id: I4c539677726f89afd36fe7b1d24c8b29ada91402
ndroid_media_AudioRecord.cpp
c294d128d03bc9a9982b273a82516c04583438cc 14-Apr-2015 John Reck <jreck@google.com> A bunch more cleanups

Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Shader.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
ndroid_view_ThreadedRenderer.cpp
073f36c6c1bc937a55393f7fe9a21b95e822bfda 13-Apr-2015 John Reck <jreck@google.com> Merge "Change how Java Bitmaps are accessed in a few places"
a771b9861d11671c780092d35c0062eeefcf37c0 10-Apr-2015 John Reck <jreck@google.com> Change how Java Bitmaps are accessed in a few places

Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/pdf/PdfRenderer.cpp
ndroid/opengl/util.cpp
ndroid_view_PointerIcon.cpp
om_google_android_gles_jni_EGLImpl.cpp
d4ea01b4aca807cc914a96addefcc2c64ce1a6f5 12-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge "Merge commit 'e593d0a' into merge_work"
00b9bcda8a488f3d6df9360483167c1a8faf105a 11-Apr-2015 Andy Hung <hunga@google.com> Merge "Add channel index mask to AudioTrack and AudioFormat"
4ef1305aa8c523841cee07116c5d484fbbc24d8b 11-Apr-2015 Andy Hung <hunga@google.com> Merge "Add floating point AudioRecord read"
a9470c19a9dfe362a201c569f14b669b7aa69ee4 30-Jan-2015 Andy Hung <hunga@google.com> Add channel index mask to AudioTrack and AudioFormat

Change-Id: Ia5faa56360edcbbdeae8838ec0f82386f4e5e640
ndroid_hardware_SoundTrigger.cpp
ndroid_media_AudioTrack.cpp
57bf2a8a38e929f00f3323cf97a8ea7a9af900ce 11-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge commit 'e593d0a' into merge_work

Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
041a9e5770ad53f9a5c299b9b788860ad9bcabf3 10-Apr-2015 John Reck <jreck@google.com> Merge "Remove user of GraphicsJNI::createBitmap"
4147877b388eb4a6f4e1ee116edfa58a018891ca 10-Apr-2015 John Reck <jreck@google.com> Remove user of GraphicsJNI::createBitmap

Change-Id: I2f31bf98ed08eb4bd39a6ce7236c7a23ef309177
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapFactory.h
ndroid_emoji_EmojiFactory.cpp
6d85cf2bd7cba6890f1b2bb26073105c3b8fc432 08-Apr-2015 Tim Kilbourn <tkilbourn@google.com> Simplify input-audio device mapping

Instead of matching on unique ids, allow an .idc file to specify
whether the input device also has a mic.

Bug: 15374820
Change-Id: Ib5f934f1f37f6b98bb906a5be86c6bfa9a5f09c8
ndroid_view_InputDevice.cpp
58b0f3f3324ad04d53b31a75c9ad617957dfbba6 28-Mar-2015 Andy Hung <hunga@google.com> Add floating point AudioRecord read

Change-Id: Ibbdbfdefb84b515c231723fb621662bc4920ff86
ndroid_media_AudioRecord.cpp
d95e58cb609228c4c4b231e00d6bb648e9dcaf71 07-Apr-2015 Dmitriy Ivanov <dimitry@google.com> Merge "Load libraries directly from apk"
dec4688f40b0018fbd1f00db05581966f531d88f 01-Oct-2014 Dmitriy Ivanov <dimitry@google.com> Load libraries directly from apk

Introduced new 'extractNativeLibs' attribute to manifest/application.
Setting it to false prevents installer from extracting library from apk.

The default value for extractNativeLibs is true.

Bug: 8076853
(cherry picked from commit ff193d642eea7128faad837d19e347cd25212c27)
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
ndroidRuntime.cpp
om_android_internal_content_NativeLibraryHelper.cpp
3544e6fa5629398cb0e541bd9aea0ec03073c0d2 06-Apr-2015 Raph Levien <raph@google.com> Merge "Don't use context in measureText(char[])"
305b44b9488c4ad44d2a1b0749c8bd49835eb216 04-Apr-2015 Andreas Gampe <agampe@google.com> am f29be77f: am a4f39ed9: am f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"

* commit 'f29be77f07084e88ae7104a375a1a54fd91de0dd':
Frameworks/base: Pass variant and feature-set to runtime
605cca1a985be74c00582853ee2c84b086cfade8 03-Apr-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Pass variant and feature-set to runtime

This is required so we pick up the settings correctly when compiling
the boot image on device, or compile any dex files through a
DexClassLoader.

Bug: 20055104
Change-Id: Ia3ab2e48855060894b36f7fd360fe17b978e45a6
ndroidRuntime.cpp
808ba3b5fe904aabe6067ec592a6030ea217cdc8 04-Apr-2015 Wei Jia <wjia@google.com> Merge "MediaSync: add MediaSync JAVA API"
071a8b71d1212e218a3ebf7dbb8908a4acf5cf6d 10-Mar-2015 Wei Jia <wjia@google.com> MediaSync: add MediaSync JAVA API

Bug: 19666434
Change-Id: Iab6941f6d81cb95a3b86be14b239287acb0d0eee
ndroid_media_AudioTrack.cpp
ndroid_media_AudioTrack.h
51ce5c16d559251a1a29affb971acce22ee5477e 03-Apr-2015 Phil Burk <philburk@google.com> Merge "audio: add AudioFormat.ENCODING_DTS"
80b485daa64d0ef2339c133f0d9cbc3c2c977c32 03-Apr-2015 Raph Levien <raph@google.com> Don't use context in measureText(char[])

The measureText(CharSequence) method calls into measureText(char[]),
using a temporary buffer, which may be longer than the CharSequence,
and may have additional characters. The existing implementation was
treating the entire char[] as potential context, but this is
incorrect.

This patch does the measurement on just the substring; measureText
doesn't process context. There are other methods for that, such as
getTextRunAdvances.

Bug: 19962931
Change-Id: Ia00cc004f9fa9d45aaf028683e78404d66c1388f
ndroid/graphics/Paint.cpp
f673acb6c955a43e0fcf9d95eccc36b31083ff48 03-Apr-2015 Raph Levien <raph@google.com> Merge "Add Paint.hasGlyph method"
f7f969e67e9ab420404807b1b103dcd18d7aa7b7 01-Apr-2015 Raph Levien <raph@google.com> Add Paint.hasGlyph method

This patch adds a method to determine whether a typeface has a glyph
to support a particular Unicode character or sequence.

The implementation is based on shaping the text and checking for the
presence of .notdef glyphs, and counting the number of glyphs in the
ligature case. In the case of variation selector control characters, it
currently just returns false because there is no variation selector
support yet (Mongolian Free Variation Selectors work because they're
shaped with GSUB instead).

Change-Id: I8ee4ae0d6e81a0ac57f961eb02dcc35aabd87042
ndroid/graphics/Paint.cpp
ndroid/graphics/Typeface.cpp
ec3c97d27f2a424fa847561a3932a40c093a91a1 03-Apr-2015 Chris Craik <ccraik@google.com> Merge "Add compat path for restore underflow"
3891f3ad598561d5a82c07795e1fee7f1d3612d1 03-Apr-2015 Chris Craik <ccraik@google.com> Add compat path for restore underflow

bug:19829784

Change-Id: Ia761664208ab80c055ca11174db3ddc74457b92b
ndroid_graphics_Canvas.cpp
72db88e46fba5f2581eb21c042dc79887cda1c10 10-Mar-2015 Paul Jensen <pauljensen@google.com> Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.

These functions risk hitting an unchecked Exception due to ConnectivityManager
not being instantiated yet. Also, change Network.openConnection() to throw a
checked Exception rather than an unchecked Exception when ConnectivityManager
is not yet instantiated.

bug:19416463
Change-Id: Ie1e2b3238aec0343d267c76b64927073f2f05f85
ndroid_net_NetUtils.cpp
ebbf205bc6e8292f74d8fc4652c70274a445f907 01-Apr-2015 Jim Miller <jaggies@google.com> Prepare to make Fingerprint API public.

- move fingerprint support files into hardware area
- move jni into services/core

Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
ndroid.mk
ndroid_server_FingerprintManager.cpp
2615afb1b0f597f38a07832b33df9bd888a0dce1 25-Mar-2015 Eric Laurent <elaurent@google.com> audio port: support multiple clients

Add support for more than one audio port callback client per process.

Change-Id: I48051f27fa0b58ce4634b9db46ec8f2aa900398c
ndroid_media_AudioSystem.cpp
ac038f3b69724647e9ff7b115eea77d442c9d0f5 02-Apr-2015 Andreas Gampe <agampe@google.com> resolved conflicts for merge of 844e44c9 to master

Change-Id: I8f682da1a50151547f01b4d3a949852525fe6299
e324ba0e7cc1b831f86c5d2f0578c9b881a3130b 01-Apr-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Use system property for cache prune counter

Expose ART's -Xzygote-max-boot-retry through a new system property
dalvik.vm.zygote.max-boot-retry.

Bug: 19983101
Change-Id: Ib88f807e0082d71292c14c7af38e02cca5a5602c
ndroidRuntime.cpp
e12189dee6504cf793d37f5689a7bbf0773293c7 31-Mar-2015 Phil Burk <philburk@google.com> audio: add AudioFormat.ENCODING_DTS

Bug: 18292317
Change-Id: I457a6996947d6d24ef7f8f152ee586029036acf5
Signed-off-by: Phil Burk <philburk@google.com>
ndroid_media_AudioFormat.h
b929d65800fcc91c04d385fe9ec23a924868883b 31-Mar-2015 Raph Levien <raph@google.com> Merge "Remove unused constants in android_text_StaticLayout.cpp"
ee101a3c6627e7cf871f81583bb62f719485a2bd 31-Mar-2015 Raph Levien <raph@google.com> Remove unused constants in android_text_StaticLayout.cpp

The logic for computing line breaking moved to Minikin, and so the
various Unicode characters with special meaning for line breaks are no
longer used in android_text_StaticLayout.cpp (which is now a fairly
thin wrapper that just does JNI glue). This patch deletes the
constants, which makes the warnings-as-errors setting of our current
clang build happy.

Change-Id: I1bb3596ca4f0c78a8e185af9000c0c366fb9b020
ndroid_text_StaticLayout.cpp
0e9503de2009b2b97593f2f27646e1545b77114a 31-Mar-2015 Jeff Sharkey <jsharkey@android.com> Merge "Progress towards dynamic storage support."
a60e809994664d62892b2722f0e8af440afc65ba 31-Mar-2015 Andreas Gampe <agampe@google.com> am abeba1ff: am c10fa20b: am 02c4bbb9: Merge "Frameworks/base: Support dex2oat threads system property"

* commit 'abeba1ff3306eab6ba6e58dce895cd2cf9117700':
Frameworks/base: Support dex2oat threads system property
e0352388238875ef7e7b31d914fc903b08ff0f6b 31-Mar-2015 Andreas Gampe <agampe@google.com> Frameworks/base: Support dex2oat threads system property

Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART
with "-j" as a compiler option, if found.

Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to
ART with "-j" as an image compiler option, if found.

Bug: 19992386
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
ndroidRuntime.cpp
4887789e44cdb16b042a35e8ec03983213e88ac6 18-Mar-2015 Jeff Sharkey <jsharkey@android.com> Progress towards dynamic storage support.

Storage devices are no longer hard-coded, and instead bubble up from
whatever Disk and VolumeBase that vold uncovered, turning into
sibling Java objects in MountService. We now treat vold events as
the source-of-truth for state, and synchronize our state by asking
vold to "reset" whenever we reconnect.

We've now moved to a model where all storage devices are mounted in
the root mount namespace (user boundaries protected with GIDs), so
we no longer need app-to-vold path translation. This also means that
zygote only needs to bind mount the user-specific /mnt/user/n/ path
onto /storage/self/ to make legacy paths like /sdcard work. This
grealy simplifies a lot of system code.

Many parts of the platform depend on a primary storage device always
being present, so we hack together a stub StorageVolume when vold
doesn't have a volume ready yet.

StorageVolume isn't really a volume anymore; it's the user-specific
view onto a volume, so MountService now filters and builds them
based on the calling user. StorageVolume is now immutable, making
it easier to reason about.

Environment now builds all of its paths dynamically based on active
volumes. Adds utility methods to turn int types and flags into
user-readable strings for debugging purposes.

Remove UMS sharing support for now, since no current devices support
it; MTP is the recommended solution going forward because it offers
better multi-user support.

Simplify unmount logic, since vold will now gladly trigger EJECTING
broadcast and kill stubborn processes.

Bug: 19993667
Change-Id: I9842280e61974c91bae15d764e386969aedcd338
om_android_internal_os_Zygote.cpp
8091ac4cfe06ea6d1ef259f17c79ec19f4d3a65b 31-Mar-2015 Zhijun He <zhijunhe@google.com> Merge "ImageFormat: add PRIVATE format"
2f17431194efc5a13981550b004dd8d5d2a42e5e 20-Mar-2015 Zhijun He <zhijunhe@google.com> ImageFormat: add PRIVATE format

Bug: 19865019
Change-Id: I1a9335fe1733a5b28d9cb20485b509fb216cb52b
ndroid_view_Surface.cpp
26d443aee4ee5a8791417b4ca09e8c78ba8dc78b 30-Mar-2015 Raph Levien <raph@google.com> Revert "Fix build: Revert "Record hyphens from Minikin and draw them""

This reverts commit 5a6eeb3cbe0896ddf4bdccc0b1a81d7aac49821e and
fixes the underlying issue (needed to @hide getHyphen() for subclasses
of Layout, not just the base class), and layoutlib changes for
checkbuild.

Change-Id: I7a2b5f20ae014ea8e224d8c4079cf9131e17e1c1
ndroid_text_StaticLayout.cpp
cc6855fc7f22e404fb79482ab9765d9922db588d 30-Mar-2015 Chris Craik <ccraik@google.com> Merge "Revert "Avoid throwing ISE in Canvas#restore underflow""
7298d1f079a139b2cf076c4852df9ca01adab7de 30-Mar-2015 Ed Heyl <edheyl@google.com> Merge "Fix build: Revert "Record hyphens from Minikin and draw them""
5a6eeb3cbe0896ddf4bdccc0b1a81d7aac49821e 30-Mar-2015 Ed Heyl <edheyl@google.com> Fix build: Revert "Record hyphens from Minikin and draw them"

This reverts commit 27fb878c04e18d3bdd6c42ed347194a7c816ed97.

Change-Id: I2b3390cb0b258a2e1a38ad72ae9686177d6ffdb8
ndroid_text_StaticLayout.cpp
7d5dda4dcaab3bc27e3f90a2f958cf066acc350e 30-Mar-2015 Chris Craik <ccraik@google.com> Revert "Avoid throwing ISE in Canvas#restore underflow"

Additionally, rewrite the exception message for clarity.

bug:19951475
bug:19829784

This reverts commit 14cfb6db33264f1c3b127ccf4e45e3ac86527804.

Change-Id: Ie70a49a8d3957025c4b2e47d4ef9f4abd4ded133
ndroid_graphics_Canvas.cpp
c74e289a6537227ab80fa59da9d5d6f88dc9fe33 30-Mar-2015 John Reck <jreck@google.com> Merge "Add GraphicsStatsService"
683ab2afc504fb93bb7697aefc6990e0e70dd0ed 30-Mar-2015 Raph Levien <raph@google.com> Merge "Record hyphens from Minikin and draw them"
6e6af0d34eb08a810cd399de64c1ade21fe866a9 28-Mar-2015 Christopher Tate <ctate@google.com> Merge "Add payload-size preflight stage to full transport backup"
edc524c90506d80e0fc5fb67e8de7b8f3ef53439 18-Mar-2015 John Reck <jreck@google.com> Add GraphicsStatsService

More S's for More Speed

Split JankTracker's backing data from the
class to allow for data relocation to/from ashmem regions

Pack the jank tracking data to fit in 256 bytes

Change-Id: Ife86a64b71a328fbd0c8075fe6a0404e081f725b
ndroid_view_ThreadedRenderer.cpp
71cbc72e70a6f0e086535c51e35262eb3a4d4bd9 20-Mar-2015 Raph Levien <raph@google.com> Record hyphens from Minikin and draw them

This patch plumbs up hyphens computed in Minikin's LineBreaker,
records them in a new column in StaticLayout, and draws them.
DynamicLayout mirrors the new column, and TextLine is also changed to
make sure the hyphen is only drawn for the last run in a line.

There is a rather primitive mechanism for loading hyphenation
patterns, for testing only at this point.

Change-Id: Ib208568c0f6cff12cf834047500ec1da9ea9f430
ndroid_text_StaticLayout.cpp
c94f742f7e07a3b86c8f603836c19638472b3e83 07-Mar-2015 Raph Levien <raph@google.com> Calculate line breaks using Minikin

This patch moves the calculation of line breaks for StaticLayout into
the new LineBreaker class provided by Minikin. This specific patch
should preserve existing functionality, but perhaps performance is
better, and the movement opens the door to much more sophisticated
line-breaking.

Change-Id: Iafccb9da4e3559bbeaeb2c7c85f86ddfd8ae2fa1
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/TypefaceImpl.h
ndroid_text_StaticLayout.cpp
11ae768cf1b8348e761ad9c09e98788da1e591b1 25-Mar-2015 Christopher Tate <ctate@google.com> Add payload-size preflight stage to full transport backup

We now peform a total-size preflight pass before committing data to the
wire. This is to eliminate the large superfluous network traffic that
would otherwise happen if the transport enforces internal quotas: we
now instead ask the transport up front whether it's prepared to accept
a given payload size for the package.

From the app's perspective this preflight operation is indistinguishable
from a full-data backup pass. If the app has provided its own full-data
handling in a subclassed backup agent, their usual file-providing code
path will be executed. However, the files named for backup during this
pass are not opened and read; just measured for their total size. As
far as component lifecycles, this measurement pass is simply another
call to the agent, immediately after it is bound, with identical
timeout semantics to the existing full-data backup invocation.

Once the app's file set has been measured the preflight operation
invokes a new method on BackupTransport, called checkFullBackupSize().
This method is called after performFullBackup() (which applies any
overall whitelist/blacklist policy) but before any data is delivered
to the transport via sendBackupData(). The return code from
checkFullBackupSize() is similar to the other transport methods:
TRANSPORT_OK to permit the full backup to proceed; or
TRANSPORT_REJECT_PACKAGE to indicate that the requested payload is
unacceptable; or TRANSPORT_ERROR to report a more serious overall
transport-level problem that prevents a full-data backup operation
from occurring right now.

The estimated payload currently does not include the size of the
source-package metadata (technically, the manifest entry in its
archive payload) or the size of any widget metadata associated with
the package's install. In practice this means the preflighted size
underestimates by 3 to 5 KB. In addition, the preflight API currently
cannot distinguish between payload sizes larger than 2 gigabytes;
any payload estimate larger than that is passed as Integer.MAX_VALUE
to the checkFullBackupSize() query.

Bug 19846750

Change-Id: I44498201e2d4b07482dcb3ca8fa6935dddc467ca
ndroid_app_backup_FullBackup.cpp
02bc1fe6b098a87571d7ad94727f434fb614ddb8 26-Mar-2015 Aravind Akella <aakella@google.com> Merge "Pipe the packageName of the application from the java layer to SensorService."
8de4a16cea6f80c1e53c3e2f1faee5b8256e49c8 26-Mar-2015 Jeff Brown <jeffbrown@google.com> Fix 64bit build issue.

Change-Id: I23fe36d5f466aa6ade8311416889a14e6e857276
ndroid_server_FingerprintManager.cpp
88445990b426499f25a9f37bc3b75f6e0267b4cb 27-Feb-2015 Aravind Akella <aakella@google.com> Pipe the packageName of the application from the java layer to SensorService.

Change-Id: I8610d676be0249e1047bb539bfeb76cc34538edf
ndroid_hardware_SensorManager.cpp
9fc9ac5f774450af80c05ea70847fcf4f4570db8 25-Mar-2015 Jim Miller <jaggies@google.com> Merge "Refactor fingerprint API"
240d52cb96867042fce050f832ee4290e758a0a4 25-Mar-2015 Derek Sollenberger <djsollen@google.com> Merge "Fix DrawFilter's usage in HWUI."
0b8606266c1afc69cbeb73acda67c85d87943318 25-Mar-2015 Derek Sollenberger <djsollen@google.com> Fix DrawFilter's usage in HWUI.

Also add additional compile time checks to ensure that the Java
and Skia APIs remain in sync.

bug:19890753
Change-Id: I8503cacf2859307e3f480a78603f9f05901b58cc
ndroid/graphics/Paint.cpp
9f0753f5a378fc80da86305b33244acc6fc53f01 24-Mar-2015 Jim Miller <jaggies@google.com> Refactor fingerprint API

- enroll() and authenticate() now take an explicit callback object.
- better handling of strings
- use framework resources for commonn error strings
- add vendor-specific arrays to resources

Bug 16487912

Change-Id: Idf34242fdd06bba1903cdb22bf20169d15d92b82
ndroid_server_FingerprintManager.cpp
3dd5a398fd1722e2f481f2c21d0d41e2e525defc 26-Feb-2015 Eino-Ville Talvala <etalvala@google.com> Add DEPTH image formats, support in ImageReader

- Add an explicit mapping between public ImageFormat/
PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
formats

Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
ndroid_view_Surface.cpp
ff193d642eea7128faad837d19e347cd25212c27 01-Oct-2014 Dmitriy Ivanov <dimitry@google.com> Load libraries directly from apk

Introduced new 'extractNativeLibs' attribute to manifest/application.
Setting it to false prevents installer from extracting library from apk.

The default value for extractNativeLibs is true.

Bug: 8076853
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
ndroidRuntime.cpp
om_android_internal_content_NativeLibraryHelper.cpp
66d2bbf1e1da280510ddd372acf79da9cadd73b5 21-Mar-2015 Tim Kilbourn <tkilbourn@google.com> Fix jni method signature.

Bug: 19870217
Change-Id: I8db1bb8cb8af2df73e899b861c91f090c068d127
ndroid_view_InputDevice.cpp
a81c231d31d8432ddab32a4e46fc3264932f88b2 20-Mar-2015 Tim Kilbourn <tkilbourn@google.com> Merge "Add unique id to InputDevice."
415b450bf29a8ad28ecc5c1c1eea9bd61e49bf72 20-Mar-2015 Tim Kilbourn <tkilbourn@google.com> Add unique id to InputDevice.

If an input device driver assigns unique ids to devices (e.g., MAC
address), this method will be used to retrieve it from the device.

Change-Id: If1fd6643c5be7af5b989ef47f4bb653e7a63b6c6
ndroid_view_InputDevice.cpp
cbe4f7c225f87ef1e8cb496bce434f334774bc88 06-Mar-2015 Lorenzo Colitti <lorenzo@google.com> DHCP: Add a native method for making a DHCP socket.

Bug: 19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be
ndroid_net_NetUtils.cpp
49911ce7323cd914468253ae65f8b09530a4ddcb 20-Mar-2015 Chris Craik <ccraik@google.com> Merge "Avoid throwing ISE in Canvas#restore underflow"
14cfb6db33264f1c3b127ccf4e45e3ac86527804 19-Mar-2015 Chris Craik <ccraik@google.com> Avoid throwing ISE in Canvas#restore underflow

bug:19829784

Change-Id: I5829a7783ad912c09c83dee17bad10b90f42aace
ndroid_graphics_Canvas.cpp
543a3578ad0a1d0214b9102ddec0fc26a0e5d63e 19-Mar-2015 Mathieu Chartier <mathieuc@google.com> am 05844d57: am b7d997a7: Merge "Revert "Change jit properties to be debug properties""

* commit '05844d573f33c77cd7bb608a118a998506a6996d':
Revert "Change jit properties to be debug properties"
1fb7aab9b235fa526a1b8e6e2efd71c7df66096d 19-Mar-2015 Mathieu Chartier <mathieuc@google.com> Revert "Change jit properties to be debug properties"

Bug: 19735273

This reverts commit 1ad10ef1e4b83ef9e845761a82e202bb57e2379d.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
ndroidRuntime.cpp
e0b7fa65498eac1f6735d8de35d3dc9ba76c544f 18-Mar-2015 Erik Kline <ek@google.com> Merge "Fix missing printf argument."
f5bd6a97192c9b9eb414acd43ae822391fa92669 18-Mar-2015 Erik Kline <ek@google.com> Fix missing printf argument.

Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
ndroid_net_NetUtils.cpp
86a5ce040286e0146021093279f734b16d65b489 18-Mar-2015 Erik Kline <ek@google.com> Fix missing printf argument.

Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
ndroid_net_NetUtils.cpp
c55b9954b260e310ae7bc2e298c51919d4214cf9 17-Mar-2015 Andy Hung <hunga@google.com> Merge "Fix AudioRecord read to be blocking"
db2b5f447254e1f2248024879648e36211cb4e33 17-Mar-2015 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup"
443ab2c7dbe2a3a482892f3171882572f10eab9a 13-Mar-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Release surface in ImageReader#close and fix legacy cleanup

Bug: 19694090
Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
6f6f825ebbea34255c69c0a6480f128348ec9bb6 17-Mar-2015 Mathieu Chartier <mathieuc@google.com> am 5ec7c78d: am 008ec61e: Merge "Change jit properties to be debug properties"

* commit '5ec7c78d52a5a01ed1755ad8b8e486e4c6f05a93':
Change jit properties to be debug properties
008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3 17-Mar-2015 Mathieu Chartier <mathieuc@google.com> Merge "Change jit properties to be debug properties"
1ad10ef1e4b83ef9e845761a82e202bb57e2379d 17-Mar-2015 Mathieu Chartier <mathieuc@google.com> Change jit properties to be debug properties

Bug: 19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
ndroidRuntime.cpp
5dd67d6993aebb30445d637583501546523a16d2 16-Mar-2015 Jeff Brown <jeffbrown@google.com> Reduce SQLite logspam.

Suppress "automatic index on" warnings unless verbose logging is enabled.
Also suppress any notices.

Bug: 19773765
Change-Id: I4a4160e81e2cccf5119770182a64d6bbd9cc3505
ndroid_database_SQLiteGlobal.cpp
d92e28255e21d6d1830995b7acefe77c22ce3a14 16-Mar-2015 Eric Laurent <elaurent@google.com> Merge "broadcast radio JNI."
2a1ce8a4e5258b6599cb8e86864eb816d24d69b4 16-Mar-2015 Mike Reed <reed@google.com> use SkFilterQuality instead of SkPaint::FilterLevel

Change-Id: I5d26869de746107b8a35a7a662236f993a824b0d
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/Paint.cpp
ndroid_graphics_Canvas.cpp
566e0cb692ef8be5ba01c874ebd9d2576be99fe4 06-Mar-2015 Lorenzo Colitti <lorenzo@google.com> DHCP: Add a native method for making a DHCP socket.

Bug: 19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be
ndroid_net_NetUtils.cpp
e94d762182a986e9825d7a0dff4e00dcc6054176 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Refactor NetworkUtils interaction with DHCP."

merged from goog/mirror-m-wireless-internal-release
3c3ce17 Refactor NetworkUtils interaction with DHCP.
210a189e226d5ce64f760d557efc6570409c8147 09-Mar-2015 Raph Levien <raph@google.com> Add HyphenEdit support to Paint

This adds HyphenEdit on the C++ and also to Java via JNI. HyphenEdit is
a Minikin feature for adding hyphens to text without having to edit the
string on the client side.

Change-Id: Icfb228407c1d11a716d055f813da7507acb38fbf
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
7a60ae86ec5c8950d5baf1a8ba33207ddaa72a7d 14-Mar-2015 Andy Hung <hunga@google.com> Fix AudioRecord read to be blocking

Does not limit returned data based on internal buffer size.

Change-Id: I0c1893db3e5e197ea6376d5aa52449b01ac3905b
ndroid_media_AudioRecord.cpp
633cb563f36001d6973b69291086cbdfe50612c5 06-Mar-2015 Eric Laurent <elaurent@google.com> broadcast radio JNI.

Initial implementation of broadcast radio JNI.

Change-Id: Ia01f567292295928fbf6d9c23de362867dc15314
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_Radio.cpp
d028356056b17761c4929f34ae9f5e9639e6450d 13-Mar-2015 Nick Kralevich <nnk@google.com> am 870110e0: am 30fcd2aa: Merge "Drop unusable SELinux APIs."

* commit '870110e01af5c4875a9cf7134cee7c6842fd31af':
Drop unusable SELinux APIs.
16d1cce8ffe632c1283375beb4c82c67c43e13dd 13-Mar-2015 Stephen Smalley <sds@tycho.nsa.gov> Drop unusable SELinux APIs.

setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.

Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ndroid_os_SELinux.cpp
676fa348d04e3f2e6f315a913eb45c79ec6bb03c 13-Mar-2015 Raph Levien <raph@google.com> Merge "Start moving text measurement into native code"
70616ecd22fafccf2fab7565ccfbb3b5f91c5580 04-Mar-2015 Raph Levien <raph@google.com> Start moving text measurement into native code

We want to move text measurement into native code, mostly so that
alternate measurement for hyphens can be performant. This patch begins
that migration, in the main StaticLayout case, but still surfaces the
widths array to Java (for ellipsis calculation), and also includes a
hack (used mostly for testing) for computing widths in Java and sending
them down to native code when TextPaint is subclassed.

Change-Id: I476c9e8b3aa8e4e3552eb18f66c4bcd5683f3a72
ndroid_text_StaticLayout.cpp
ee248599d49a15fc207c5aeb0b90ec263cc1d600 12-Feb-2015 Derek Sollenberger <djsollen@google.com> Refactor DisplayList path caching.

This removes dependence on SkPath ptrs that HWUI does not control
the lifecycle of. This clears up some errors where the paths are
not generated from Java, but rather the Skia test suites.

Cherry-pick of a change that originally landed in master-skia and is
dependent on a skia merge (ag/655422).

Change-Id: I41b9797a2b0af5d6b4ea51891565469d4f1d832d
ndroid/graphics/Path.cpp
247dc6e125783b31f5c9a2cbccb34bd2ac575e6d 10-Feb-2015 Leon Scroggins III <scroggo@google.com> Fix use of SkMutex.

Recent change to Skia moved SkMutex into its own header file. Include
it to use and SkMutex.

Use SK_DECLARE_STATIC_MUTEX to remove static initializer/finalizer.

Fixes master-skia build.

Change-Id: I2ab43c511587167b81310d5d55a65604d82761f5
ndroid/graphics/AutoDecodeCancel.cpp
130cf8ce1f3134654dd4fc809d98301a7e91dca3 13-Mar-2015 Derek Sollenberger <djsollen@google.com> Merge "SkStream is no longer a ref counted object."
942c474820550e38b652310003023fe1a8246d19 13-Mar-2015 Jeff Brown <jeffbrown@google.com> Don't allow clients to add FDs to Looper without callbacks.

Bug: 10349083
Change-Id: Ia75e37bb1055559f6442f97c42ec109078e737b6
ndroid_os_MessageQueue.cpp
3449789b9ca58fee7e5cd02ff89d544f4a6bc9b5 20-Jan-2015 Leon Scroggins III <scroggo@google.com> SkStream is no longer a ref counted object.

With https://codereview.chromium.org/849103004/, SkStream is no longer
ref counted. Change callers that currently unref() SkStreams to one of
either:
- delete the stream
- pass ownership of the stream

screencap.cpp:
Call EncodeData directly, bypassing SkDynamicMemoryWStream and SkBitmap.

Utils.cpp:
Write directly to an SkData, and then use that to construct a new
SkStream.

Cherry-pick of a change that originally landed in master-skia and is
dependent on a skia merge (ag/655422).

Change-Id: Idc99ad7d5a70c893dc012d59915216f301ab3c9d
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/FontFamily.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/Utils.cpp
af66416e4b7dd4be1d674cb660108a308a713221 12-Mar-2015 Leon Scroggins III <scroggo@google.com> Merge "Make Bitmap_createFromParcel check the color count."
d5e97f93f0aee11952b08d1083623f4e63a36b72 12-Mar-2015 Greg Hackmann <ghackmann@google.com> Fix 64-bit MessageQueue JNI build

Change-Id: I75b3788e7dcece4a2d64d969a10d28e7a9593cd6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ndroid_os_MessageQueue.cpp
dc3eb4bf91d37ce6b8b000a59625a496b64b36fb 06-Mar-2015 Jeff Brown <jeffbrown@google.com> Add support for non-blocking I/O with Looper.

Bug: 10349083
Change-Id: I4a94b1eac53df57c05103913bd593d92b1e062d7
ndroid_os_MessageQueue.cpp
ndroid_os_MessageQueue.h
6c7b41adf9e937a66880b8906389760f3fc82a08 26-Feb-2015 Jeff Brown <jeffbrown@google.com> Rename Looper::isIdling() to isPolling() to resolve confusion.

The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events. However it's
still a good signal as to whether the loop is alive.

Added a real isIdle() function.

Bug: 19532373
Change-Id: Idd273e8774f469ccafb00d560818cf279dfd6ba6
ndroid_os_MessageQueue.cpp
b36016c65f1d1b5846dba0349aab491dbd3a746a 11-Mar-2015 John Reck <jreck@google.com> Cleanups & simplifications

Change-Id: I5ad5e3b8fe55b1528f2e20c63e5abe51d9e40ff1
ndroid_view_Surface.cpp
ndroid_view_ThreadedRenderer.cpp
ec419e0b731d2aa32f7f570e4021fe18b8be228d 11-Mar-2015 Leon Scroggins III <scroggo@google.com> Make Bitmap_createFromParcel check the color count.

When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

BUG=19666945

Change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6
ndroid/graphics/Bitmap.cpp
126d89bb79afb9636b79688e3d95fb2fc79ddd3b 10-Mar-2015 Elliott Hughes <enh@google.com> Merge "resolved conflicts for merge of 7545accf to master"
c0b8f647ca3e3d698b75084b1b555b7af00aec5f 10-Mar-2015 Elliott Hughes <enh@google.com> resolved conflicts for merge of 7545accf to master

Change-Id: I7a9264e818fdd14bf59f0dec63ab83985f9e66fb
ddd72599bf1d528079244df63d5f4dfdf534675e 10-Mar-2015 Chris Craik <ccraik@google.com> Merge "Rename and simplify DisplayList Canvas classes"
c9070ebd13263a341511cf779087a46750021196 10-Mar-2015 Chris Craik <ccraik@google.com> Rename and simplify DisplayList Canvas classes

Change-Id: I49fd2ce02e01401209fe2a378e9f9547c7b27c61
ndroid.mk
ndroidRuntime.cpp
ndroid_view_DisplayListCanvas.cpp
ndroid_view_GLES20Canvas.cpp
805f3c9428f9ebd5080aec48d3d9d77dbf4b41a9 26-Feb-2015 Eino-Ville Talvala <etalvala@google.com> Add DEPTH image formats, support in ImageReader

- Add an explicit mapping between public ImageFormat/
PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
formats

Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
ndroid_view_Surface.cpp
6291beddfcdf843f07f12a6d4551301e5fcff73c 09-Mar-2015 Elliott Hughes <enh@google.com> am 63d43949: Merge "Use the icu:: namespace for icu4c API."

* commit '63d43949047eaed1cddf10bb4f666df6807618ce':
Use the icu:: namespace for icu4c API.
5e3c29956b4c14afa25e9f354ee1443e71b72974 08-Mar-2015 Mathieu Chartier <mathieuc@google.com> am ea3d53f5: am 773bcfa7: am e59b7ce2: Merge "Add JIT system properties"

* commit 'ea3d53f5a8f8e396bf8918041087db4603d444e5':
Add JIT system properties
4c5806b6b495c8d3c0558374b84a879b7488a140 07-Mar-2015 Elliott Hughes <enh@google.com> Use the icu:: namespace for icu4c API.

The icu guys recommend working this way, though it's not the default.
Internally Google makes this the default, and I've switched libcore
over.

Bug: 15350832
Change-Id: I038e12bea58dd089a46d0e681b5ab76cfc19d7b9
ndroid.mk
ndroid_text_StaticLayout.cpp
2d08eaf0341df5d22236baadbcc4341f0e2e7f5e 06-Mar-2015 Chris Craik <ccraik@google.com> Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated."""
1526a458a30184609f19b05e7334da3cbde81dd1 06-Mar-2015 Chris Craik <ccraik@google.com> Revert "Revert "Remove references to SkPorterDuff as it is deprecated.""

Fix build breakage.

This reverts commit 26b4f598c8b1e99b43261614a6861785638c8c00.

Change-Id: If39ce2a41d26a8520091f330234c3d35e413ee92
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Shader.cpp
ndroid_graphics_Canvas.cpp
fdbf68ff6c5e45da4971352775d614e6790cc991 06-Mar-2015 Chris Craik <ccraik@google.com> Merge "Revert "Remove references to SkPorterDuff as it is deprecated.""
26b4f598c8b1e99b43261614a6861785638c8c00 06-Mar-2015 Chris Craik <ccraik@google.com> Revert "Remove references to SkPorterDuff as it is deprecated."

bug:19627342

This reverts commit a9aded1f6253afbea7906509992a8a3721f731ab.

Change-Id: Ic865edfbd31c9e24d18a1397a1d346633376e20a
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Shader.cpp
ndroid_graphics_Canvas.cpp
773bcfa7ecb1e06831e7f060ecc3c43d0cf1bf00 06-Mar-2015 Mathieu Chartier <mathieuc@google.com> am e59b7ce2: Merge "Add JIT system properties"

* commit 'e59b7ce2564a916240e561b36f4476f2d72a65c5':
Add JIT system properties
6909c0e1e7bbf6e8050330244bbe47bff9587225 06-Mar-2015 Mathieu Chartier <mathieuc@google.com> Add JIT system properties

Added the following runtime options.
"dalvik.vm.usejit" -> "-Xusejit:"
"dalvik.vm.jitcodecachesize" -> "-Xjitcodecachesize:"
"dalvik.vm.jitthreshold" -> "-Xjitthreshold:"

Bug: 17950037
Change-Id: I4996cdd1e34a1743d83c37069f545e6e09bccdb9
ndroidRuntime.cpp
f4faeac3525fe1ce3707ab785a1651aec367589d 05-Mar-2015 John Reck <jreck@google.com> Cleanup Bitmap JNI attempt #2

Original version missed a spot

This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.

Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/opengl/util.cpp
ndroid_view_PointerIcon.cpp
om_google_android_gles_jni_EGLImpl.cpp
cd4ed96d10d49cb182e66aa1735f2de7596707ee 05-Mar-2015 Derek Sollenberger <djsollen@google.com> emove uncessary include for SkPorterDuff.h (Part 2)

Change-Id: I4d29d65a2e8eaf26b1cde6a525703be248bce63d
ndroid_graphics_Canvas.cpp
560a433c44a3fe6ec887d726618a41cd01daa753 05-Mar-2015 Raph Levien <raph@google.com> Merge "Add JNI StaticLayout.Builder"
b9a468eb193a374bf82279817aa592b3f5901c98 05-Mar-2015 Chad Jones <chadj@google.com> Merge "Revert "Cleanup Bitmap JNI""
c02977e3bbfaaedcb1b1d67e1692becc7dddd59b 05-Mar-2015 Chad Jones <chadj@google.com> Revert "Cleanup Bitmap JNI"

This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.

Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/opengl/util.cpp
ndroid_view_PointerIcon.cpp
om_google_android_gles_jni_EGLImpl.cpp
35da7d904b4eb6ef215ea57cef35bac31f05defd 05-Mar-2015 John Reck <jreck@google.com> Merge "Cleanup Bitmap JNI"
4c1f12efcf24e404df40f19075eb95a148a9d6a1 03-Mar-2015 Raph Levien <raph@google.com> Add JNI StaticLayout.Builder

This patch adds a native C++ Builder object for StaticLayout to
complement the Java one introduced in a previous patch.

The Builder object contains state used in constructing a layout, as well
as temporary buffers, to avoid having to allocate such. In particular,
it holds a break iterator, so avoids the cost of constructing that in
the common case of a single locale.

Change-Id: I1125103b7ccf00b8674c1586c3ea8d5d915fdd5b
ndroid_text_StaticLayout.cpp
b2915245b74b3b5541b123e38403f8e26426b4b7 04-Mar-2015 John Reck <jreck@google.com> Cleanup Bitmap JNI

Fix a bunch of places where mNativeBitmap was being
poked at directly, switch them either to the NDK API
or to GraphicsJNI where it made sense

Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/opengl/util.cpp
ndroid_view_PointerIcon.cpp
om_google_android_gles_jni_EGLImpl.cpp
a9aded1f6253afbea7906509992a8a3721f731ab 04-Mar-2015 Derek Sollenberger <djsollen@google.com> Remove references to SkPorterDuff as it is deprecated.

Change-Id: Ic0722cfef4ed61aa546c495924397097a45cfe77
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Shader.cpp
ndroid_graphics_Canvas.cpp
d8812ce390a972cb2f2c273f7ede55fcccd6298b 03-Mar-2015 David Stevens <stevensd@google.com> Add missing paramater to AudioPort jni initialization.

Change-Id: Ia50a810ca8ceeece52a712e1daf5ffa616951b02
ndroid_media_AudioSystem.cpp
3c3ce17c5a484de0ec02ba6bc890036657ec6eb4 19-Feb-2015 Erik Kline <ek@google.com> Refactor NetworkUtils interaction with DHCP.

Separate out starting DHCP (DISCOVER) and RENEW operations from fetching
the results. Add NetworkUtils.getDhcpResults(), to enable quick checks
of any available DhcpResults without extraneous interaction with the
DHCP daemon.

Bug: 19422416
Change-Id: I58808e529dda8429737e749f5caef56d923c0809
ndroid_net_NetUtils.cpp
ba67aee02cf864793129976cd8a8a46e60c60577 21-Feb-2015 Jim Miller <jaggies@google.com> Add fingerprint settings support to the framework

- cleanup thread issue and simplify native FingerprintService methods
- add new permissions and enforce them
- add fingerprint hardware detection API

Change-Id: I87c2243ea2412061f1e85b044138480d0161bcdf
ndroid_server_FingerprintManager.cpp
07a65f444a88a8acf727700f5e23c3a537466e6a 27-Feb-2015 Mark Salyzyn <salyzyn@google.com> am bbef7cf3: am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"

* commit 'bbef7cf3bbf778dd8ae3b91b140bf4542241093b':
jni: Add paranoia regarding android_logger_list_read
012c3b723a8e73012444b7f839b363f698725a01 27-Feb-2015 Mark Salyzyn <salyzyn@google.com> am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"

* commit 'a891d08dad829c9aacd29bd2c3b36debe3fc1cc3':
jni: Add paranoia regarding android_logger_list_read
73f9c7d478010c9692ea46526e0dd5e91dc00299 27-Feb-2015 Mike Reed <reed@google.com> don't reference (deprecated) kIgnore_SkAlphaType

Change-Id: I6c09845c48efc66a1057bc8db512b7567ade7e72
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
ca50cd2114f2c509ae2d1d06468e61f3cfc0b280 26-Feb-2015 Mark Salyzyn <salyzyn@google.com> jni: Add paranoia regarding android_logger_list_read

Change-Id: Ic52be201ec7efaef6a385aaf8ea523554aa06f22
ndroid_util_EventLog.cpp
248ed8282b383f55dc525aa4afefd20cfe78a60e 26-Feb-2015 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix local variable names in rgb->ycbcr conversion."
b11be294b1e721c08f3756626edfedea35711eb2 26-Feb-2015 Chris Craik <ccraik@google.com> Merge "Glop mesh reorg, support for drawBitmapMesh"
ef2507439c08f4e9c4c9bba1c6243ca9df2ee827 26-Feb-2015 Chris Craik <ccraik@google.com> Glop mesh reorg, support for drawBitmapMesh

Change-Id: Iaf5550bdd93da93e59a5b838234ab5612e067387
ndroid_view_GLES20Canvas.cpp
fc6cd75fc09fdccd4e1dc0b07eebde9af85947c8 26-Feb-2015 Dan Albert <danalbert@google.com> am 72e7217d: am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."

* commit '72e7217d0bd1035fc0c947da5d1e802624774a80':
Update autogenerated gl functions.
b7121d703067b440281f27a40b8273b17bef1e62 26-Feb-2015 Dan Albert <danalbert@google.com> am b78cce6f: Merge "Update autogenerated gl functions."

* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
Update autogenerated gl functions.
b78cce6f92e38b57a6a56183cdbafc054c5758fe 25-Feb-2015 Dan Albert <danalbert@google.com> Merge "Update autogenerated gl functions."
a49ce66b06a4aed5d6e124792952008ebf6b766d 25-Feb-2015 Mark Salyzyn <salyzyn@google.com> am f7b68049: am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"

* commit 'f7b68049521b5f1c31894f5dad529f719098e987':
jni: switch to ANDROID_LOG_* mode flags
533758c1fb2dcf5b50db46b60d26ecae72fc71ee 25-Feb-2015 Mark Salyzyn <salyzyn@google.com> am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"

* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
jni: switch to ANDROID_LOG_* mode flags
18998c985227a9e4affff9f0c4c591ff7d933cc9 26-Jan-2015 Mark Salyzyn <salyzyn@google.com> jni: switch to ANDROID_LOG_* mode flags

Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3
ndroid_util_EventLog.cpp
10caf0390d39f0bd46876eee6ab2c9a73d4e1d39 23-Feb-2015 Dan Albert <danalbert@google.com> Update autogenerated gl functions.

Corresponding frameworks/native change:
https://android-review.googlesource.com/#/c/134491/

Since this fixes the int-to-pointer cast issues, stop ignoring that
warning.

Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
ndroid.mk
ndroid_opengl_EGL14.cpp
ndroid_opengl_GLES30.cpp
e1a0858fb0e66e2ca9a43c77fc39244f4ba6ea06 20-Feb-2015 Chris Craik <ccraik@google.com> Merge "Glop layer mesh rendering"
ba6adf66d3c44c0aa2fd8a224862ff1901d64300 19-Feb-2015 John Reck <jreck@google.com> Initial attempt at jank-tracking stat collection

Is a bit naive, perhaps overly aggressive, but sorta works

Change-Id: I01a774e00dbe681439c02557d9728ae43c45ce50
ndroid_view_Surface.cpp
ndroid_view_ThreadedRenderer.cpp
f27133df2d179c99d6bc1ae644af09e9153a0071 19-Feb-2015 Chris Craik <ccraik@google.com> Glop layer mesh rendering

Change-Id: I2d902819d5d77f496b67d4d25a298782903e410d
ndroid_view_HardwareLayer.cpp
c31dd3bdffa5e8861da648bf6cd9f9cffde17616 13-Feb-2015 Sasha Levitskiy <sanek@google.com> Fingerprint: Adjust to HAL2 spec.

Change-Id: Ifc0497079aa059710b3fd4e3b1ad521acf5dcd3c
ndroid_server_FingerprintManager.cpp
1ea5736339fef03de09a40ef389c52355b168388 12-Feb-2015 destradaa <destradaa@google.com> Merge "Intern strings used in Sensor information."
346066ef90c6b0af50ba0187338de7e8c8c2f8aa 12-Feb-2015 Eino-Ville Talvala <etalvala@google.com> am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
automerge: ad5591f

* commit 'ad5591f819466fc1c87d9ca76be8c06673ccce34':
Legacy: Only set user surface dimensions on output surfaces
ad5591f819466fc1c87d9ca76be8c06673ccce34 12-Feb-2015 Eino-Ville Talvala <etalvala@google.com> am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev

* commit 'f5d304636d27ea300c092fac0f0214170a89ba39':
Legacy: Only set user surface dimensions on output surfaces
75f42173c2ec61f67f788ef5b082a4cb5a2ee377 12-Feb-2015 Eino-Ville Talvala <etalvala@google.com> am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev

* commit 'a5f301c7fb048461197a6032f66b35772a3157f9':
Legacy: Only set user surface dimensions on output surfaces
b0acf7fcfab08b5af1f99daa51bedbb659d18926 12-Feb-2015 Eino-Ville Talvala <etalvala@google.com> Legacy: Only set user surface dimensions on output surfaces

The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.

Bug: 16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
9ba7c1c17567c19f0187d73cdca55ca99590674e 11-Feb-2015 destradaa <destradaa@google.com> Intern strings used in Sensor information.

By creating a local 'interning map', Sensor information, such as: name, vendor,
stringType, and requirePermissions; 92 string objects are not needed anymore.
This frees ~6KB of memory in all processes accessing SensorManager.

Change-Id: Idfdc98160363bec844c34fc3b71f5e8d7843a7be
ndroid_hardware_SensorManager.cpp
8973597944890db9e7ad90a29ff8a44e6b2e2a7b 11-Dec-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix local variable names in rgb->ycbcr conversion.

Change-Id: I413becdd8dcc4faff74d747badaffb66f220c99a
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
89a2466a2a2859df5f29350117efd7f9d6a2e32f 09-Feb-2015 Leon Scroggins III <scroggo@google.com> Check that bitmap's size does not exceed 32 bits. DO NOT MERGE

BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
ndroid/graphics/Graphics.cpp
10804eb2818ab59b763a37b4f6151693c2ebba7b 28-Jan-2015 Paul McLean <pmclean@google.com> Add additional info to AudioPort for enum/selection API.

Add "device name" member to AudioPort.
Moved unique device ID from DevicePort to AudioPort.
Straighten out confusion between "name" and "address"
Created string constants for Intent "extra" data keys.
Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API.
Parse out USB Device name in UsbCardsParser.

Change-Id: Ifd76b0298312090a8f39e638339f993b86d47080
ndroid_media_AudioSystem.cpp
c4e4eef64a660bcc81dfcaec39822ad7711997b4 30-Jan-2015 Derek Sollenberger <djsollen@google.com> Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas"
9a1eefe174ee838cbea21f5b90569804d6745262 30-Jan-2015 Leon Scroggins III <scroggo@google.com> Merge "AvoidXferMode -> AvoidXfermode."
ed1ce37759fe1312d590e7ed46f1eb65a8a38ac2 30-Jan-2015 Leon Scroggins III <scroggo@google.com> AvoidXferMode -> AvoidXfermode.

When I moved this code here from external/skia, I accidentally changed
the lowercase 'm' to uppercase 'M'. Change back, to keep consistent
with SkXfermode and Xfermode.cpp.

Change-Id: I9694d29a22aaed7fcc8708f5962e3d2032297d08
ndroid.mk
ndroid/graphics/AvoidXferMode.cpp
ndroid/graphics/AvoidXferMode.h
ndroid/graphics/AvoidXfermode.cpp
ndroid/graphics/AvoidXfermode.h
ndroid/graphics/Xfermode.cpp
9bf106f1569faf647b5d3cf4dbc0b60e0921c831 30-Jan-2015 Leon Scroggins III <scroggo@google.com> Merge "Move SkAvoidXferMode into frameworks/base."
626647c3f6975269e6c2e0ebd4f412a977f49735 29-Jan-2015 Leon Scroggins III <scroggo@google.com> Move SkAvoidXferMode into frameworks/base.

We are removing it from Skia, so we need it here to support Android.

Add some small cleanups (remove comment that doesn't apply, convert
SK_OVERRIDE to override, remove 'virtual' keyword from methods with
'override' on them).

BUG:skbug.com/3329
Change-Id: I1f883082d6fb9d49b9c9ba9e1f50bd713eabf915
ndroid.mk
ndroid/graphics/AvoidXferMode.cpp
ndroid/graphics/AvoidXferMode.h
ndroid/graphics/Xfermode.cpp
c5ea9faef0d654148556c1dcc7f6c85b2866ea8a 29-Jan-2015 Derek Sollenberger <djsollen@google.com> Merge "Fix bitmap allocation error that causes crash when calling Bitmap::extractAlpha"
d37095b74eac610a719826311693078a670e9f71 29-Jan-2015 Derek Sollenberger <djsollen@google.com> Fix bitmap allocation error that causes crash when calling Bitmap::extractAlpha

bug: 19112656
Change-Id: Ib44ba4208449d5873402e9516abc8b6d8fa0b82a
ndroid/graphics/Graphics.cpp
b3d50e007523d1ada0866d384c391c72ac1a3577 29-Jan-2015 Derek Sollenberger <djsollen@google.com> Rename Canvas::getSkCanvas to Canvas::asSkCanvas

Change-Id: I967a45698d382e54eaa5ff64fa8909ff00908650
ndroid/graphics/Camera.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Picture.cpp
283ddb9d4f871e2816e37b9151108c01939b1f8a 28-Jan-2015 Leon Scroggins III <scroggo@google.com> am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev
automerge: 8475144

* commit '847514499f5920d073f5cd402dd0d3bbd19ac2c1':
Handle bad ninepatch data.
847514499f5920d073f5cd402dd0d3bbd19ac2c1 27-Jan-2015 Leon Scroggins III <scroggo@google.com> am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev

* commit '3523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57':
Handle bad ninepatch data.
a730ef3f77fc495bc90199b4d45efab26d609782 27-Jan-2015 Leon Scroggins III <scroggo@google.com> Handle bad ninepatch data.

Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
ndroid/graphics/NinePatchPeeker.cpp
56bbefccf27d3c32029121fe23f0b02c01eba338 22-Jan-2015 Narayan Kamath <narayan@google.com> Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: 117f161
automerge: 1194e75

* commit '1194e754a95e1fa5d4eba6d0bca109156dd4df94':
Add support for persist.sys.locale.
1194e754a95e1fa5d4eba6d0bca109156dd4df94 22-Jan-2015 Narayan Kamath <narayan@google.com> Merge "Add support for persist.sys.locale." automerge: dca2332
automerge: 117f161

* commit '117f161fee52dfa200f89282c487d58c29b41d4f':
Add support for persist.sys.locale.
d30dbb8ae12e6e83e3035f12dd291f92e1f22c18 15-Jan-2015 Narayan Kamath <narayan@google.com> Add support for persist.sys.locale.

AndroidRuntime has been changed to read "ro.product.locale" and
"persist.sys.locale" instead of "ro.product.locale.language" etc.
This is passed down as "-Duser.locale" to the runtime.

The system_server has been changed to write out persist.sys.locale
on locale changes.

bug: 17691569

Change-Id: I93360c8795c9620a133656dc491d13d7b6ed162e
ndroidRuntime.cpp
2ae07339824efc50468f971ff8920ff0b894cad4 21-Jan-2015 Chris Craik <ccraik@google.com> Remove DisplayListLogBuffer

Change-Id: I001832fc444b6d532f4a382e0a31cc1d8956dbd8
ndroid_view_GLES20Canvas.cpp
849911a9c4315fc552faa38516c842b2541b1909 20-Jan-2015 John Reck <jreck@google.com> Move Canvas

Change-Id: I83d557af30fc2d5c69d06eedc0f4d52ac41c4210
ndroid.mk
ndroid/graphics/Canvas.h
ndroid/graphics/SkiaCanvas.cpp
ndroid_graphics_Canvas.cpp
84a6d9e609ac6ad65e5bf43c8980d78917be543e 16-Jan-2015 Andy Hung <hunga@google.com> Merge "Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers"
d5049e2f74595cb73f28a78abe7b453863fe66cf 16-Jan-2015 Chris Craik <ccraik@google.com> am 04b633c5: am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev

* commit '04b633c526b3ea72cb13f0c0472673f3baf07625':
Update generationId on bitmaps when decoded into by BitmapRegionDecoder
950597d032bc638b5c5e8e8cf03eb24aee53e73a 16-Jan-2015 Eino-Ville Talvala <etalvala@google.com> am 31028fa6: am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev

* commit '31028fa621b0f182f39b1f6d391963e8e6f627fe':
Camera: Clarify JNI exception message
04b633c526b3ea72cb13f0c0472673f3baf07625 16-Jan-2015 Chris Craik <ccraik@google.com> am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev

* commit '0de2eca5fc439e2622cc0cc5a54cd9a5938f67c6':
Update generationId on bitmaps when decoded into by BitmapRegionDecoder
112e35b4641a1a8cad3616c8209ab47f03f9ab67 16-Jan-2015 Chris Craik <ccraik@google.com> Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev
31028fa621b0f182f39b1f6d391963e8e6f627fe 15-Jan-2015 Eino-Ville Talvala <etalvala@google.com> am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev

* commit '1334a6f34296094baddc0d4c0c93357532b2a96d':
Camera: Clarify JNI exception message
177612335aa5df21d8c21125608413d02289a6b3 15-Jan-2015 Ben Wagner <bungeman@google.com> Remove last mention of SkFontHost.

SkFontHost is now almost removed from Skia, and nothing is left in it
which interests Android. Remove the last few references to it to aid
in final removal.

Change-Id: I7d59cf7e08bdd5b9c3923c9ffaf03b1cc2f9f7b4
ndroidRuntime.cpp
ndroid/graphics/HarfBuzzNGFaceSkia.cpp
3b47713b26859f83c0cf7adede8e8090097673ad 15-Jan-2015 Chris Craik <ccraik@google.com> Update generationId on bitmaps when decoded into by BitmapRegionDecoder

bug:18921087

This fixes issues where bitmaps are cached as textures, and not
reuploaded when reused by BitmapRegionDecoder, showing stale content.

Change-Id: I7626fd6acd36d8e38723689734855ce9154eb8c8
ndroid/graphics/BitmapRegionDecoder.cpp
dbf22ccd92dc95e7c93c0485be4bcfb5c966578a 14-Jan-2015 Derek Sollenberger <djsollen@google.com> Merge "Update HWUI to store its own SkBitmap objects"
2c0e17c029eccc06deb883d8d564a7e19d98f65e 13-Jan-2015 Andy Hung <hunga@google.com> Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers

Change-Id: I7424455ccff860126ceda432613db67a8933ea1e
ndroid_media_AudioTrack.cpp
f9133347492a662a89f2aeaf977b60a048d2b647 13-Jan-2015 Eino-Ville Talvala <etalvala@google.com> Camera: Clarify JNI exception message

This exception may be generated through MediaRecorder method calls
as well, so clarify that the issue is an invalid camera object.

Bug: 18414095
Change-Id: I189ab1a71ab0d6a432b87c45a82c90fe11d22ef8
ndroid_hardware_Camera.cpp
c2d39573ca95994d9a44db8aea4887a67f84e5ac 12-Jan-2015 Ben Wagner <bungeman@google.com> Remove dead code from AssetStreamAdapter.

After "Use at least SkStreamAsset for SkTypefaces." there is now dead
code in AssetStreamAdapter. Remove the code and update the users.

Change-Id: I17a9d82dd6ca4d87a951c1570dc91de7f2fc54f2
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
f462c2491bae67815ae9e4a2ff7ce77db97b49c6 12-Jan-2015 Ben Wagner <bungeman@google.com> Use at least SkStreamAsset for SkTypefaces.

The existing AssetStreamAdapter is only SkStreamRewindable, and does not
support 'duplicate'. This is needed in order for SkTypeface to be used
properly. Also, SkTypeface is moving to require SkStreamAsset for
creating typefaces for performance and code reasons.

In the previous code, Asset::getBuffer is called on creation of the
typeface, so do so explicitly and manage the memory directly. This
also prevents additional copies being made of the asset data.

BUG: 18867034
Change-Id: I458a8ec024efefb761138178b87b88b48cb4a773
ndroid/graphics/FontFamily.cpp
1bc109b9280113e44b7b48b355397a630d0862e7 10-Jan-2015 Ruben Brunk <rubenbrunk@google.com> am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.

* commit '8f8dc4882bc61b7e273ac991e2ae99834d55b7d0':
Camera2: Fix early EOF in DngCreator#writeByteBuffer.
8f8dc4882bc61b7e273ac991e2ae99834d55b7d0 10-Jan-2015 Ruben Brunk <rubenbrunk@google.com> resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.

Change-Id: Idbf96ab23c02dc7c380d6c3a4a87b1f380446c61
8c52d9a092452837e7222d8416c3b4accf9a99d7 10-Jan-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev
a3fdec8dac09b178d642c07a538c42faf84c2aaa 09-Jan-2015 Ruben Brunk <rubenbrunk@google.com> Camera2: Fix early EOF in DngCreator#writeByteBuffer.

Bug: 18962278
Change-Id: I8641a03d866930c86bdd2db0a29ccd5560712c90
ndroid_hardware_camera2_DngCreator.cpp
3d4eed7f1aa99401dabe2e45b82f98fb4fc2d754 04-Dec-2014 Derek Sollenberger <djsollen@google.com> Update HWUI to store its own SkBitmap objects

This enables us to...

1) simplify the lifecycle/ownership between Java and HWUI
2) remove DisplayListRenderer::drawBitmapData and associated logic
3) track pixel lifecycle using standard SkPixelRef refcounting
4) Remove uncessary calls to ref/unref the bitmap's pixels and colorTable

Change-Id: I3c95078da20995444f6388a029414280fd654318
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_graphics_Canvas.cpp
304cc5387478618164cd9167f12564f91eb6cc66 08-Jan-2015 Derek Sollenberger <djsollen@google.com> Use the generic Canvas instead of SkCanvas

bug: 18642206
Change-Id: I0dc3f6b620083e5948c2d4be541ae7c6261b3482
ndroid/graphics/Movie.cpp
93e6d6ede499861da1dce2febc34e72b0e3f7b5d 07-Jan-2015 Andreas Gampe <agampe@google.com> am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
automerge: 555ea65

* commit '555ea653bae019379eb8d1aa70dfcb86789c19d3':
Core/jni: Disallow relocation for decryption
555ea653bae019379eb8d1aa70dfcb86789c19d3 07-Jan-2015 Andreas Gampe <agampe@google.com> am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"

* commit 'ec64c0b6e639b743398fb543218100fdaf9a7f69':
Core/jni: Disallow relocation for decryption
022b1ba188b249b0f17d1b5e8ab3badbc529f98e 07-Jan-2015 Andreas Gampe <agampe@google.com> Merge "Core/jni: Disallow relocation for decryption"
155118fee81f2761289438f4c4cd47d740ff8f88 07-Jan-2015 neo.chae <neo.chae@lge.com> Core/jni: Disallow relocation for decryption

When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.

If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.

This patch ensures that the boot image is not being relocated.

Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
ndroidRuntime.cpp
40a0709a56277e26e63654a58d285e6a471d33c0 07-Jan-2015 Tom Hudson <tomhudson@google.com> Merge "Merge frameworks/base changes from master-skia to master."
152d7282a42cd7130648f373775fe75d319557f2 06-Jan-2015 Vladimir Marko <vmarko@google.com> Check for OOM in BitmapFactory's getMimeTypeString().

Bug: 18909596

(cherry picked from commit 7ab249a18e08bfefb8c2d60af1fb668c67ba4368)

Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3
ndroid/graphics/BitmapFactory.cpp
2e61c040703bea032222850a58c0d38a2566ac12 07-Jan-2015 Vladimir Marko <vmarko@google.com> am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
automerge: 4e29869

* commit '4e2986940b2ff456693a805026c6910e950c42e2':
Check for OOM in BitmapFactory's getMimeTypeString().
4e2986940b2ff456693a805026c6910e950c42e2 07-Jan-2015 Vladimir Marko <vmarko@google.com> am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."

* commit 'bf31cb6be4290ce161d99a2a70c318f665a14a77':
Check for OOM in BitmapFactory's getMimeTypeString().
71487eb0ceb2b7dea02649e78d99bb5952f5eaef 19-Nov-2014 Mike Reed <reed@google.com> Merge frameworks/base changes from master-skia to master.

Adaptations to changes in Skia upstream since Oct 2014.
(https://code.google.com/p/skia/issues/detail?id=2377)

cbb922d use new roundOut signature
77082de Call SkColorTable::readColors().
5456ab1 Handle the result of SkMatrix::asAffine.
25cfc78 Remove dependence on SK_LEGACY_PICTURE_SIZE_API.

BUG:18468293

Change-Id: I5a4d274e854298843891410b1ffd5e24f038b88a
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/Picture.h
ndroid/graphics/pdf/PdfDocument.cpp
ndroid/graphics/pdf/PdfEditor.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
ndroid/opengl/util.cpp
f70afa9b8f6750ecc18a0d934b5d4b655f4267c2 06-Jan-2015 Narayan Kamath <narayan@google.com> am 721d0994: am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."

* commit '721d0994dc6ed370e359a33a6798f87389a428c8':
Fix comment. It should be 'or' not 'of'.
7ab249a18e08bfefb8c2d60af1fb668c67ba4368 06-Jan-2015 Vladimir Marko <vmarko@google.com> Check for OOM in BitmapFactory's getMimeTypeString().

Bug: 18909596
Change-Id: If65fe45f5fd569a99a0cae1d31117af262bca430
ndroid/graphics/BitmapFactory.cpp
721d0994dc6ed370e359a33a6798f87389a428c8 06-Jan-2015 Narayan Kamath <narayan@google.com> am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."

* commit 'f60b2d40b0b8dea2c83335c00fd7767008aa0abe':
Fix comment. It should be 'or' not 'of'.
024191b57f2165e4d0c2c579f95046d491feacb5 06-Jan-2015 Narayan Kamath <narayan@google.com> Merge "Fix comment. It should be 'or' not 'of'."
8dfaa4904205772cdceee63ef3989bcdedf1a914 09-Dec-2014 Tom Hudson <tomhudson@google.com> Make DisplayListRenderer inherit from Canvas, merge JNI

Incrementally unify the upper layers for Skia and HWUI.
Remove redundant code from GLES20Canvas.java; instead
use inherited mNativeCanvasWrapper and superclass method
definitions.

Moves some unrelated SkPaint utility functions from Renderer
to new utils/PaintUtils.

bug: 15672762
Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
ndroid/graphics/SkiaCanvas.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_GLES20Canvas.cpp
6d5ba6537b716ec739efb72c230ab6cb4cc39cfe 31-Dec-2014 Narayan Kamath <narayan@google.com> am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
automerge: bdc3992

* commit 'bdc399299edf7f5f86c816dafe581e85e65dd2bd':
Remove hardcoded include paths.
bdc399299edf7f5f86c816dafe581e85e65dd2bd 31-Dec-2014 Narayan Kamath <narayan@google.com> am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."

* commit 'd3d95172c3645a1d7a12e540638207ae4fb69cae':
Remove hardcoded include paths.
bc2cc2f350473d5427dc1db661f7c3931f2a760c 30-Dec-2014 Narayan Kamath <narayan@google.com> Remove hardcoded include paths.

ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.

bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
ndroid.mk
ndroid_net_NetUtils.cpp
1daa2c4598e3f0c02d28f4862fb23b65b7c0032c 23-Dec-2014 Andreas Gampe <agampe@google.com> am 5470c169: am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
automerge: 83cfb97

* commit '83cfb97323469e3370840c6cefb5689ab2059025':
Core/jni: Remove Dalvik options from AndroidRuntime
83cfb97323469e3370840c6cefb5689ab2059025 23-Dec-2014 Andreas Gampe <agampe@google.com> am 5470c169: am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"

* commit '5470c1699121135f0f1c615d080359f0bc9cf1c4':
Core/jni: Remove Dalvik options from AndroidRuntime
08b2d585b11a07d1df12919467722d9c5c80a0f4 18-Dec-2014 Andreas Gampe <agampe@google.com> Core/jni: Remove Dalvik options from AndroidRuntime

Dalvik is dead. Remove old command-line options from AndroidRuntime.

Bug: 18833580
Bug: 18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
ndroidRuntime.cpp
1e9547722fe0712bc1a0dd04d9dd147d238b948e 19-Dec-2014 Leon Scroggins III <scroggo@google.com> Merge "Make SkiaCanvas creation call ref() on SkCanvas."
0e52410217c1728a77e6867a884ed4e8c29b7cbc 19-Dec-2014 Leon Scroggins III <scroggo@google.com> Merge "Remove dependence on SK_LEGACY_PICTURE_DRAW_API."
c21e364386ee0a900d166ae90f09fa1899cd31f2 18-Dec-2014 John Reck <jreck@google.com> Merge "Stop pretending USE_OPENGL_RENDERER is a thing"
a2732a2bf98f7dbd063f4e5679f5b8bfcbec2698 18-Dec-2014 John Reck <jreck@google.com> Stop pretending USE_OPENGL_RENDERER is a thing

Change-Id: I732b490431fe90eafa00a00f3b5429f0d3a067e6
ndroid.mk
ndroid/graphics/Bitmap.cpp
ndroid/graphics/CanvasProperty.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Path.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_RenderNode.cpp
ndroid_view_RenderNodeAnimator.cpp
ndroid_view_ThreadedRenderer.cpp
om_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp
496894b0e1d951160c14d2bc74243af972775a4f 18-Dec-2014 Elliott Hughes <enh@google.com> am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." automerge: e37f3af
automerge: e6f2f9d

* commit 'e6f2f9db42632f581d221ece90e1824e114f2f12':
Move the remaining ZygoteInit native code over to Java.
e6f2f9db42632f581d221ece90e1824e114f2f12 18-Dec-2014 Elliott Hughes <enh@google.com> am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java."
automerge: e37f3af

* commit 'e37f3af76dc0c876ea7169b9153f79175d0c703d':
Move the remaining ZygoteInit native code over to Java.
f2883b320fd874ec70bbef28731f17fa55bade11 18-Dec-2014 Mike Reed <reed@google.com> explicitly call tryAllocPixels if you want to check for failure

allows us to remove SK_SUPPORT_LEGACY_ALLOCPIXELS_BOOL

Change-Id: I095a04e358404bc413ceebe81e7e1adfbbbec027
ndroid/graphics/BitmapFactory.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_GLES20Canvas.cpp
26b56e628bd77b1e77137b68aecb194791ec6cf6 17-Dec-2014 Elliott Hughes <enh@google.com> Move the remaining ZygoteInit native code over to Java.

Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
ndroid.mk
ndroidRuntime.cpp
om_android_internal_os_ZygoteInit.cpp
dc4b6a892a9c5d520933f67d8eef63a2c1474b95 17-Dec-2014 Elliott Hughes <enh@google.com> am 8b3df1f9: am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java."

* commit '8b3df1f971dec922aba4df766ae25dc16c660445':
Rewrite selectReadable JNI in Java.
8b3df1f971dec922aba4df766ae25dc16c660445 17-Dec-2014 Elliott Hughes <enh@google.com> am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java."

* commit 'a1beb930f59ae88f4386726cdf3a7e5986bd74e1':
Rewrite selectReadable JNI in Java.
18981294a58c411a4a33ebb22caf9c75ba639691 17-Dec-2014 Leon Scroggins III <scroggo@google.com> Make SkiaCanvas creation call ref() on SkCanvas.

There are two callers of SkiaCanvas::create_canvas(SkCanvas*). In both
cases, we were calling ref() first. It is necessary to call ref() in
both cases, since we have an SkCanvas returned by
SkPictureRecorder::beginRecording, which does not increment the ref
count to account for the caller. (i.e. the SkPictureRecorder has the
only ref until you call ref()).

Rather than leave the ref up to the caller, since the SkiaCanvas does
the unref(), it should also do the ref(). Update it to do so and
document its behavior.

Also, make SkiaCanvas' constructors explicit.

Change-Id: I894d0a71a87587cf8c2b26deb2384dc49ae090ef
ndroid/graphics/Picture.cpp
ndroid/graphics/SkiaCanvas.cpp
ndroid/graphics/pdf/PdfDocument.cpp
894724be3026c84681cdc902cb62eab6ba646e11 15-Dec-2014 Elliott Hughes <enh@google.com> Rewrite selectReadable JNI in Java.

Bug: 18719692
Change-Id: Id4fa95a31f112c720f7a3ac47a3b6c95c3028438
om_android_internal_os_ZygoteInit.cpp
d40e89258e0baa903f8fa9599dde12ed995b40c0 15-Dec-2014 Leon Scroggins III <scroggo@google.com> Remove dependence on SK_LEGACY_PICTURE_DRAW_API.

Call SkPicture::playback() instead of ::draw().

Also, no need longer need the const_cast.

Change-Id: I4742d2fd5c5b918db492ec2ef6a84ea7d6151cdd
ndroid/graphics/Picture.cpp
c4e9215fa5378baded35debb302fbd51a9ba2b48 15-Dec-2014 Elliott Hughes <enh@google.com> am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java."
automerge: 3e8484c

* commit '3e8484c3f7f615c4b3f1cb925c4164d513cc0e97':
Reimplement reopenStdio in Java.
3e8484c3f7f615c4b3f1cb925c4164d513cc0e97 15-Dec-2014 Elliott Hughes <enh@google.com> am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java."

* commit '2a6426c900d319c7b928242694ad050a73ad324b':
Reimplement reopenStdio in Java.
dac83f5e6ad494f19a17523e56872e1d0870ee57 15-Dec-2014 Elliott Hughes <enh@google.com> Reimplement reopenStdio in Java.

Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
om_android_internal_os_ZygoteInit.cpp
7f3a73c7b599686e37786e446745acef5e172988 13-Dec-2014 Elliott Hughes <enh@google.com> am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote."
automerge: a95b568

* commit 'a95b568f9afcabb067f5ec8ef602800a89d273ee':
Lose some unnecessary JNI from the zygote.
a95b568f9afcabb067f5ec8ef602800a89d273ee 13-Dec-2014 Elliott Hughes <enh@google.com> am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote."

* commit '20c906a8d40aed68ee35095f322739664e1e223a':
Lose some unnecessary JNI from the zygote.
3fe595108f47fffd73cfc2eb48b71a31e5d606d0 12-Dec-2014 Elliott Hughes <enh@google.com> Lose some unnecessary JNI from the zygote.

Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
om_android_internal_os_ZygoteInit.cpp
6f8b9bc9c1f0b97c29e69e6b7adfbb39888435eb 12-Dec-2014 Iliyan Malchev <malchev@google.com> am 16568705: am 45838de9: fix Uss accounting in getPssPid() automerge: 72468d2

* commit '16568705855f6c8dd78bc188c17e0237c5e827c0':
fix Uss accounting in getPssPid()
16568705855f6c8dd78bc188c17e0237c5e827c0 12-Dec-2014 Iliyan Malchev <malchev@google.com> am 45838de9: fix Uss accounting in getPssPid()
automerge: 72468d2

* commit '72468d2d146f737b2b5d0223687b8fbc52723c76':
fix Uss accounting in getPssPid()
00b2eb2bc024ae156bdd8b05c921ccbb40cd959b 12-Dec-2014 Ruben Brunk <rubenbrunk@google.com> am c7c20b34: am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev automerge: 81b381b

* commit 'c7c20b34ecbaef5c1f60115755e87dbaaf0cfb4c':
camera2: Fix LEGACY YUV production and orientation.
c7c20b34ecbaef5c1f60115755e87dbaaf0cfb4c 12-Dec-2014 Ruben Brunk <rubenbrunk@google.com> am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
automerge: 81b381b

* commit '81b381b82e83ec742a8a6541dabbc63dae087c0a':
camera2: Fix LEGACY YUV production and orientation.
45838de942b87150fc3b03a8b943841a8647fd81 11-Dec-2014 Iliyan Malchev <malchev@google.com> fix Uss accounting in getPssPid()

Change-Id: I0d1dc81d127afbf3a7d7b4b86865ccb0e8bd7d4c
Signed-off-by: Iliyan Malchev <malchev@google.com>
ndroid_os_Debug.cpp
17a0826e5de70657279f4564c4ed6de819cb3768 11-Dec-2014 Chih-hung Hsieh <chh@google.com> am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
automerge: d1aa67b

* commit 'd1aa67b8e19ae96bd2ae4e6719d13902a8b6d845':
Adjust format strings to work on both 32-bit and 64-bit builds
d1aa67b8e19ae96bd2ae4e6719d13902a8b6d845 11-Dec-2014 Chih-hung Hsieh <chh@google.com> am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
Adjust format strings to work on both 32-bit and 64-bit builds
4c23a0ec161891a1248b7aea67fbfd1d00bbd199 11-Dec-2014 Chih-hung Hsieh <chh@google.com> Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
433e715cc0040ce22a31964c71bff71b1fe1a14f 11-Dec-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix LEGACY YUV production and orientation.

Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
7a27bc3a761d1b3720f994690da7b4fd079e6624 10-Dec-2014 Eric Laurent <elaurent@google.com> am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

* commit '093789755e5549bd8676d268a6f69b1d6db5026b':
AudioSystem JNI: Add audio policy custom mixes registration
093789755e5549bd8676d268a6f69b1d6db5026b 10-Dec-2014 Eric Laurent <elaurent@google.com> resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d
d64d68d9c1c56d98e06d86b7438c46b108855c3b 10-Dec-2014 Mike Reed <reed@google.com> Merge "drawBitmapMatrix is deprecated, code work-around"
fe6a5ae92481d52093ae8accfbcda3793816d3ec 10-Dec-2014 Ruben Brunk <rubenbrunk@google.com> am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265

* commit '28089cc39b0247d5e854a1a44cd8af17464b9e36':
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
65bc1125b4bdb0e982b37e76ab8a9a66adefd2e0 10-Dec-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev
af878b91f9e3a6b17a89e98504f5c497824c7017 10-Dec-2014 John Reck <jreck@google.com> am 389baa39: am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev

* commit '389baa395125d5ae5aac3b9d2f98457dde09da26':
Fix issue with RNA destruction mid-animation
dde13b3714bb775eea7249b85e13e40fc7d50dc8 10-Dec-2014 Sebastien Hertz <shertz@google.com> am 70acd9b3: resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp

* commit '70acd9b36a9fc0d212b25d64f4edf0fc582331cf':
Work on issue #18640385: Add procstats test mode
5311088a3ee147cf5398578b8aadb9180816e38c 10-Dec-2014 Mathieu Chartier <mathieuc@google.com> am e417db6d: am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev

* commit 'e417db6d574e90566e827bb2a1e5efeaa9c6d42e':
Add more -d dalvik details to dumpsys
28089cc39b0247d5e854a1a44cd8af17464b9e36 10-Dec-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033
automerge: 6d98265

* commit '6d9826546d89e03cea170ebb5b3f292d5f4a027b':
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
3ef5033cdacbc44702d0b6ba687e81383348e2fd 10-Dec-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
389baa395125d5ae5aac3b9d2f98457dde09da26 09-Dec-2014 John Reck <jreck@google.com> am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev

* commit '7d74cb6c6139d42aad65fe1466ab4c5f8e029539':
Fix issue with RNA destruction mid-animation
c47c98be04d602f331e0ea9704d2c11f8c53852d 09-Dec-2014 John Reck <jreck@google.com> Fix issue with RNA destruction mid-animation

Bug: 18521508

Fix an issue where an RNA's native object was destroyed
before the java-side object was started

Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
ndroid_view_RenderNodeAnimator.cpp
f4a637d0be2e028d1e78c8bf90ad17ec3f84b5f3 21-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.

Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
70acd9b36a9fc0d212b25d64f4edf0fc582331cf 09-Dec-2014 Sebastien Hertz <shertz@google.com> resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp

Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d
fb5c932dbbe2e7fc3ed4f0af71dc8ac76f22df57 09-Dec-2014 Mathieu Chartier <mathieuc@google.com> Merge "Add more -d dalvik details to dumpsys"
8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6 09-Dec-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev
1a4b5a4f02e7d8ff8ff645377d97e6062d36aeaa 09-Dec-2014 Dianne Hackborn <hackbod@google.com> Work on issue #18640385: Add procstats test mode

You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
ndroid_os_Debug.cpp
e417db6d574e90566e827bb2a1e5efeaa9c6d42e 09-Dec-2014 Mathieu Chartier <mathieuc@google.com> am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev

* commit '4ec1bdf52f5c0d48fd13571796644feddc5a815b':
Add more -d dalvik details to dumpsys
063028aa682ca4ceec006c0879c09ad078c9d512 09-Dec-2014 Mathieu Chartier <mathieuc@google.com> Add more -d dalvik details to dumpsys

Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
Dalvik Details
.Heap 2264 2264 0 0
.LOS 80 80 0 0
.GC 144 144 0 0
.Zygote 331 196 0 2428
.NonMoving 540 540 0 0
.IndirectRef 20 20 0 0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit 25c5e2b12d5d5d06739e3f70a0da968d97935b46)
ndroid_os_Debug.cpp
25c5e2b12d5d5d06739e3f70a0da968d97935b46 09-Dec-2014 Mathieu Chartier <mathieuc@google.com> Add more -d dalvik details to dumpsys

Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
Dalvik Details
.Heap 2264 2264 0 0
.LOS 80 80 0 0
.GC 144 144 0 0
.Zygote 331 196 0 2428
.NonMoving 540 540 0 0
.IndirectRef 20 20 0 0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
ndroid_os_Debug.cpp
70ffbf9e8288296ef7009c8297bcb6da6a7f73b2 08-Dec-2014 Mike Reed <reed@google.com> drawBitmapMatrix is deprecated, code work-around

Change-Id: I53d827ecb74c2b131645eaf3edfd748722c5078d
ndroid/graphics/SkiaCanvas.cpp
7f5eb9fe3c10d8d83ff0e2b0fc60a05c2e6d5b02 02-Dec-2014 Eric Laurent <elaurent@google.com> AudioSystem JNI: Add audio policy custom mixes registration

Bug: 16009464.

Change-Id: I3763e79f4fa0331acb56d1d6f575c7a36e0bebd5
ndroid_media_AudioSystem.cpp
46c82b4cd241a447834ed2f5a6be16777b7a990b 30-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Adjust format strings to work on both 32-bit and 64-bit builds

Adjust format strings to not produce Clang warnings in both 32-bit and
64-bit builds

Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputEventSender.cpp
1022888d33c82dedb3ab3a53d1c3bb432eca93f7 05-Dec-2014 John Reck <jreck@google.com> resolved conflicts for merge of 203c8171 to master

Change-Id: I256397410c261fae049bae4572f132235be1c5c9
9fb42f07784ac9e1ab29fa7d5bcda6c3081d238f 04-Dec-2014 John Reck <jreck@google.com> resolved conflicts for merge of a75b0ad3 to master

Change-Id: I32a2d129c556407727ada909daa6470309d42499
203c8171806a15b83efa9ad56be048281a40693b 04-Dec-2014 Derek Sollenberger <djsollen@google.com> am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev

* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
a75b0ad3842a5cfc406fbd9c7a36bf8a7bdcf069 04-Dec-2014 John Reck <jreck@google.com> resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp

Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
4d9da135caf8d4f38bb728343c1aabbf45f81d5b 04-Dec-2014 Derek Sollenberger <djsollen@google.com> Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
01a5ea35fbba4c5bb1d7790ae1677a2fa752e042 03-Dec-2014 John Reck <jreck@google.com> Resume RT-animations after a pauseSurface

Bug: 18203577

The issue occurs as a result of performTraversals() both doing
a window relayout call *and* early-returning because it's not dirty.

To fix this pauseSurface() returns whether or not the RT-side is
"dirty" to force ViewRootImpl to do a draw even if mDirty is
otherwise empty.

Change-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef
ndroid_view_ThreadedRenderer.cpp
f29d5a5b211786248d0557157c304c5fff428bd4 03-Dec-2014 Derek Sollenberger <djsollen@google.com> Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.

bug:18306529
Change-Id: I1ea94df1dcaf4fcf248b63dc8b0a13f36412570a
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_view_GLES20Canvas.cpp
625fa573b4cea5c5ee86f79ef76f16545935507e 03-Dec-2014 Adam Lesinski <adamlesinski@google.com> am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
9438ad1599716176fb6c593e77a2e93b265bbcb5 03-Dec-2014 Adam Lesinski <adamlesinski@google.com> am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
e89a286541e242ad96705fcdd1fe2c6a9eafb4a0 02-Dec-2014 Adam Lesinski <adamlesinski@google.com> Merge changes If2c7e09f,Ie21f227c

* changes:
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
c46ac588e34e733fd50f97a30feeca077701b088 02-Dec-2014 Jesse Hall <jessehall@google.com> am 954b325b: am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"

* commit '954b325bc3e30a08f41117d85aea4b7f802401f4':
Avoid overwriting EGL14.EGL_NO_SURFACE
954b325bc3e30a08f41117d85aea4b7f802401f4 02-Dec-2014 Jesse Hall <jessehall@google.com> am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"

* commit '9dec9e9d65c9f70b7a45fb3ad8f3f752b7b35fdf':
Avoid overwriting EGL14.EGL_NO_SURFACE
1ee377764a59d0e2c245dd037006fa8c086f5683 02-Dec-2014 Jesse Hall <jessehall@google.com> Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
539d57aaf0f419b16bfa2cf625cea286a45d15e2 27-Nov-2014 Eric Laurent <elaurent@google.com> am 41b2381d: am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev

* commit '41b2381db7225f7ff11c523662de6cfb47fc7c85':
AudioRecord JNI: pass attributes to native AudioRecord.
41b2381db7225f7ff11c523662de6cfb47fc7c85 27-Nov-2014 Eric Laurent <elaurent@google.com> am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev

* commit '981951e4f9bae85dcf6f717023596c08dc245ee7':
AudioRecord JNI: pass attributes to native AudioRecord.
4c3fc59b4d0c849016b17ce8e73540bdce847702 26-Nov-2014 Eric Laurent <elaurent@google.com> AudioRecord JNI: pass attributes to native AudioRecord.

Bug: 16006090.
Change-Id: Ic6448dda0de65dada3a195cfc2ec73698b04b7b2
ndroid_media_AudioRecord.cpp
1f7b3b5c7d19c210d5bbc09d5734141aa6935eda 26-Nov-2014 Elliott Hughes <enh@google.com> am 1fae0991: am f67cc149: am 2657717f: Merge "We have POSIX clocks."

* commit '1fae0991326fbaac8a11ae972f0da2bbc50be429':
We have POSIX clocks.
1fae0991326fbaac8a11ae972f0da2bbc50be429 26-Nov-2014 Elliott Hughes <enh@google.com> am f67cc149: am 2657717f: Merge "We have POSIX clocks."

* commit 'f67cc149982cefdcf9f8697c9966c710f6512d23':
We have POSIX clocks.
42c569224a6aba3fa0ee1176909d06438073675a 26-Nov-2014 Elliott Hughes <enh@google.com> We have POSIX clocks.

Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
ndroid_os_SystemClock.cpp
1d5f99b973d641236b436f090fd8f001134680a0 25-Nov-2014 chh <chh@google.com> am d7572b84: am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"

* commit 'd7572b84efdb694618fca550a3fb5ccc4a7ccd5f':
Remove unused variables and functions, don't warn about unused parameters
d7572b84efdb694618fca550a3fb5ccc4a7ccd5f 25-Nov-2014 chh <chh@google.com> am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"

* commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4':
Remove unused variables and functions, don't warn about unused parameters
2b5edf651a3916632da348e9f83e2b2393664381 25-Nov-2014 Bo Liu <boliu@google.com> am 88309159: am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev

* commit '88309159a53ceb4f34fe01056521e4b84e848ef7':
Fix crash in getNativeCanvas when canvasHandle is NULL
88309159a53ceb4f34fe01056521e4b84e848ef7 25-Nov-2014 Bo Liu <boliu@google.com> am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev

* commit '3813430367591efcf925b2baebc50a99a7666644':
Fix crash in getNativeCanvas when canvasHandle is NULL
c56c7013e3f4128722f7c8181494141da0bcfa2c 07-Nov-2014 Sangkyu Lee <sk82.lee@lge.com> Avoid overwriting EGL14.EGL_NO_SURFACE

(This is an update after the generator update.)

Both EGL14 and EGLExt have the same initialization codes for
EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY.
Since EGLExt is initialized later, they are overwritten by EGLExt's
initialization codes.
Therefore, EGL_NO_SURFACE returned by methods in EGL14 is not
actually EGL14.EGL_NO_SURFACE object and it makes several problems in
handling error cases.
For instance, "Let's fish" game application cannot be run on L.

To solve the problem, this patch makes EGL14.EGL_NO_SURFACE,
EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY initialized just once.

Change-Id: Icce878164ff0b715ad2b5a2cd038a9616c7cf1e9
ndroid_opengl_EGLExt.cpp
de92f4c72be8537d2efff6024390b9ab706286e1 24-Nov-2014 Bo Liu <boliu@google.com> Fix crash in getNativeCanvas when canvasHandle is NULL

BUG: 18261928
Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
ndroid/graphics/Graphics.cpp
4048a4bcb1ea709ddb83a4fde3ff5c53e642f7d0 23-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Remove unused variables and functions, don't warn about unused parameters

Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)

Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ndroid_nio_utils.h
3643f928824d285252eddea44f62e543108bf4b8 22-Nov-2014 Chih-hung Hsieh <chh@google.com> am 29d1b12d: am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""

* commit '29d1b12ddae8950ee7d2a8f31a040340185a331e':
Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
82cb15199acd3f5d18ae2807f986f87837f929b7 22-Nov-2014 John Reck <jreck@google.com> am cbee971a: resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp

* commit 'cbee971a105adcf071b89838818f31b37388e9b9':
It's super critical to call nStart
fa1ae7dbb81ea6122170e119c7b81ed0996cf36e 22-Nov-2014 Ian Rogers <irogers@google.com> Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp
29d1b12ddae8950ee7d2a8f31a040340185a331e 22-Nov-2014 Chih-hung Hsieh <chh@google.com> am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""

* commit '05f7c39eb45854f8d2a8a2aabb9ad9a4f9b867c1':
Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
cbee971a105adcf071b89838818f31b37388e9b9 22-Nov-2014 John Reck <jreck@google.com> resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp

Change-Id: I86b78ada4f30c23ae1232ac5a509986d5b8dc546
fc4a7538a65449428e9d321deb6a413e19461c6c 22-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""
418c8549dca8bff8c38c67ed7f7d7fbbaccd4e71 22-Nov-2014 John Reck <jreck@google.com> Merge "It's super critical to call nStart" into lmp-mr1-dev
72d6e4facb1abd81809fdaddbe42f41ad885189c 21-Nov-2014 John Reck <jreck@google.com> It's super critical to call nStart

Bug: 18204974

Even if we are canceling or ending an animation
nStart() *must* be called, otherwise the native-side listener
is not attached (lazy-attached for JNI cyclic reference reasons),
and then Animator::callOnFinishedListener() no-ops as there's
no listener set

Add a lifecycle verifier to ensure that nStart is always
called on animators that are attached and get finished

Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
ndroid_view_RenderNodeAnimator.cpp
90102e10093f7bb658fb7dd6c30a1efd5380c6d1 21-Nov-2014 Chris Craik <ccraik@google.com> am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev

* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b':
Revert "Add a way to override Xfermode DO NOT MERGE"
6bcf223bf64cd4895e3fe948080475075ff7b80d 21-Nov-2014 Chris Craik <ccraik@google.com> Merge "Revert "Add a way to override Xfermode""
29dc496a42d49a37dcd99c0465f3cec18a47e6ff 21-Nov-2014 Chris Craik <ccraik@google.com> Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
da3198a550bdd91ccdc8a09c3a6e00d3b61c0c20 21-Nov-2014 Chris Craik <ccraik@google.com> Revert "Add a way to override Xfermode"

Feature no longer needed.

bug:18448377

This reverts commit c495e611b9fa1fc6b47a647c714bbbf94dd63461.

Change-Id: Ia3e37f06953ffd81ca3fac367ee790d26b1b5d29
ndroid_view_GLES20Canvas.cpp
69e65019b0a6204f0ed9487d8fd7b3564eba6df8 21-Nov-2014 Chris Craik <ccraik@google.com> Revert "Add a way to override Xfermode DO NOT MERGE"

Feature no longer needed.

bug:18448377

This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
ndroid_view_GLES20Canvas.cpp
158b6c98508f111de041853cab1d7a87b771b651 21-Nov-2014 Andreas Gampe <agampe@google.com> resolve merge conflicts of 7d13d9d to master.

Change-Id: I4d8a7ec4a25471565859050939ec05b0c1261627
9ebffb40d80cb6eb1c3bcd51007a3b68f32e4ba7 21-Nov-2014 Chih-hung Hsieh <chh@google.com> Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"

Should be unnecessary after c/115476.
This reverts commit ba823cee8bafff98640408a777fe105a72fcea0d.

Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
ndroid/graphics/GraphicsJNI.h
7d13d9db1ef90063cb542ccd6554042a6a3263b7 21-Nov-2014 Andreas Gampe <agampe@google.com> resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp

Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
f17c1d7db19a92b421b12eea480d014f5a901026 21-Nov-2014 Andreas Gampe <agampe@google.com> am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header"
automerge: 55dbf00

* commit '55dbf00fd8f3931c41b580c7a6b78bf6c2a64de3':
Frameworks/base: Remove unused header
2c596a533488320444e28bbe37b7032589a0c5dd 21-Nov-2014 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Consistency in core/jni"
ed6b9dff563c5e22f040ff37e12c0d771e0478ae 21-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Consistency in core/jni

Make consistent use of core_jni_helpers for registration.

Translate some #ifdefs into const bools.

Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
ndroid.mk
ndroid/graphics/AutoDecodeCancel.h
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapFactory.h
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/CanvasProperty.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.h
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/FontFamily.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/HarfBuzzNGFaceSkia.cpp
ndroid/graphics/HarfBuzzNGFaceSkia.h
ndroid/graphics/Interpolator.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Matrix.h
ndroid/graphics/MinikinSkia.h
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/NinePatchPeeker.h
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/PathMeasure.cpp
ndroid/graphics/Picture.h
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Region.h
ndroid/graphics/RtlProperties.h
ndroid/graphics/Shader.cpp
ndroid/graphics/SurfaceTexture.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.h
ndroid/graphics/Utils.h
ndroid/graphics/Xfermode.cpp
ndroid/graphics/YuvToJpegEncoder.cpp
ndroid/graphics/YuvToJpegEncoder.h
ndroid/graphics/pdf/PdfDocument.cpp
ndroid/graphics/pdf/PdfEditor.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
ndroid/opengl/util.cpp
ndroid_animation_PropertyValuesHolder.cpp
ndroid_app_NativeActivity.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_FileBackupHelperBase.cpp
ndroid_database_SQLiteGlobal.cpp
ndroid_ddm_DdmHandleNativeHeap.cpp
ndroid_graphics_Canvas.cpp
ndroid_graphics_Picture.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_SerialPort.cpp
ndroid_hardware_SoundTrigger.cpp
ndroid_hardware_UsbDevice.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_hardware_UsbRequest.cpp
ndroid_hardware_camera2_CameraMetadata.cpp
ndroid_hardware_camera2_DngCreator.cpp
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
ndroid_hardware_camera2_legacy_PerfMeasurement.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_RemoteDisplay.cpp
ndroid_media_ToneGenerator.cpp
ndroid_net_TrafficStats.cpp
ndroid_nio_utils.h
ndroid_os_MemoryFile.cpp
ndroid_os_SELinux.cpp
ndroid_os_SystemClock.cpp
ndroid_os_SystemProperties.cpp
ndroid_os_UEventObserver.cpp
ndroid_server_Watchdog.cpp
ndroid_text_AndroidBidi.cpp
ndroid_text_AndroidCharacter.cpp
ndroid_text_StaticLayout.cpp
ndroid_util_Binder.cpp
ndroid_util_EventLog.cpp
ndroid_util_FileObserver.cpp
ndroid_util_Log.cpp
ndroid_util_Process.cpp
ndroid_util_StringBlock.cpp
ndroid_util_XmlBlock.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputEventSender.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_ThreadedRenderer.cpp
om_android_internal_content_NativeLibraryHelper.cpp
om_android_internal_net_NetworkStatsFactory.cpp
om_android_internal_os_Zygote.cpp
om_android_internal_os_ZygoteInit.cpp
om_android_internal_util_VirtualRefBasePtr.cpp
om_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp
55dbf00fd8f3931c41b580c7a6b78bf6c2a64de3 21-Nov-2014 Andreas Gampe <agampe@google.com> am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header"

* commit '0da1cbaaabbe85e140dabf3fa2b289431c9d3910':
Frameworks/base: Remove unused header
e042791e753d35d7fd60f0a9a2b5764dc8d9afac 21-Nov-2014 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Remove unused header"
c1b5483a60fab3e1eb06ffdede31217a1127a734 21-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Remove unused header

android_nfc.h is used nowhere.

Change-Id: I3009b3eb122674d3fe7ddb201bac18368b78bc02
ndroid_nfc.h
4bac6e11aef61e508303711f034e81e224b31699 21-Nov-2014 Dan Albert <danalbert@google.com> am 3a091b79: resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

* commit '3a091b79978caa9b5d58ae19f693279e5a717c2a':
Fix clang warnings in core/jni.
3a091b79978caa9b5d58ae19f693279e5a717c2a 21-Nov-2014 Dan Albert <danalbert@google.com> resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

Change-Id: I068d2a0fb118d4e2b4c1e546bebfcbc2cb120d36
47249598cbada478d7e0b8dca200599c50ea6e69 21-Nov-2014 Dan Albert <danalbert@google.com> am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."

* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
Add appropriate casts for char16_t.
582bdf9a5961a32de27556832e23e0611c4d1cbb 21-Nov-2014 Dan Albert <danalbert@google.com> am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."

* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
Add appropriate casts for char16_t.
8e357bf54173c3f83584c10983392f0d87e0b2b3 20-Nov-2014 Dan Albert <danalbert@google.com> Merge "Fix clang warnings in core/jni."
9f7fbcc3a5b0d7b6c4a09d06be192508b20c676b 20-Nov-2014 Eric Laurent <elaurent@google.com> am 112437d9: am a582bd4b: Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev automerge: 4624080

* commit '112437d9d65722ecdf83238a8736543e5dfe484d':
AudioSystem JNI: fix AudioPortConfig mask usage
112437d9d65722ecdf83238a8736543e5dfe484d 20-Nov-2014 Eric Laurent <elaurent@google.com> am a582bd4b: Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev
automerge: 4624080

* commit '46240800f19b11bb3635a1d8c00a5c7584c0e556':
AudioSystem JNI: fix AudioPortConfig mask usage
6698749dd4d4d6513b26aa9071af290b956b68a7 20-Nov-2014 Dan Albert <danalbert@google.com> Add appropriate casts for char16_t.

C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
ndroid_hardware_Camera.cpp
ndroid_media_AudioSystem.cpp
ndroid_os_Debug.cpp
ndroid_os_Parcel.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
ndroid_util_XmlBlock.cpp
ndroid_view_KeyCharacterMap.cpp
46d8444631b4b1253a76bfcc78a29d26014d022f 19-Nov-2014 Dan Albert <danalbert@google.com> Fix clang warnings in core/jni.

There are a few bugs in here too (mostly people expecting + to
concatenate C strings) :(

Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/pdf/PdfEditor.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
ndroid/opengl/util.cpp
ndroid_ddm_DdmHandleNativeHeap.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_camera2_CameraMetadata.cpp
ndroid_hardware_camera2_DngCreator.cpp
ndroid_media_AudioSystem.cpp
ndroid_nio_utils.h
ndroid_os_Trace.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Binder.cpp
ndroid_view_DisplayEventReceiver.cpp
om_android_internal_os_Zygote.cpp
a582bd4b42e6bd52cb611bd551d0b60ba1ed664f 20-Nov-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev
96555a00f85dd620ab2e0fd04e733cc60fcd3a12 19-Nov-2014 Mathieu Chartier <mathieuc@google.com> am 8415672e: am 1073f202: am 36c7f4b6: Merge "Add zygote space to Dalvik Heap"

* commit '8415672e18cc6666d040435105fc7566ca525af4':
Add zygote space to Dalvik Heap
8415672e18cc6666d040435105fc7566ca525af4 19-Nov-2014 Mathieu Chartier <mathieuc@google.com> am 1073f202: am 36c7f4b6: Merge "Add zygote space to Dalvik Heap"

* commit '1073f2023efcc6cbd099358677d3e87ee996486d':
Add zygote space to Dalvik Heap
99f628286f42d235f753d6d50bb1bf2a3196341f 19-Nov-2014 Mathieu Chartier <mathieuc@google.com> Add zygote space to Dalvik Heap

Broken by
https://android-review.googlesource.com/#/c/115446/

This change fixes it by correctly putting the zygote in Dalvik Heap
instead of Dalvik Other.

Bug: 18447855

(cherry picked from commit 7fc9176c8a2102fb5be3668404bd15feb6878c89)

Change-Id: I9293e5d3f55ccfb2c93c6aacbf6abc164eacb10b
ndroid_os_Debug.cpp
7fc9176c8a2102fb5be3668404bd15feb6878c89 19-Nov-2014 Mathieu Chartier <mathieuc@google.com> Add zygote space to Dalvik Heap

Broken by
https://googleplex-android-review.git.corp.google.com/#/c/590612/

This change fixes it by correctly putting the zygote in Dalvik Heap
instead of Dalvik Other.

Bug: 18447855

Change-Id: I4a58480f1ef1eb17e760245d8690ce92e28ebea3
ndroid_os_Debug.cpp
6368a7df1884031b6620493e096abe8510c05e24 19-Nov-2014 Eric Laurent <elaurent@google.com> AudioSystem JNI: fix AudioPortConfig mask usage

Bug: 18444838.
Change-Id: I9151538399001c719b9e0681c00d47a26928896c
ndroid_media_AudioSystem.cpp
10e4a45f691e6b60278fc772dedfe7646e615d0e 19-Nov-2014 Andreas Gampe <agampe@google.com> am 387116f5: am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni"

* commit '387116f557c3d3ecf7bd82e1d9dd1910ca4c4a3d':
Frameworks/base: Replace LOG_FATAL_IF in core/jni
387116f557c3d3ecf7bd82e1d9dd1910ca4c4a3d 19-Nov-2014 Andreas Gampe <agampe@google.com> am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni"

* commit 'c3507d1098a444176a7270cba7e5299af7f77350':
Frameworks/base: Replace LOG_FATAL_IF in core/jni
c3507d1098a444176a7270cba7e5299af7f77350 19-Nov-2014 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni"
e0fd617dba669e867a6738ce249eac976acd5471 19-Nov-2014 Chih-hung Hsieh <chh@google.com> am b380d7ee: am b1e4e89b: Merge "Fix incorrect usage of bool"

* commit 'b380d7eeee2ea73bcd2bfdf0b0b3339ab93ff75c':
Fix incorrect usage of bool
b380d7eeee2ea73bcd2bfdf0b0b3339ab93ff75c 19-Nov-2014 Chih-hung Hsieh <chh@google.com> am b1e4e89b: Merge "Fix incorrect usage of bool"

* commit 'b1e4e89b86ee12335fa1398a6b2bc0a0604599de':
Fix incorrect usage of bool
b1e4e89b86ee12335fa1398a6b2bc0a0604599de 19-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Fix incorrect usage of bool"
987f79f60bb1f0a4bcd3ef22e57301c743f0b94f 19-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Replace LOG_FATAL_IF in core/jni

Do not use LOG_FATAL_IF in JNI setup. This is one-time on startup
and important enough to always check.

Add a header with common helper definitions. Move to inlined functions
instead of macros to clean up the code.

Change-Id: Ib12d0eed61b110c45d748e80ec36c563e9dec7e5
ndroid_app_NativeActivity.cpp
ndroid_app_backup_FullBackup.cpp
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupHelperDispatcher.cpp
ndroid_content_res_Configuration.cpp
ndroid_content_res_ObbScanner.cpp
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteConnection.cpp
ndroid_database_SQLiteDebug.cpp
ndroid_hardware_SensorManager.cpp
ndroid_net_NetUtils.cpp
ndroid_nio_utils.cpp
ndroid_os_MessageQueue.cpp
ndroid_os_Parcel.cpp
ndroid_os_Trace.cpp
ndroid_server_FingerprintManager.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Binder.cpp
ndroid_view_DisplayEventReceiver.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_InputChannel.cpp
ndroid_view_InputDevice.cpp
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputEventSender.cpp
ndroid_view_InputQueue.cpp
ndroid_view_KeyCharacterMap.cpp
ndroid_view_KeyEvent.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_PointerIcon.cpp
ndroid_view_RenderNode.cpp
ndroid_view_RenderNodeAnimator.cpp
ndroid_view_TextureView.cpp
ndroid_view_VelocityTracker.cpp
ore_jni_helpers.h
08cbcbb461779ee34cd1f404f4fb2d6e504277ba 19-Nov-2014 Andreas Gampe <agampe@google.com> am 2e706eb5: am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev

* commit '2e706eb5b7154044d1a22ed03738bba16867f745':
Frameworks/base: Compiled-classes support
04b81ac040895fcf95824ed7c133859baa665ddb 19-Nov-2014 Andreas Gampe <agampe@google.com> am 01dbe739: am 8462913d: Merge "Frameworks/base: Ignore unknown pragmas in core/jni"

* commit '01dbe7397642836107c2189e36e7387e354081fd':
Frameworks/base: Ignore unknown pragmas in core/jni
2e706eb5b7154044d1a22ed03738bba16867f745 18-Nov-2014 Andreas Gampe <agampe@google.com> am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev

* commit 'f1c84568bc48d51ace404452c9e18250c4d36de4':
Frameworks/base: Compiled-classes support
12c172a8015027caae4265ac9bd86cf907723a5b 18-Nov-2014 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Compiled-classes support"
01dbe7397642836107c2189e36e7387e354081fd 18-Nov-2014 Andreas Gampe <agampe@google.com> am 8462913d: Merge "Frameworks/base: Ignore unknown pragmas in core/jni"

* commit '8462913d0c19973901a861749b4abbaacdf4b477':
Frameworks/base: Ignore unknown pragmas in core/jni
f59fb28cb818d0618ca0c83e80eba12e6ca081ef 18-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Compiled-classes support

Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571

(cherry picked from commit ca775941f3b7981aabf3a6a3b84d6c94f4f76aff)

Change-Id: I2510316381f2661166af24d7e14b013f4e045556
ndroidRuntime.cpp
8462913d0c19973901a861749b4abbaacdf4b477 18-Nov-2014 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Ignore unknown pragmas in core/jni"
26109fd328aec626dde78366d961c34600fc7b15 18-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Ignore unknown pragmas in core/jni

Preparation for a switch to Clang.

Change-Id: Iabe1d79474a617bec66dd4bf58002b1a372f6d23
ndroid.mk
b8089abb99a912a2a41c51d795938afd95a43bcb 18-Nov-2014 Chih-hung Hsieh <chh@google.com> am d7266264: am 56090472: Merge "Use standard initializers"

* commit 'd72662649e9a9b8ef51119fae58a17ab3deeb554':
Use standard initializers
ca775941f3b7981aabf3a6a3b84d6c94f4f76aff 18-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Compiled-classes support

Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571
Change-Id: I2510316381f2661166af24d7e14b013f4e045556
ndroidRuntime.cpp
d72662649e9a9b8ef51119fae58a17ab3deeb554 18-Nov-2014 Chih-hung Hsieh <chh@google.com> am 56090472: Merge "Use standard initializers"

* commit '56090472230dc56acc203589f3efcb65579fb54d':
Use standard initializers
56090472230dc56acc203589f3efcb65579fb54d 18-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Use standard initializers"
452efb218eb9af6ab2763879645bfc92db8ba02a 17-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Use standard initializers

Use standard initializers rather than GNU extension initializers to
prevent clang from spewing warnings about nonstandard code.

BUG: 18193625

Change-Id: I19bf7fe9c401534af82d5a08e68fbd486bec8351
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
af71ab2c7ffed15fa7cd3f6dbd9306697075f6d1 18-Nov-2014 Chih-hung Hsieh <chh@google.com> am 804e2937: am 1615731d: Merge "Fix check for PROC_QUOTES mode"

* commit '804e2937e16943609c46ca3fe0cdbefab29f4210':
Fix check for PROC_QUOTES mode
804e2937e16943609c46ca3fe0cdbefab29f4210 17-Nov-2014 Chih-hung Hsieh <chh@google.com> am 1615731d: Merge "Fix check for PROC_QUOTES mode"

* commit '1615731d18b042d4c69dad3169166cce7a2a9fcf':
Fix check for PROC_QUOTES mode
1615731d18b042d4c69dad3169166cce7a2a9fcf 17-Nov-2014 Chih-hung Hsieh <chh@google.com> Merge "Fix check for PROC_QUOTES mode"
3b1e22e2898e27fe486ac4137692e0f20166e13e 17-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix check for PROC_QUOTES mode

Since != has priority over &, the "if ((mode&PROC_QUOTES != 0))" check
is the same as "if (mode & (PROC_QUOTES!=0))" - not what the code
intends.

Change-Id: I14840a887f26c28f2bd0aee8704c79cf353164ad
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ndroid_util_Process.cpp
92ddfcfff5cec32456e2d1e0d96671f1eb0e2986 17-Nov-2014 Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Fix incorrect usage of bool

A bool can't be < 0

Change-Id: Ie94ffadcb38c95214d1105c02610e59b4b2872b2
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ndroid/graphics/pdf/PdfEditor.cpp
d97237071d503e2ca7104237b996edaa369b6f6d 17-Nov-2014 Adam Lesinski <adamlesinski@google.com> am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmerge

* commit '11bdd5b10b5f921b657283fa94463263171218d5':
Implement back-tracking when searching for attributes in XML or resource bag
11bdd5b10b5f921b657283fa94463263171218d5 17-Nov-2014 Adam Lesinski <adamlesinski@google.com> Merge commit '06d8b7b8' into manualmerge

Conflicts:
core/jni/android_util_AssetManager.cpp

Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca
cd6f00c3a05717862a88b7409d11176ae53fd9a9 17-Nov-2014 Adam Lesinski <adamlesinski@google.com> Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev
753eda5b39882716a3eafc2162cedd89051ea06a 17-Nov-2014 Ying Wang <wangying@android.com> Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes"
41505b56e019b53a80340fee752c395f4626829b 17-Nov-2014 Ying Wang <wangying@google.com> am e77a9066: am bb637938: am 7f5fbe9e: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev

* commit 'e77a906653739c5d0b67bbffa5566956fddd8cc9':
Frameworks/base: AndroidRuntime standalone preloaded-classes
e77a906653739c5d0b67bbffa5566956fddd8cc9 17-Nov-2014 Ying Wang <wangying@google.com> am bb637938: am 7f5fbe9e: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev

* commit 'bb637938d476e7927d2eed53255a3be7f5dd2d19':
Frameworks/base: AndroidRuntime standalone preloaded-classes
65ff8ee1344d5bd2a9f068348992c3b9c8496d31 15-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: AndroidRuntime standalone preloaded-classes

Change AndroidRuntime::startVM to give the new standalone
preloaded-classes file to the runtime for compilation of images.

Bug: 18305157

(cherry picked from commit 995c62d6abd4b7080e52a60d1bffa32ae4a798a3)

Change-Id: I32a13357893222b25fbce60bf2367c23fb36ab22
ndroidRuntime.cpp
e726680652ecd235496afeb3207b463e0aa83955 17-Nov-2014 Marco Nelissen <marcone@google.com> am 52e2b6f7: Merge "Update calls to IInterface::asBinder()"

* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
Update calls to IInterface::asBinder()
7f5fbe9e11e432a986387cdd72af9afaad8e7fd3 17-Nov-2014 Ying Wang <wangying@google.com> Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev
97069dd4fd5454ba057ccf2854d7f925c337884c 14-Nov-2014 Marco Nelissen <marcone@google.com> Update calls to IInterface::asBinder()

to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
ndroid_view_Surface.cpp
17762bb9c78cb24551ecd31e9a0f79a5af787718 17-Nov-2014 John Reck <jreck@google.com> am 64b5e00a: am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev

* commit '64b5e00aaa53dbca59e8b997184bf479f68915eb':
Wire up surface width/height to lockHardwareCanvas
64b5e00aaa53dbca59e8b997184bf479f68915eb 17-Nov-2014 John Reck <jreck@google.com> am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev

* commit 'ff5978988abceeb0f2c8324a9ab66b7c958edd34':
Wire up surface width/height to lockHardwareCanvas
b3ec64e1005c82d41b6d1a1d86b6933fd25d87d2 17-Nov-2014 John Reck <jreck@google.com> Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
995c62d6abd4b7080e52a60d1bffa32ae4a798a3 15-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: AndroidRuntime standalone preloaded-classes

Change AndroidRuntime::startVM to give the new standalone
preloaded-classes file to the runtime for compilation of images.

Bug: 18305157
Change-Id: I32a13357893222b25fbce60bf2367c23fb36ab22
ndroidRuntime.cpp
dce97407dcf54ae9725c2d29224f6ed8dfd994b8 14-Nov-2014 Marco Nelissen <marcone@google.com> Update calls to IInterface::asBinder()

to use the new static version.

Change-Id: I88ee037c66aa254f466d3a51ddc358bd37cf44b5
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
ndroid_view_Surface.cpp
bfd5760da283c72abc47429552ddc9cac1f7acd8 14-Nov-2014 Nick Kralevich <nnk@google.com> Merge "Fix build"
4a109798bf656b7616a69533ea3183f9da9aff72 14-Nov-2014 Eric Laurent <elaurent@google.com> am 8c8b9195: am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev automerge: 5ff6057

* commit '8c8b9195643d33faff186dea535b18af0ee93e09':
AudioRecorder read buffer overflow
660538f82af9b5f6b7efc2de175a0540e9bb98c5 14-Nov-2014 Nick Kralevich <nnk@google.com> Fix build

frameworks/base/core/jni/android_text_StaticLayout.cpp:358:43: error: overflow in implicit constant conversion [-Werror=overflow]
firstTabIndex = SIZE_MAX;
^
frameworks/base/core/jni/android_text_StaticLayout.cpp:367:43: error: overflow in implicit constant conversion [-Werror=overflow]
firstTabIndex = SIZE_MAX;
^
frameworks/base/core/jni/android_text_StaticLayout.cpp:391:39: error: overflow in implicit constant conversion [-Werror=overflow]
firstTabIndex = SIZE_MAX;
^
cc1plus: all warnings being treated as errors
make: *** [out/target/product/generic_arm64/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_text_StaticLayout.o] Error 1

Change-Id: I2364f697588c8657ba5f2d15cf1d60a174655613
ndroid_text_StaticLayout.cpp
8c8b9195643d33faff186dea535b18af0ee93e09 14-Nov-2014 Eric Laurent <elaurent@google.com> am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev
automerge: 5ff6057

* commit '5ff6057bd32737c808f978eae6c100ffa24148d1':
AudioRecorder read buffer overflow
cf670bc71423f3690a3776e012e03f04d1cad198 14-Nov-2014 Nick Kralevich <nnk@google.com> fix build

frameworks/base/core/jni/android_text_StaticLayout.cpp: In member function 'int android::OptimizingLineBreaker::desperateBreak(int, int, float, float*, float*, bool*) const':
frameworks/base/core/jni/android_text_StaticLayout.cpp:263:19: error: variable 'breakWidth' set but not used [-Werror=unused-but-set-variable]
float breakWidth, breakPrintedWidth;
^
frameworks/base/core/jni/android_text_StaticLayout.cpp:263:31: error: variable 'breakPrintedWidth' set but not used [-Werror=unused-but-set-variable]
float breakWidth, breakPrintedWidth;
^
frameworks/base/core/jni/android_text_StaticLayout.cpp: In function 'jint android::nComputeLineBreaks(JNIEnv*, jclass, jstring, jcharArray, jfloatArray, jint, jfloat, jint, jfloat, jintArray, jint, jboolean, jobject, jintArray, jfloatArray, jbooleanArray, jint)':
frameworks/base/core/jni/android_text_StaticLayout.cpp:539:15: error: unused variable 'ret' [-Werror=unused-variable]
jintArray ret;
^
cc1plus: all warnings being treated as errors
make: *** [out/target/product/hammerhead/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_text_StaticLayout.o] Error 1
make: *** Waiting for unfinished jobs....

Change-Id: Id2b4c35bd1bc6747cc3d5cf94e3857d9118f5c21
ndroid_text_StaticLayout.cpp
6d6f04900874c1478257097a0d7f16b43752e179 14-Nov-2014 Andreas Gampe <agampe@google.com> am e64565e0: Merge "Frameworks/base: Mask pdfium warning" into lmp-mr1-dev-plus-aosp

* commit 'e64565e0a503397f0d59fed0e6aaef23807782b4':
Frameworks/base: Mask pdfium warning
ed5d5fb434eb2169f14d06649336f211117e2bee 14-Nov-2014 Andreas Gampe <agampe@google.com> am 035a7b02: am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni"

* commit '035a7b0235835e856f39623fc571668e2d6048da':
Frameworks/base: Wall Werror in core/jni
362c4ba02ae589c4a83f902e496cc7f61ad5858c 14-Nov-2014 Andreas Gampe <agampe@google.com> am f8eac973: am f0044947: Merge "Frameworks/base: New GL bindings"

* commit 'f8eac973afec3f2390277ff8c0bcb447addad18f':
Frameworks/base: New GL bindings
b35c9602cf5c628c621e4fe102a461505f302bfe 14-Nov-2014 John Reck <jreck@google.com> Wire up surface width/height to lockHardwareCanvas

Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
ndroid_view_Surface.cpp
f4e341d99c4c29cb6cc7380829a316cf4847f3df 14-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Mask pdfium warning

Mask out warnings from external/.

Change-Id: I371e1346925c7eb5cdc9c4dcffab41ff0c6ddd63
ndroid/graphics/pdf/PdfEditor.cpp
035a7b0235835e856f39623fc571668e2d6048da 14-Nov-2014 Andreas Gampe <agampe@google.com> am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni"

* commit '0626ec58243c9dc7f4812a453ef9456b1f7ff1f4':
Frameworks/base: Wall Werror in core/jni
0f0b4919667f418b249c497f5ad3e83fdf4437e5 12-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Wall Werror in core/jni

Turn on -Wall -Werror in core/jni. Fix warnings.

Clang TODO: For GCC we need to turn off Wunused-but-set-variable in
the GL bindings. However, Clang doesn't have that warning and thus
complains about an unknown pragma. It is necessary to make the
pragma #ifdef-ed on the compiler being GCC.

Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
ndroid/opengl/poly_clip.cpp
ndroid/opengl/util.cpp
ndroid_app_backup_FullBackup.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_database_SQLiteConnection.cpp
ndroid_emoji_EmojiFactory.cpp
ndroid_graphics_Canvas.cpp
ndroid_hardware_camera2_CameraMetadata.cpp
ndroid_hardware_camera2_DngCreator.cpp
ndroid_hardware_location_ActivityRecognitionHardware.cpp
ndroid_media_AudioSystem.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_nio_utils.cpp
ndroid_os_Debug.cpp
ndroid_os_MessageQueue.cpp
ndroid_os_Parcel.cpp
ndroid_os_Trace.cpp
ndroid_server_FingerprintManager.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
ndroid_view_DisplayEventReceiver.cpp
ndroid_view_InputChannel.cpp
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputEventSender.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_RenderNodeAnimator.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_VelocityTracker.cpp
om_android_internal_content_NativeLibraryHelper.cpp
om_android_internal_net_NetworkStatsFactory.cpp
283a9d9e15e095493a7d9800667e49169143e7e3 13-Nov-2014 Jon Eklund <jeklund@motorola.com> AudioRecorder read buffer overflow

Since function was changed from byte-native to short-native,
it's no longer necessary to multiply offset by sizeof(short).

Bug 18367580

Change-Id: I669d860334ba40e46c04e534d7008b9e2401d8cd
ndroid_media_AudioRecord.cpp
f8eac973afec3f2390277ff8c0bcb447addad18f 13-Nov-2014 Andreas Gampe <agampe@google.com> am f0044947: Merge "Frameworks/base: New GL bindings"

* commit 'f0044947a7199278d529c9b0b53cde089851ce23':
Frameworks/base: New GL bindings
95e5a82e1d3743778218fb7b94389f8a5622809a 13-Nov-2014 Rob Tsuk <robtsuk@google.com> Merge "Add a way to override Xfermode"
ebb526e976a576ea5a13c61fe34a3d533e367d8e 13-Nov-2014 Dianne Hackborn <hackbod@google.com> am 7437ec8e: am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count.

* commit '7437ec8e1d01de948b1baf33c1f3f73f263a40c7':
Add reporting of Parcel memory/count.
4a0e59dbd467eb01b5248106376805c82de0bb45 13-Nov-2014 Eric Laurent <elaurent@google.com> am 33fc2370: am ac598888: Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev automerge: edd4a22

* commit '33fc23701a081c2086fc5435e7913f775caabdfc':
audiosystem JNI: check env pointer before use.
c495e611b9fa1fc6b47a647c714bbbf94dd63461 12-Nov-2014 Rob Tsuk <robtsuk@google.com> Add a way to override Xfermode

Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Bug: 18226391
Change-Id: I6f8fb8938505e976892c4e14f6f864362c43e73c
ndroid_view_GLES20Canvas.cpp
7437ec8e1d01de948b1baf33c1f3f73f263a40c7 13-Nov-2014 Dianne Hackborn <hackbod@google.com> am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count.

* commit 'caf3cddd5bff11a20e72e7df54b826e33d2fe6a9':
Add reporting of Parcel memory/count.
6552afa87833a36b37c715acd40e494fe4de2019 13-Nov-2014 Rob Tsuk <robtsuk@google.com> am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev

* commit 'ccc956b2b4602dca28f7c79d1155df29bcc0d696':
Add a way to override Xfermode DO NOT MERGE
33fc23701a081c2086fc5435e7913f775caabdfc 13-Nov-2014 Eric Laurent <elaurent@google.com> am ac598888: Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev automerge: edd4a22

* commit 'ac598888e3efbb6fda910ac8bef3bc92811309ba':
audiosystem JNI: check env pointer before use.
bfe6333c3cf529600f41f14e3b8c5846e632c9a2 12-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: New GL bindings

Generated new bindings after glgen update.

Change-Id: I96f2e3eee99f1e12ad84aa10e8f7826a905e909c
ndroid_opengl_EGL14.cpp
ndroid_opengl_EGLExt.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
ndroid_opengl_GLES30.cpp
ndroid_opengl_GLES31.cpp
ndroid_opengl_GLES31Ext.cpp
om_google_android_gles_jni_GLImpl.cpp
fabb70b2efbd125f74923d19ab12bc8e1371ed1f 11-Nov-2014 Dianne Hackborn <hackbod@google.com> Add reporting of Parcel memory/count.

Also fix issue #18340771: Dumpsys Procstats missing a newline

Change-Id: I0c612187a3fb4d7eeafbf97d373efdef732c477e
ndroid_os_Parcel.cpp
41a8043b30a289bdba55a2469e598b3fe67c3bf1 12-Nov-2014 Rob Tsuk <robtsuk@google.com> Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev
45670c1dc55c3d853c03a252623428aeffa731e7 12-Nov-2014 Dan Albert <danalbert@google.com> am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
Move frameworks/base over to libc++.
b28ff487fb6db4a44e4d18aa17d8253f00a63bb6 12-Nov-2014 Dan Albert <danalbert@google.com> resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
4678dcc5524258908eadc5fe1e5e1874768967eb 12-Nov-2014 Rob Tsuk <robtsuk@google.com> Add a way to override Xfermode DO NOT MERGE

Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
ndroid_view_GLES20Canvas.cpp
edd4a227e5f49b859f16105a100568fcef4927a3 12-Nov-2014 Eric Laurent <elaurent@google.com> Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev
ff1d8a6635fb6441615778a47e2881129574a5b1 12-Nov-2014 Dan Albert <danalbert@google.com> Move frameworks/base over to libc++.

Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
ndroid.mk
449c5887101047d187a55217ced6d8a5c98fb367 12-Nov-2014 Eric Laurent <elaurent@google.com> audiosystem JNI: check env pointer before use.

Bug: 18332935.
Change-Id: I1ec820f0282833e13444ec05d50da3ce70d19d8d
ndroid_media_AudioSystem.cpp
9592b0136aadd8d2dbe140f743f4230b5a6542ae 11-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Right transform in DngCreator

Use the right calibrationTransform.

Change-Id: Ibc633ff1e02d1e48a27ae2a72585d3de2222a2c1
ndroid_hardware_camera2_DngCreator.cpp
46c84d87e7894cd675c2e81eb7090738ed127de1 12-Nov-2014 Elliott Hughes <enh@google.com> am 5b6683c0: am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder"

* commit '5b6683c04a56548dbc041dda0a66a2b67444f634':
Prevent resource leak in YuvToJpegEncoder
5dcc254210d451447508d6730aed2f0eb3b02655 12-Nov-2014 Andreas Gampe <agampe@google.com> am 6f4c0f8e: am bc0b57f3: Merge "Frameworks/base: Right transform in DngCreator"

* commit '6f4c0f8e9f07dc67cd72f9613cb6d72b9edb7f86':
Frameworks/base: Right transform in DngCreator
253194ab1ff096024f531d2e1dda43f70d24bbac 12-Nov-2014 Andreas Gampe <agampe@google.com> am dbf16c6f: am db387066: Merge "Frameworks/base: Fix FingerprintManager JNI"

* commit 'dbf16c6fa0d1ab4e8bc8f3ca61ae4b0ce5d38a8f':
Frameworks/base: Fix FingerprintManager JNI
5b6683c04a56548dbc041dda0a66a2b67444f634 12-Nov-2014 Elliott Hughes <enh@google.com> am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder"

* commit '34acb4c8d4abe1c4f580b85ddc84b18b7e38e417':
Prevent resource leak in YuvToJpegEncoder
6f4c0f8e9f07dc67cd72f9613cb6d72b9edb7f86 12-Nov-2014 Andreas Gampe <agampe@google.com> am bc0b57f3: Merge "Frameworks/base: Right transform in DngCreator"

* commit 'bc0b57f3366420d7a634d5ef2bc6d9acaf55e7bf':
Frameworks/base: Right transform in DngCreator
dbf16c6fa0d1ab4e8bc8f3ca61ae4b0ce5d38a8f 12-Nov-2014 Andreas Gampe <agampe@google.com> am db387066: Merge "Frameworks/base: Fix FingerprintManager JNI"

* commit 'db387066037bc6892331a5c7ea52a85d416acdaa':
Frameworks/base: Fix FingerprintManager JNI
34acb4c8d4abe1c4f580b85ddc84b18b7e38e417 12-Nov-2014 Elliott Hughes <enh@google.com> Merge "Prevent resource leak in YuvToJpegEncoder"
bc0b57f3366420d7a634d5ef2bc6d9acaf55e7bf 12-Nov-2014 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Right transform in DngCreator"
db387066037bc6892331a5c7ea52a85d416acdaa 12-Nov-2014 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Fix FingerprintManager JNI"
4a4a2a676679e80b15b5de27d074cd5d3773cab1 11-Nov-2014 Adam Lesinski <adamlesinski@google.com> am 044f323e: am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI"

* commit '044f323e624084de464e780828f1d7f204e4d01d':
Frameworks/base: Fix AssetManager JNI
044f323e624084de464e780828f1d7f204e4d01d 11-Nov-2014 Adam Lesinski <adamlesinski@google.com> am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI"

* commit '24c16b7e4cdbacedd33347a01ff4944abfc86218':
Frameworks/base: Fix AssetManager JNI
d865900425d9593974aac640bc4deb93865dcfbe 20-Aug-2014 Martin Wallgren <martin.wallgren@sonymobile.com> Prevent resource leak in YuvToJpegEncoder

SkWStream is never deleted before going out of scope

Change-Id: Ifdb75c18336d095b012e73b64281ec6c2fc5c3fe
ndroid/graphics/YuvToJpegEncoder.cpp
2377cd319f8a77f147f3d70a7ddc75fa9e9fe87c 11-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Right transform in DngCreator

Use the right calibrationTransform.

Change-Id: Ibc633ff1e02d1e48a27ae2a72585d3de2222a2c1
ndroid_hardware_camera2_DngCreator.cpp
7c8201b61f318845addecd158accada2c5428a95 11-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Fix FingerprintManager JNI

Register the right method.

Change-Id: I0806c2fa8f29ddef75caaf94092f72e644ae6d06
ndroid_server_FingerprintManager.cpp
328126190b053b0388ddfab778d81cc73dcff81f 11-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Fix AssetManager JNI

Register the right method.

Change-Id: Ib5f5c531b4c5863eed04fe3b13f8c2662055fa5e
ndroid_util_AssetManager.cpp
05ff23fdadc8efcedd8a39c8e61e04976b134d2c 11-Nov-2014 Andreas Gampe <agampe@google.com> am 8c48c68c: am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI"

* commit '8c48c68cc7801451d069819c4417a3a240a64294':
Frameworks/base: Mask Skia warning in GraphicsJNI
8c48c68cc7801451d069819c4417a3a240a64294 11-Nov-2014 Andreas Gampe <agampe@google.com> am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI"

* commit '71f83672f297b116988defbe989869e5744cda5e':
Frameworks/base: Mask Skia warning in GraphicsJNI
ba823cee8bafff98640408a777fe105a72fcea0d 11-Nov-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Mask Skia warning in GraphicsJNI

Do not allow unused-parameter warnings from Skia includes.

Change-Id: Icc765cb0eaf10cd566a64892fbfe7380143ccb42
ndroid/graphics/GraphicsJNI.h
1e488bfb1e97741fc4681cb96817e87a031debc6 11-Nov-2014 Yabin Cui <yabinc@google.com> am e7a89f5f: am a3131862: Merge "kill HAVE_INOTIFY"

* commit 'e7a89f5fa76c58c595d9d9660d7111125e9a492d':
kill HAVE_INOTIFY
e7a89f5fa76c58c595d9d9660d7111125e9a492d 11-Nov-2014 Yabin Cui <yabinc@google.com> am a3131862: Merge "kill HAVE_INOTIFY"

* commit 'a31318620bce4e00e80188ee2778b7799cbdf0dc':
kill HAVE_INOTIFY
a31318620bce4e00e80188ee2778b7799cbdf0dc 11-Nov-2014 Yabin Cui <yabinc@google.com> Merge "kill HAVE_INOTIFY"
20a9cf4fe40a7bf605681e28a5e7fca329f8624b 11-Nov-2014 Yabin Cui <yabinc@google.com> kill HAVE_INOTIFY

Bug: 18314841
Change-Id: I880a35bf51a1aecba2f111e7f6eae54c7d17a28d
ndroid_util_FileObserver.cpp
6547700237c0b17d4d86a8b87106e73d931ed340 10-Nov-2014 Yabin Cui <yabinc@google.com> am 19d4e780: am a9235301: Merge "kill HAVE_SCHED_SETSCHEDULER"

* commit '19d4e7806a217b64a0fb7da26fccb2c36baf4bc8':
kill HAVE_SCHED_SETSCHEDULER
19d4e7806a217b64a0fb7da26fccb2c36baf4bc8 10-Nov-2014 Yabin Cui <yabinc@google.com> am a9235301: Merge "kill HAVE_SCHED_SETSCHEDULER"

* commit 'a9235301ad190814c779a13479b204f01980898f':
kill HAVE_SCHED_SETSCHEDULER
a9235301ad190814c779a13479b204f01980898f 10-Nov-2014 Yabin Cui <yabinc@google.com> Merge "kill HAVE_SCHED_SETSCHEDULER"
65b4a68669227a57696e0e7ed1e4ef8da2705d9e 10-Nov-2014 Yabin Cui <yabinc@google.com> kill HAVE_SCHED_SETSCHEDULER

Bug: 18300670

Change-Id: I3033c3542e83963e72d49a639db76501d12ad581
ndroid_util_Process.cpp
c793fcb0264633308241e1c58db34af5fb0ae5ec 24-Sep-2014 Derek Sollenberger <djsollen@google.com> Fix memory leak where we close the descriptor instead of the file.

(cherry pick of 5cb769d99952ef9fb4f576abba70423fe157342b.)

bug: 17541634
Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
ndroid/graphics/BitmapFactory.cpp
ceb5bdf42a31511bb599fdeb30a16a7c0af2d911 07-Nov-2014 Dan Stoza <stoza@google.com> am 1437146a: am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev

* commit '1437146a3e63cd932a29116f032847d4585cb4cd':
Add a BufferItem parameter to onFrameAvailable
1437146a3e63cd932a29116f032847d4585cb4cd 07-Nov-2014 Dan Stoza <stoza@google.com> am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev

* commit 'bb8a87f48a9978d8faec11819d5fabbbc97cac47':
Add a BufferItem parameter to onFrameAvailable
d17793ea2a93af6ba9bc64c77502f48aa32814e4 07-Nov-2014 Dan Stoza <stoza@google.com> Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
65f2defdfc35bfa485ca00dcf18ea817329a84be 07-Nov-2014 John Reck <jreck@google.com> resolve merge conflicts of cabf8a7 to master.

Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf
cabf8a706474210f6afa13e7b288bb537351ad3d 07-Nov-2014 John Reck <jreck@google.com> am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev

* commit 'f7d3ce6a3ca88b23a227e29a5fa3285e24f7b2b1':
Fix wrong-thread issue
4b19b7aaff1d1ff972ebe68101c2107454bbe5de 07-Nov-2014 John Reck <jreck@google.com> Merge "Fix wrong-thread issue" into lmp-mr1-dev
12f5e3433226f0a2886a98b0b8da8d5e947c5cde 07-Nov-2014 John Reck <jreck@google.com> Fix wrong-thread issue

Bug: 18259560

Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
ndroid_view_GLES20Canvas.cpp
ndroid_view_HardwareLayer.cpp
30113131fb958850ef92c6a8f7f2aa2ed92a8ffe 07-Nov-2014 Mårten Kongstad <marten.kongstad@sonymobile.com> RRO: reintroduce lost ResTable insert of assets

With the recent introduction of AssetManager::appendPathToResTable,
overlay packages were not properly added to the AssetManager, and once
added, were not properly inserted into the ResTable.

Bug: 17765434
Change-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e
ndroid_util_AssetManager.cpp
088c514cb13f3b8f8683588c2f398f18df1547c9 06-Nov-2014 John Reck <jreck@google.com> resolved conflicts for merge of be70c771 to master

Change-Id: I469905bef7361c18aab725778694567d1987c06d
be70c7713df98d81e9e43af9e76e0e6d018a4339 06-Nov-2014 John Reck <jreck@google.com> am 327cb318: Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev automerge: 9c13b8c

* commit '327cb3184d5f5d9f22db9ab18a07bb71081bb446':
Yank ResourceCache out of Caches
a35778c799e8073a42b9e22191bde9d838327ab7 06-Nov-2014 John Reck <jreck@google.com> Yank ResourceCache out of Caches

Bug: 17947547

Pull the ResourceCache (aka, ref-counting side channel) out of
Caches so that DisplayListRenderer doesn't use Caches, avoiding
the risk of instantiating Caches on the wrong thread or
without a GL context

Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
ndroid/graphics/Bitmap.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Path.cpp
a7d1d73a477fe512d9ea69ee2883084630ec24c4 02-Oct-2014 Adam Lesinski <adamlesinski@google.com> Implement back-tracking when searching for attributes in XML or resource bag

Shared libraries have their package ID assigned at run-time, so some
of the guarantees we used to have about sort order of attributes in
bags or XML elements no longer hold.

This CL adds back-tracking and can jump to the nearest attribute with the
same package ID and continue searching.

This means that attributes with the same package ID must be sorted by increasing
resource ID, as was the case before.

Attributes with the same package ID must be grouped together, but the groups can
be in any order. Ex: 0x02010001, 0x02010002, 0x01010000, 0x01010010, 0x7f010032

Bug:17666947
Change-Id: I9c198bbb6ca788849aac85b6323606ea5d9550d6
ndroid_util_AssetManager.cpp
107843de4507b3511006cb9c77b8d0364374385a 08-Sep-2014 Tom Hudson <tomhudson@google.com> Remove status return from all uirenderer::Renderer functions

This moves the interface closer to android::Canvas. The only use of
return values was in the OpenGLRenderer subclass; that is replaced
with an internal dirty flag: returned from finish(), checked by
CanvasContext.

This is part of a series of CLs to refactor the Graphics JNI bindings.

BUG:15672762
R=djsollen@google.com,ccraik@google.com

Change-Id: Ifd533eb8839a254b0d3a5d04fc5a2905afdfc89e
ndroid_view_GLES20Canvas.cpp
2c34b5e8136eac0332dac294cb06a6a98eac1c14 04-Nov-2014 Dan Stoza <stoza@google.com> Add a BufferItem parameter to onFrameAvailable

Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
ndroid/graphics/SurfaceTexture.cpp
41ca02438700497e9f88e9a589c12003c15929b8 04-Nov-2014 Dianne Hackborn <hackbod@google.com> am 726715e1: am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev

* commit '726715e1138d880656a13014d447a14b3998b132':
Few more small meminfo improvements.
726715e1138d880656a13014d447a14b3998b132 04-Nov-2014 Dianne Hackborn <hackbod@google.com> am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev

* commit 'e6fa3f44652fd9e23ce64f39bb43458fa4abd60a':
Few more small meminfo improvements.
184293076201ec510898f8d505a8fe50458d9604 03-Nov-2014 Dianne Hackborn <hackbod@google.com> Few more small meminfo improvements.

- Add in category for graphics driver, and knowledge about it
for N5 (more devices will be added later).
- Renaming the labels for the .oat and .art files to be just
that, so it is clear what they are talking about.

Change-Id: I663ca8bd2febce41fcdde74b0d3a96ef9325edf1
ndroid_os_Debug.cpp
e73c6d93b9a207713ef2cf5f6b927f5e54271295 01-Nov-2014 Svet Ganov <svetoslavganov@google.com> am 28d51a39: am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev automerge: 4f5b8a6

* commit '28d51a39a1bed35855b0fe75a65ad4a6d43a4460':
Crash apps that print malformed or password protected PDFs.
28d51a39a1bed35855b0fe75a65ad4a6d43a4460 01-Nov-2014 Svet Ganov <svetoslavganov@google.com> am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
automerge: 4f5b8a6

* commit '4f5b8a6b9b1966b42c929f89e1e91827ec495719':
Crash apps that print malformed or password protected PDFs.
182f0a136fca2bff1614cee41178d2052e7dcf61 01-Nov-2014 Svet Ganov <svetoslavganov@google.com> Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
fce84f035c35606c5707e735f503f7bdcfd5b2a1 01-Nov-2014 Svet Ganov <svetoslavganov@google.com> Crash apps that print malformed or password protected PDFs.

If apps are writing malformed content (typically not a PDF file) or if the
PDF content they provide to the print system is password protected, are now
crashed as both of these are app bugs.

bug:17636435

Change-Id: Ifce6a3199e587448dd38f6a84290a965c24b698b
ndroid/graphics/pdf/PdfEditor.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
9481684560b2815d2706512086bb36467ef6acc0 01-Nov-2014 John Reck <jreck@google.com> am e05575e9: am a8d83d63: Merge "Layer changes" into lmp-mr1-dev automerge: a51fba0

* commit 'e05575e9c36850d8cfe49396ac9a1372511b12bf':
Layer changes
e05575e9c36850d8cfe49396ac9a1372511b12bf 01-Nov-2014 John Reck <jreck@google.com> am a8d83d63: Merge "Layer changes" into lmp-mr1-dev
automerge: a51fba0

* commit 'a51fba0bf037844bcb911e69e8af733e6d2cccf6':
Layer changes
a8d83d639a5687b2ab5689db4ea61e2a6cce66f4 31-Oct-2014 John Reck <jreck@google.com> Merge "Layer changes" into lmp-mr1-dev
0e89e2b7bcb2c035e8cee77f93120e7c5617f8d2 31-Oct-2014 John Reck <jreck@google.com> Layer changes

Bug: 17208461

* Switch Layer to be VirtualLightRefBase instead of
Caches' side-channel ref-counting
* Include active layers in gfxinfo dump
* Run gfxinfo dump on the correct thread
* Dump gfxinfo on Layer creation failure

Change-Id: I28d195699e2334518e215ab28c7a17355aee9678
ndroid_view_GLES20Canvas.cpp
a3b6fc48b7a768117b2235038a409aca59ae2225 31-Oct-2014 Svetoslav <svetoslavganov@google.com> am 2a6749ad: am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev automerge: 160021d

* commit '2a6749adc0d0693b97c81b6083629e13b604d45a':
Save to a PDF file should look like print preview.
2a6749adc0d0693b97c81b6083629e13b604d45a 31-Oct-2014 Svetoslav <svetoslavganov@google.com> am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev
automerge: 160021d

* commit '160021d8cf62f566587d899498c72fff82b6969f':
Save to a PDF file should look like print preview.
93134ce87e7b33e599c9ef9ed8b19ec2556ca8f1 31-Oct-2014 Svetoslav <svetoslavganov@google.com> Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev
bec22beb99b279d381f720d761ca75fe3e7414dc 25-Sep-2014 Svetoslav <svetoslavganov@google.com> Save to a PDF file should look like print preview.

When rendering a PDF file for print preview we take into account
the selected print options such as paper size, orientation, etc
without modifying the document. To print we send the doc in its
original form and the print options so the print service can apply
the necessary transforms in addition to the optional custom options
it supports. When saving to PDF we have to actually change the
document as we act as a print service.

bug:13545980

Change-Id: Icdcecf962bec6ff742cc6015df5af9d9086ce760
ndroid/graphics/pdf/PdfEditor.cpp
f2ae40739a8aa5b4a48427685a66292c930f6fa0 31-Oct-2014 Alan Viverette <alanv@google.com> am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev

* commit '9a77c8a279bfe3293295ed77c775ea29b88b2916':
Distinguish unspecified and explicit null values in resources
d51558cd2a7b1b2cb3262ba526e2ead0e30adf5d 31-Oct-2014 Eric Laurent <elaurent@google.com> am c27169e0: am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev

* commit 'c27169e0d21f10771ca541fdc965d009ca4dc240':
SoundTrigger JNI: fix local reference leak.
9a77c8a279bfe3293295ed77c775ea29b88b2916 31-Oct-2014 Alan Viverette <alanv@google.com> am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev

* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
Distinguish unspecified and explicit null values in resources
c27169e0d21f10771ca541fdc965d009ca4dc240 31-Oct-2014 Eric Laurent <elaurent@google.com> am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev

* commit '96c39e4c891b4fa296fe5d6e8d5a323ecd77d84f':
SoundTrigger JNI: fix local reference leak.
2e17445e96e898c1b9e963d7b2047d8302019aa7 31-Oct-2014 Dianne Hackborn <hackbod@google.com> am 92faa96a: am 8f53ad8e: am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev

* commit '92faa96a26728370b2e3d002a83482e7345bfd0c':
Condense AndroidRuntime init log, include uid running under.
100a33bd385e9ea4e69c1276f48f4b375179dbdb 31-Oct-2014 Calin Juravle <calin@google.com> am 37e232dc: am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev

* commit '37e232dc9cf867a81db92988f5f014ef573e3f97':
Use native brige only if we have a private data directory.
92faa96a26728370b2e3d002a83482e7345bfd0c 31-Oct-2014 Dianne Hackborn <hackbod@google.com> am 8f53ad8e: am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev

* commit '8f53ad8e7335068b4dd96db10916c3889960de5a':
Condense AndroidRuntime init log, include uid running under.
37e232dc9cf867a81db92988f5f014ef573e3f97 31-Oct-2014 Calin Juravle <calin@google.com> am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev

* commit '21c3666effbcc79737af2f80f930fa9deee1622e':
Use native brige only if we have a private data directory.
c147077480a38136aa5efd9fde3c11c4cd52c01f 31-Oct-2014 Calin Juravle <calin@google.com> am aab0c1af: resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp.

* commit 'aab0c1af12c3a7495e0aa8b266a46e5e557323ce':
PreInitializeNativeBridge only if its Available
aab0c1af12c3a7495e0aa8b266a46e5e557323ce 31-Oct-2014 Calin Juravle <calin@google.com> resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp.

Change-Id: I50095f77a43c7e116bcedb1ad7cb7b45640cf1c7
f2969405020a72e282c348a6ea201d56e9f8d4ba 30-Oct-2014 Alan Viverette <alanv@google.com> Distinguish unspecified and explicit null values in resources

BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
ndroid_util_AssetManager.cpp
c0c1255a930bf0c2104f82c05f430b34112cc1bf 30-Oct-2014 Eric Laurent <elaurent@google.com> Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev
8f89feba39be8e705c6b9f550c5af141a9e189da 29-Oct-2014 Eric Laurent <elaurent@google.com> SoundTrigger JNI: fix local reference leak.

Bug: 17935275.
Change-Id: Ibc6f22b868dda2ed1a07dc371ee00e85c99c1e53
ndroid_hardware_SoundTrigger.cpp
4e9176e6d520fd0264a2514b9aa612c8c815c46f 29-Oct-2014 Vladimir Marko <vmarko@google.com> am d9e8b73f: am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."

* commit 'd9e8b73fd03b2c1eda7c0cb195b39c6290de61ad':
Fix android_media_AudioSystem_getMasterMute return type.
d9e8b73fd03b2c1eda7c0cb195b39c6290de61ad 29-Oct-2014 Vladimir Marko <vmarko@google.com> am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."

* commit '548101cb96fbc855d4257d46841b2959fe4c9ce4':
Fix android_media_AudioSystem_getMasterMute return type.
548101cb96fbc855d4257d46841b2959fe4c9ce4 29-Oct-2014 Vladimir Marko <vmarko@google.com> am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."

* commit 'e5fe7f3f4069b176a0465617dceb630a52b710c0':
Fix android_media_AudioSystem_getMasterMute return type.
7ef463168c9ba08548858df086934b125c1ff57c 29-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev
b4b5518c81c54c749a0d82a27249b47b855c308e 29-Oct-2014 Vladimir Marko <vmarko@google.com> Fix android_media_AudioSystem_getMasterMute return type.

Caused FPU stack overflow on x86.

Bug: 18023418

(cherry picked from commit c1bcdbb75877d99972f1cd13a9c40126822621bc)

Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
ndroid_media_AudioSystem.cpp
85d6f299943017f939ecfee9708f10b4e5fddd3e 29-Oct-2014 Vladimir Marko <vmarko@google.com> Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev
be312e43ab05fc8d700ae00d557e70e02d4a4b93 29-Oct-2014 Calin Juravle <calin@google.com> am bd705e5e: am 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private data directory."

* commit 'bd705e5ed1906332a66b12b1b64acbe44da869f0':
Use native brige only if we have a private data directory.
bd705e5ed1906332a66b12b1b64acbe44da869f0 29-Oct-2014 Calin Juravle <calin@google.com> am 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private data directory."

* commit '5d5e4b14f67903370a7805492eb92fbe3b487a14':
Use native brige only if we have a private data directory.
c1bcdbb75877d99972f1cd13a9c40126822621bc 29-Oct-2014 Vladimir Marko <vmarko@google.com> Fix android_media_AudioSystem_getMasterMute return type.

Caused FPU stack overflow on x86.

Bug: 18023418
Change-Id: I0b8102cad5f5a883f615fa5dfa3017f56258a192
ndroid_media_AudioSystem.cpp
e41c4f2cbbf38f5d23247e8b473e0732e2f19e67 29-Oct-2014 Calin Juravle <calin@google.com> am 263829e0: am 5d4deb82: am f7d24d24: Merge "PreInitializeNativeBridge only if its Available"

* commit '263829e0e794f48335db2f49078c53fe10292e98':
PreInitializeNativeBridge only if its Available
263829e0e794f48335db2f49078c53fe10292e98 29-Oct-2014 Calin Juravle <calin@google.com> am 5d4deb82: am f7d24d24: Merge "PreInitializeNativeBridge only if its Available"

* commit '5d4deb8246b13531a6b2b7611c650ba504e44dc6':
PreInitializeNativeBridge only if its Available
8e5aafe57dd1f5e8ccd7ad1bf37e4487fbe8a110 28-Oct-2014 Dianne Hackborn <hackbod@google.com> Condense AndroidRuntime init log, include uid running under.

Change-Id: Ifda3001fdc25d759f07a93b8569c59da89a8bcfc
ndroidRuntime.cpp
5d5e4b14f67903370a7805492eb92fbe3b487a14 29-Oct-2014 Calin Juravle <calin@google.com> am 43a92646: Merge "Use native brige only if we have a private data directory."

* commit '43a9264619e08f464dd4f184e53441a440cca09f':
Use native brige only if we have a private data directory.
e11952ecd5f170b66f6fe9e13d927c233777d65e 28-Oct-2014 Calin Juravle <calin@google.com> Use native brige only if we have a private data directory.

Bug: 18027433

(cherry picked from commit 6a4d2369e5493cea86817634eceb0be46ba7d7a6)

Change-Id: I08b4e7172cd66c9006c26f07e3399848999cd74d
om_android_internal_os_Zygote.cpp
e9d6743649eb0e767ba46d9d8ac0d94f15b8c318 24-Oct-2014 Calin Juravle <calin@google.com> PreInitializeNativeBridge only if its Available

Also, assert that we always have a private application directory for non
system_server case.

Bug: 18027433

(cherry picked from commit 79ec4c15ab941419d21700a9734f5238b975c31a)

Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
om_android_internal_os_Zygote.cpp
6a4d2369e5493cea86817634eceb0be46ba7d7a6 28-Oct-2014 Calin Juravle <calin@google.com> Use native brige only if we have a private data directory.

Bug: 18027433

Change-Id: I59b1b1cbe1d7d14b93d8bb6d4255c951d9e469b6
om_android_internal_os_Zygote.cpp
5cfbcd3b9e35f98b7e6eb4fc2774037ea343ec48 27-Aug-2014 Wei Jin <wejin@google.com> Fix the length of a profiler system property

This patch changes the profiler system property
"dalvik.vm.profile.max-stack-depth" to "dalvik.vm.profile.stack-depth"
so that the length of the option is less than PROP_NAME_MAX.

Bug: 17294224

(cherry picked from commit 4d033e1c44c1b94ea5311713b8cc8bfb56bdcdd2)

Change-Id: I10dd0b3bfa46b836def437a3822f6c48538167dd
ndroidRuntime.cpp
5d4deb8246b13531a6b2b7611c650ba504e44dc6 28-Oct-2014 Calin Juravle <calin@google.com> am f7d24d24: Merge "PreInitializeNativeBridge only if its Available"

* commit 'f7d24d244319599f62c22e29c3e6540d6cbadf49':
PreInitializeNativeBridge only if its Available
79ec4c15ab941419d21700a9734f5238b975c31a 24-Oct-2014 Calin Juravle <calin@google.com> PreInitializeNativeBridge only if its Available

Also, assert that we always have a private application directory for non
system_server case.

Change-Id: I8397d7f7b04cde0bf65b60ca415bf3f4b349783c
om_android_internal_os_Zygote.cpp
675a518d5aca3092bfdd438f3f40bfdc3640cb80 24-Oct-2014 John Reck <jreck@google.com> am b64e4372: am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev

* commit 'b64e4372bb60bdce75e2af7d0b94efe92d94ac6a':
Add some free zoom to lockHardwareCanvas
b64e4372bb60bdce75e2af7d0b94efe92d94ac6a 24-Oct-2014 John Reck <jreck@google.com> am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev

* commit '82572cc458053e8cec292a708e18d0de7cfbead2':
Add some free zoom to lockHardwareCanvas
badac04dfd445a1fd3e3ecea04815e83fad5226c 23-Oct-2014 John Reck <jreck@google.com> Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev
1125d1fa92ab9f3b8315bbfb72e038b62dfd454b 23-Oct-2014 John Reck <jreck@google.com> Add some free zoom to lockHardwareCanvas

Bug: 18099195

Don't use EGL_SWAP_BUFFER_PRESERVED on surfaces that will
never benefit. Also clean up some confusing naming

Change-Id: I674ca64e0464a3282cff79e5ecd350d08f47c014
ndroid_view_Surface.cpp
aec202c8276cc021fd173103b1f5d8b50136df72 23-Oct-2014 Leon Scroggins III <scroggo@google.com> am 1e2f56c5: am e8556de6: am 36960fad: Merge "Decoder only returns true on complete success." into lmp-mr1-dev

* commit '1e2f56c51327c40c1fc13ac03bfbc6980dcb9080':
Decoder only returns true on complete success.
1e2f56c51327c40c1fc13ac03bfbc6980dcb9080 23-Oct-2014 Leon Scroggins III <scroggo@google.com> am e8556de6: am 36960fad: Merge "Decoder only returns true on complete success." into lmp-mr1-dev

* commit 'e8556de6f82ae0f4e4c8e76679e94abc23d724cf':
Decoder only returns true on complete success.
36960fad6631f3cb5f2c6048e482e19319b6b2d3 22-Oct-2014 Leon Scroggins III <scroggo@google.com> Merge "Decoder only returns true on complete success." into lmp-mr1-dev
425cc668a9ab9623729035ed39ef99c3ba02161a 22-Oct-2014 Derek Sollenberger <djsollen@google.com> Merge "Refactor HWUI to better handle Canvas DrawFilters."
9a23332716d0aad7d5f99f6c70c7298db96b7a83 22-Oct-2014 Leon Scroggins III <scroggo@google.com> am 754bffe9: am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev automerge: f408217
automerge: 85606df

* commit '85606df57518739ef26680ac821b6f1432791ce6':
Report that a JavaInputStreamAdaptor is at end.
85606df57518739ef26680ac821b6f1432791ce6 22-Oct-2014 Leon Scroggins III <scroggo@google.com> am 754bffe9: am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev
automerge: f408217

* commit 'f408217411f72ec45ced7bb0d028daa59e65b56b':
Report that a JavaInputStreamAdaptor is at end.
754bffe9692f2f62c4788b78eedbd63394db15a2 22-Oct-2014 Leon Scroggins III <scroggo@google.com> am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev

* commit 'e463bc388e7f5d83f864b320dde400e390ef5817':
Report that a JavaInputStreamAdaptor is at end.
7ab73f1e983cf2be077d147d0542974a8f768431 22-Oct-2014 John Reck <jreck@google.com> am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
automerge: 76f24bd

* commit '76f24bde7816dd97ed2375ec41c9817be0330d9f':
Surface:lockHardwareCanvas
76f24bde7816dd97ed2375ec41c9817be0330d9f 21-Oct-2014 John Reck <jreck@google.com> am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev

* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
Surface:lockHardwareCanvas
bf463af2a5ed6c37df5d0e5a49f6a15d457e1c85 21-Oct-2014 John Reck <jreck@google.com> Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2 21-Oct-2014 John Reck <jreck@google.com> Surface:lockHardwareCanvas

Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
ndroid_view_Surface.cpp
91332e7ecac06ef4cd3320095689e6af21e13dc6 16-Oct-2014 Leon Scroggins III <scroggo@google.com> Report that a JavaInputStreamAdaptor is at end.

This prevents a naive caller from continuing to attempt to read.

BUG:17419670
BUG:17873145
Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
17debef4c5bd23c98eba27343f89c3eabab0b1ae 20-Oct-2014 Neil Fuller <nfuller@google.com> am 1f2ad9eb: am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"

* commit '1f2ad9eb7417045c0a08b49a3bdf48600627c57e':
Replacing FloatMath native implementation with calls to Math
1f2ad9eb7417045c0a08b49a3bdf48600627c57e 20-Oct-2014 Neil Fuller <nfuller@google.com> am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"

* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4':
Replacing FloatMath native implementation with calls to Math
38b63f0edeaa856335ce8a047404bc4ca2ac6de7 20-Oct-2014 Neil Fuller <nfuller@google.com> am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"

* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4':
Replacing FloatMath native implementation with calls to Math
7b3db39aa47108c87dad5e930b6fec2292219abe 18-Oct-2014 Nick Kralevich <nnk@google.com> Replacing FloatMath native implementation with calls to Math

On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.

When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.

Example timings:

Mako AOSP AOT:

Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns

Mako AOSP interpreted:

Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns

Other calls Mako AOT:

Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns

The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
ndroid.mk
ndroidRuntime.cpp
ndroid_util_FloatMath.cpp
961e3d39221ee3996c875f289c94e9752a076e46 18-Oct-2014 Elliott Hughes <enh@google.com> am 87036756: am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""

* commit '870367567a1665dbb109e030f4a2828b60b454db':
Revert "Replacing FloatMath native implementation with calls to Math"
870367567a1665dbb109e030f4a2828b60b454db 18-Oct-2014 Elliott Hughes <enh@google.com> am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""

* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
Revert "Replacing FloatMath native implementation with calls to Math"
5fc9f9c293ecdcb98b243fcabca7d82f0cef078f 18-Oct-2014 Elliott Hughes <enh@google.com> am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""

* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
Revert "Replacing FloatMath native implementation with calls to Math"
4cd671e4d27befdd576fa86051956c3cafad6808 18-Oct-2014 Elliott Hughes <enh@google.com> Merge "Revert "Replacing FloatMath native implementation with calls to Math""
b3b68d03337274ada521199d507491bc756c4319 18-Oct-2014 Elliott Hughes <enh@google.com> Revert "Replacing FloatMath native implementation with calls to Math"

This reverts commit 32b88b48daa7383880088246d7222dd93cf55285.

Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
ndroid.mk
ndroidRuntime.cpp
ndroid_util_FloatMath.cpp
515defdebd9c955d023806120d94380e763b7628 18-Oct-2014 Dianne Hackborn <hackbod@google.com> am 019de15c: am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev

* commit '019de15ca23c674b70ae2e94f0fbb82e4a2bab68':
Fix issue #17948288: Improve accuracy of memory use reporting
019de15ca23c674b70ae2e94f0fbb82e4a2bab68 18-Oct-2014 Dianne Hackborn <hackbod@google.com> am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev

* commit '2ea2bf284078eea4871bfa0fb42b56dff3e8bbf3':
Fix issue #17948288: Improve accuracy of memory use reporting
b3af4ec6bae4fe93d40f021e54cbbce10cc7b4c6 18-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17948288: Improve accuracy of memory use reporting

We now use Mapped to not double-count cached pages that are
mapped in to app processes. Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.

It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space. I need to figure out
how I was finding that before.

Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
ndroid_os_Debug.cpp
14494262d39964ccd7f0fbac43f45ac2ea1eb224 17-Oct-2014 Leon Scroggins III <scroggo@google.com> Decoder only returns true on complete success.

Recently we added a way for SkImageDecoder::decode to distinguish
between successfully decoding the entire image and only partially
decoding the image (see https://codereview.chromium.org/647023006).

Only consider a call to decode() a success if the image was completely
decoded. This matches pre-L behavior, and lets the caller know that
they need to try to decode again.

Requires a change to external/skia (I33e6940e247b74b20361ae041f8d36eb600df49f)

BUG:17419670
Change-Id: I17ed7288b2359fafaec9551adb16d1d037800eb7
ndroid/graphics/BitmapFactory.cpp
09c2d4fe15fbac2faf8a97ba2cc59132ee12222a 15-Oct-2014 Derek Sollenberger <djsollen@google.com> Refactor HWUI to better handle Canvas DrawFilters.

First, this CL removes the need to decompose the DrawFilters
in Java and instead passes the SkDrawFilter to HWUI directly.
This also allows the removal of duplicated logic between HWUI
and other Canvas implementations regarding Paint filter levels.

Second, the DrawFilter is now stored in the DisplayListRenderer
where we apply it to every paint BEFORE it is stored in the
DisplayList. This eliminates the need to filter all Paints on
playback and removes additional complexity at playback.

Finally, as a result of storing the filtered paint we can now
do a better job caching the paints. This takes advantage of
recent changes in Skia to quickly enable quick hashing and
comparison of paint objects.

Change-Id: Iec507a2d894827975cc4f1d22241542bb0534b4e
ndroid_view_GLES20Canvas.cpp
b4b7f64921a7d6933e553a2f57173d76ff5673ee 16-Oct-2014 Tom Hudson <tomhudson@google.com> Merge "Fix build breakage in HWUI JNI"
73edbfeed0536dd4c55fc97b7dfc6ce105483c77 16-Oct-2014 Tom Hudson <tomhudson@google.com> Fix build breakage in HWUI JNI

R=djsollen@google.com

Change-Id: Iaa4e7f22bec8e15748beab1b25d307c48d277c59
ndroid/graphics/Shader.cpp
d44e9f9ed714dbd2e1dc93dff3f97b95ab01a977 16-Oct-2014 Neil Fuller <nfuller@google.com> am 06965cfd: am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"

* commit '06965cfd12854d8b1f783a847d4b979100da4551':
Replacing FloatMath native implementation with calls to Math
06965cfd12854d8b1f783a847d4b979100da4551 16-Oct-2014 Neil Fuller <nfuller@google.com> am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"

* commit '8a3785cafec4b47fe8d61614b04a0e193d616428':
Replacing FloatMath native implementation with calls to Math
4ef94035773757d13f611d409e51842505245221 16-Oct-2014 Neil Fuller <nfuller@google.com> am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"

* commit '8a3785cafec4b47fe8d61614b04a0e193d616428':
Replacing FloatMath native implementation with calls to Math
fd2d41b742339d278f4a66f78a7c161108985ed8 16-Oct-2014 Neil Fuller <nfuller@google.com> Merge "Replacing FloatMath native implementation with calls to Math"
32b88b48daa7383880088246d7222dd93cf55285 29-Sep-2014 Neil Fuller <nfuller@google.com> Replacing FloatMath native implementation with calls to Math

On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.

When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.

Example timings:

Mako AOSP AOT:

Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns

Mako AOSP interpreted:

Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns

Other calls Mako AOT:

Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns

The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I8d1947d88b3c576643138b1df589fb9da7c1ab88
ndroid.mk
ndroidRuntime.cpp
ndroid_util_FloatMath.cpp
a30c08e390403e9f678ce2ca5fa491aae0fd85b6 08-Oct-2014 Chris Craik <ccraik@google.com> am f1f54818: am a7315a14: am 86fd9278: Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev

* commit 'f1f5481817b0d306319e49a100fb3b5fb6534d0f':
Enable fast jni for simple RenderNode/Matrix/Paint operations
f1f5481817b0d306319e49a100fb3b5fb6534d0f 08-Oct-2014 Chris Craik <ccraik@google.com> am a7315a14: am 86fd9278: Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev

* commit 'a7315a14609497363e72c9a8459f9ffe70e0f546':
Enable fast jni for simple RenderNode/Matrix/Paint operations
86fd9278a98260e5812569381a07145221daa33d 08-Oct-2014 Chris Craik <ccraik@google.com> Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev
57c4fed236cbec0944824b534fb9c828ac0d1f81 08-Oct-2014 Derek Sollenberger <djsollen@google.com> remove references to SkPaint::TextBufferDirection

The enum is planned for removal from Skia and its usage here was
unecessary.

Change-Id: I3bd5b4de068ea9e8b0b81f408c987e4c9c4a1875
ndroid/graphics/Paint.cpp
4136a0aeac9bb95aa615d4fc1f12378829d26c80 08-Oct-2014 Chris Craik <ccraik@google.com> Enable fast jni for simple RenderNode/Matrix/Paint operations

bug:17895119

Change-Id: Id83bfd719ec873028f0d4e7e4e4c0702f3bb3dd9
ndroid/graphics/Matrix.cpp
ndroid/graphics/Paint.cpp
ndroid_view_RenderNode.cpp
62a93760bfdf8b172b8e3485a3cd363bbc547389 07-Oct-2014 Derek Sollenberger <djsollen@google.com> Merge "Mutable Java Shaders with Immutable Native Shaders"
3b34f09b194a63ec4bc5d02e9de7969738cab5bb 07-Oct-2014 Mathieu Chartier <mathieuc@google.com> am 361e2049: am 830467e2: am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev

* commit '361e204991a2f06370e9886a9a8382279c93399c':
Fix incorrect JNI_ABORT
361e204991a2f06370e9886a9a8382279c93399c 07-Oct-2014 Mathieu Chartier <mathieuc@google.com> am 830467e2: am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev

* commit '830467e2873767ff11960c3b9fecb2e7d4c57b21':
Fix incorrect JNI_ABORT
5ade30e82e05c783d74e3a52316be4c3ed11239c 07-Oct-2014 Mathieu Chartier <mathieuc@google.com> am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev

* commit '405a934ec46fccf7d2e6e573bb65a5be4b51665a':
Fix incorrect JNI_ABORT
db58e1bec1eff594f60ec103887d6a633b771243 07-Oct-2014 Mathieu Chartier <mathieuc@google.com> am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev

* commit '1638a0049b4a5edae6aaf73a55a6aa7e14f71075':
Fix incorrect JNI_ABORT
6a5e6df96858bd581151cc99421f67a0674b76d1 06-Oct-2014 Mathieu Chartier <mathieuc@google.com> Fix incorrect JNI_ABORT

If there is a copy, JNI_ABORT does NOT copy back into the
corresponding java array. Changing this to 0 is what you want since
this will copy the data back if needed and free the temporary
storage.

Bug: 16858794
Change-Id: I3f3b426ea3cbba577bb720532c16ebf7493f1c1c
om_google_android_gles_jni_EGLImpl.cpp
dfba4d3d11bbf47dff45f94d61d4d97510b3034a 02-Sep-2014 Derek Sollenberger <djsollen@google.com> Mutable Java Shaders with Immutable Native Shaders

bug: 17641888
Change-Id: I0f05387423cde185dab1a1453f89d5251ca1a4f9
ndroid/graphics/Shader.cpp
ab22c1c792bc5f422a029a4ab6a23861e44136d8 03-Sep-2014 Derek Sollenberger <djsollen@google.com> cleanup so that the Paint.h is only accessed via its nativePtr not a JNI lookup

bug: 17641888
Change-Id: I8fc2a01fdcf62dd33b443b0a2302df5e29dc3f49
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Movie.cpp
ndroid/graphics/Paint.cpp
b9ba53d088a5405c352c0257a09b60354cf8c22b 04-Oct-2014 John Reck <jreck@google.com> am 6e4140c6: am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev

* commit '6e4140c6e2d6f14ba225b2ae5926cc0f2794056a':
Cleanup DeferredLayerUpdater
6e4140c6e2d6f14ba225b2ae5926cc0f2794056a 04-Oct-2014 John Reck <jreck@google.com> am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev

* commit 'c4694796a952014d07e6d083749d2f8b7d06afee':
Cleanup DeferredLayerUpdater
6a2296d856fe4db524ab71c6500f356ff0454f29 04-Oct-2014 John Reck <jreck@google.com> am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev

* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
Cleanup DeferredLayerUpdater
b0d6cd236ce84085c6f19955b4f4610d1a754411 04-Oct-2014 John Reck <jreck@google.com> am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev

* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
Cleanup DeferredLayerUpdater
749906b468912dab7bf69a86e852deac3e80b0cc 04-Oct-2014 John Reck <jreck@google.com> Cleanup DeferredLayerUpdater

Bug: 17765082

DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures

Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
ndroid_view_ThreadedRenderer.cpp
29e2e5d2d5815e308443f0fffee18dd1b528968b 02-Oct-2014 Adam Powell <adamp@google.com> am e18d68d6: am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev

* commit 'e18d68d6ab2f5354441162719ec87cb57de83519':
Revert "Fix issue with using locally defined attrs in a shared lib"
e18d68d6ab2f5354441162719ec87cb57de83519 02-Oct-2014 Adam Powell <adamp@google.com> am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev

* commit '4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35':
Revert "Fix issue with using locally defined attrs in a shared lib"
e4275843fede011d7ba45cc8cdbf660e86fb6c33 02-Oct-2014 Adam Powell <adamp@google.com> am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev

* commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81':
Revert "Fix issue with using locally defined attrs in a shared lib"
8628387c604168ccd1ae9c20b8b8d34c68e5f526 02-Oct-2014 Adam Powell <adamp@google.com> am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev

* commit 'b226d2951c8641f9851e40b4e13b4ae25cb1a482':
Revert "Fix issue with using locally defined attrs in a shared lib"
c6a06d437cf2ee7926a01b2f8ee685555bfb3d81 01-Oct-2014 Adam Powell <adamp@google.com> Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
908c748096d855d47da2f5e20fd4d9d31d1e603c 01-Oct-2014 Adam Powell <adamp@google.com> Revert "Fix issue with using locally defined attrs in a shared lib"

This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.

The reverted commit caused issues loading resources supplied by static libraries.

Bug 17748356

Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
ndroid_util_AssetManager.cpp
8cb387b3b7004c84fdf5eaea1158591e43838f4c 01-Oct-2014 Adam Lesinski <adamlesinski@google.com> am 7923da5f: am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev

* commit '7923da5f5d05f256179e0d926b3b55bbf1d29a8e':
Fix issue with using locally defined attrs in a shared lib
b73767f3bb16ed936c7bf7e0e473aee74d657477 01-Oct-2014 Ruben Brunk <rubenbrunk@google.com> am e6098661: am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev

* commit 'e60986611fe891b47f72b47873ed87deb2e3afc2':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
42b7a45a5606f5b752de68a38afdc6d26bc2a15a 01-Oct-2014 Dianne Hackborn <hackbod@google.com> am 67787a82: am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '67787a82a01460f0d68c154fdf3045bdc1ee572f':
More work on issue #17656716: Unhandled exception in Window Manager
7923da5f5d05f256179e0d926b3b55bbf1d29a8e 01-Oct-2014 Adam Lesinski <adamlesinski@google.com> am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev

* commit '06f380e9efa4698c223077cacaa2df80a704ef96':
Fix issue with using locally defined attrs in a shared lib
e60986611fe891b47f72b47873ed87deb2e3afc2 01-Oct-2014 Ruben Brunk <rubenbrunk@google.com> am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev

* commit 'df26108539c1ca134bece1c75d96b96f71c0e3f5':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
67787a82a01460f0d68c154fdf3045bdc1ee572f 01-Oct-2014 Dianne Hackborn <hackbod@google.com> am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit 'cb5fc84b554aa82a98867f997caffea3d7067033':
More work on issue #17656716: Unhandled exception in Window Manager
95731abeae49eac57911068ac8545f4eba2ae58d 01-Oct-2014 Adam Lesinski <adamlesinski@google.com> am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev

* commit 'bb7b51978eb5341e9a1204a447c8340bfb248504':
Fix issue with using locally defined attrs in a shared lib
4d9face69eed8e1e6980199ea4e91a01a4bf0759 01-Oct-2014 Ruben Brunk <rubenbrunk@google.com> am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev

* commit '7432b88447dea2a9a5b8adcfeb150da7a18d22f6':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
16b6a8f702fe654575f8929754908f57845158ce 01-Oct-2014 Dianne Hackborn <hackbod@google.com> am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '962e3e831516688824fec334c5ddcfd4f3d13f44':
More work on issue #17656716: Unhandled exception in Window Manager
d388b1fdde73124eeda35f18e5bcc2ed1c8cefaa 01-Oct-2014 Adam Lesinski <adamlesinski@google.com> am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev

* commit 'cd8e73817d14798f9d2031ffd301a03a096b7907':
Fix issue with using locally defined attrs in a shared lib
cd8e73817d14798f9d2031ffd301a03a096b7907 01-Oct-2014 Adam Lesinski <adamlesinski@google.com> Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
921d8e2ddb04080827fa92239bb858631e3cabe3 01-Oct-2014 Elliott Hughes <enh@google.com> am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote failures."

* commit 'ee7684cad00a13fc82519599ad8fab3cfbd6fe8b':
Use strerror(3) when reporting zygote failures.
5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6 01-Oct-2014 Adam Lesinski <adamlesinski@google.com> Fix issue with using locally defined attrs in a shared lib

The attribute name resource IDs were never fixed up with
the runtime package ID so we weren't finding attributes
whenever the runtime package ID was different than the build
time one, which happened to be when a shared lib referenced itself
(0x00 vs 0x02).

Bug:17666947
Change-Id: Icf3e874bcea0e27eebe42d60fbed626a34bf9266
ndroid_util_AssetManager.cpp
e06a3d82538e9b51271271d571f2e7025acdabac 01-Oct-2014 Ruben Brunk <rubenbrunk@google.com> am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev

* commit 'b3c802f2381c3411fe753206ab89027f60164b77':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
b3c802f2381c3411fe753206ab89027f60164b77 01-Oct-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
0c79884076405bc36c0fb4f1bce27f883b97d64c 30-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Use valid dimensions for RGBA8888 gralloc buffers.

Bug: 17675571

- All of the mistakes were made. Unmake them.

Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
ed1589d81f1d7c8cf2a97f2a5afe3d856fbb1b74 30-Sep-2014 Dianne Hackborn <hackbod@google.com> am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
More work on issue #17656716: Unhandled exception in Window Manager
ce92b0d070c4967914698b4e257c203d7121c972 30-Sep-2014 Dianne Hackborn <hackbod@google.com> More work on issue #17656716: Unhandled exception in Window Manager

Drop down the limit on when we log, since under normal operation we
will never get more than a few K of data due to strict mode.

Try to clean up the code paths coming in and out of binder IPCs to
plug any places where we could disrupt the gather flag of a thread,
causing it to keep gathering stack crawls (which is the thing that
is causing our strict mode data to become so large).

Change-Id: I9a46512283d33e863c429840b465855d1fabb74e
ndroid_util_Binder.cpp
96d9b8943503c7dd3f0e6092efa425691c0e2b2f 30-Sep-2014 Elliott Hughes <enh@google.com> am 6d4f8251: am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote failures."

* commit '6d4f825143e13645f06972787e57e4bde9cd3946':
Use strerror(3) when reporting zygote failures.
6d4f825143e13645f06972787e57e4bde9cd3946 30-Sep-2014 Elliott Hughes <enh@google.com> am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote failures."

* commit 'ee7684cad00a13fc82519599ad8fab3cfbd6fe8b':
Use strerror(3) when reporting zygote failures.
58a8cdcb8e94dad67cb9b95941db7a446d83b601 30-Sep-2014 Derek Sollenberger <djsollen@google.com> am b4debc6c: am 713e0683: am 345effc2: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-mr1-dev

* commit 'b4debc6c61915002d016984578f80ffa0645e27f':
Fix memory leak where we close the descriptor instead of the file.
b4debc6c61915002d016984578f80ffa0645e27f 30-Sep-2014 Derek Sollenberger <djsollen@google.com> am 713e0683: am 345effc2: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-mr1-dev

* commit '713e0683ae72abd70126ace55aa3d3d1223217fc':
Fix memory leak where we close the descriptor instead of the file.
960e83185efc709470f3c4c85f69e82269d2927a 30-Sep-2014 Elliott Hughes <enh@google.com> Use strerror(3) when reporting zygote failures.

Bug: 17700596
Change-Id: I39a72ab6f19063de3c90c9fccdb749dc9a86324e
om_android_internal_os_Zygote.cpp
48ca9cd9f852fb38504bd045007ab88102d6fae2 29-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 6c583ef7: am c6c331ee: am 174355d6: am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev

* commit '6c583ef7ea34a2ac2eb490237908587bcbddb0e3':
camera2: Fix native ImageReader test segfaults.
5cb769d99952ef9fb4f576abba70423fe157342b 24-Sep-2014 Derek Sollenberger <djsollen@google.com> Fix memory leak where we close the descriptor instead of the file.

bug: 17541634
Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
ndroid/graphics/BitmapFactory.cpp
454a681fc3225ee989ff85c000e7435ed2b3ced9 29-Sep-2014 jgu21 <jinghui.gu@intel.com> am df44f764: am 20867871: Frameworks/base: Early init native bridge

* commit 'df44f764444a8676051c54cfb3e3f5fd2b8682c8':
Frameworks/base: Early init native bridge
208678718f9f8db3bc279c7d5bd1445af2831ae3 10-Sep-2014 jgu21 <jinghui.gu@intel.com> Frameworks/base: Early init native bridge

Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

(cherry picked from commit 2eacd06bfb82b33dfcbccafbcfc0bf1218484bb5)

Bug: 17671501
Change-Id: I970db5b284b0c12e2d8a45df3950c1fff2927a4e
om_android_internal_os_Zygote.cpp
6c583ef7ea34a2ac2eb490237908587bcbddb0e3 27-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am c6c331ee: am 174355d6: am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev

* commit 'c6c331ee6ef9dbcd8e54a1a915d5932a6dda5405':
camera2: Fix native ImageReader test segfaults.
30adb2ca22140c2313400ec8c6ff45f59a98a742 27-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev

* commit 'd0f17b986c78f1915f6cf155858b6fd2a9927f23':
camera2: Fix native ImageReader test segfaults.
469a55eddcf9f8e74647b7c0fbaad27a5729d1c0 27-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev

* commit '6f34ad71cb00c7f4260dbf071422b334152a2cd1':
camera2: Fix native ImageReader test segfaults.
7b28c66a6cc10b48231f8a5d8d45f5e22322e798 27-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
31798f33184fd59dd3d3cc55e6373d9f91d220b6 26-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix native ImageReader test segfaults.

Bug: 17675571

- Check for JPEG footer in correct location from ImageReader
when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
incorrect width calculations.

Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
0ef554e7c7c6962471376eb060b5c3fafe926b8d 26-Sep-2014 Dave Burke <daveburke@google.com> am fd48718b: am c81f70b6: am 716bae33: am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev

* commit 'fd48718bdae13cf14cb57ec8d7822dbe50daae0d':
Revert "Fix memory leak where we close the descriptor instead of the file."
b168fa0c6f1c98d7c8c83eaefeaabf38f9f6b9ee 26-Sep-2014 Dave Burke <daveburke@google.com> am c81f70b6: am 716bae33: am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev

* commit 'c81f70b65be28493816ebccf23f8df0cd3c51890':
Revert "Fix memory leak where we close the descriptor instead of the file."
f0e47946a8b877d8710c59d12d29e103d841ebd5 26-Sep-2014 Dave Burke <daveburke@google.com> am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev

* commit 'd84ab8b128157d60bc1d4dad6f6223e1f174e188':
Revert "Fix memory leak where we close the descriptor instead of the file."
aef681506c9a88c0c9dd9dc7648c045e9c6ae989 26-Sep-2014 Dave Burke <daveburke@google.com> am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev

* commit 'e09e20eeca4b822855e02507a4e30387ea4ee1a6':
Revert "Fix memory leak where we close the descriptor instead of the file."
6bf7be3b752bb3e8a10278136b8d2c0e57a731d9 26-Sep-2014 Dave Burke <daveburke@google.com> Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev
d29c902f9822ab4b11dd4b91729c64d6987cdf29 26-Sep-2014 Jérôme Poichet <jpoichet@google.com> Revert "Fix memory leak where we close the descriptor instead of the file."

This reverts commit 1503ebd95fc82b1ae6ec8b006e62a9f6109973fa.

Change-Id: Id40cf34821ea244b1a838079bd147bc845b96cb3
ndroid/graphics/BitmapFactory.cpp
b0e58ff6b3ec0d1bc51384ea1ee2d2008fb3f756 26-Sep-2014 Dianne Hackborn <hackbod@google.com> am 534556ae: am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '534556aef5ae22d522c5988d535b3b19b3742fd3':
Work on issue #17656716: Unhandled exception in Window Manager
a15dcc3fa1551b92a6d1cc8f0b56d33284e06af8 26-Sep-2014 Dianne Hackborn <hackbod@google.com> am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '6b9b8a03847a190e1f3c9cf50fc3989a572d7534':
Work on issue #17656716: Unhandled exception in Window Manager
7c1de6c06e3ba50cf42fa7cdf0c41ba1e824f80b 26-Sep-2014 Dianne Hackborn <hackbod@google.com> am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '24ecbc4fbe66b548a35617c03c7ac068b40b83de':
Work on issue #17656716: Unhandled exception in Window Manager
042b32c8d29f3e8da834bac10979d0fcf89cc9a6 26-Sep-2014 Dianne Hackborn <hackbod@google.com> am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d':
Work on issue #17656716: Unhandled exception in Window Manager
017c6a28bee788d2ba5550548ea844d0236bc40e 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17656716: Unhandled exception in Window Manager

Create descriptive errors when sending unreasonably large
parcels through IPC.

Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
ndroid_util_Binder.cpp
e08bd64184961607e5d558b43a6437833c221040 25-Sep-2014 Dan Albert <danalbert@google.com> Allow AOSP to boot.

HAVE_OOM_ADJ is really __linux__, and this code should never be run on
another platform.

Bug: 17641445
Change-Id: Ib8174106b6d03c9c2429794a4f582c09cb308646
ndroid_util_Process.cpp
4656e6bb168a9045f9e6137f3e1c7876f9bf2dea 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 043d6fff: am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev

* commit '043d6fffee2b2fe3aa8821914ba761eae964cf2e':
camera2: Hide JPEGs in RGBA gralloc buffers.
ea06d48527d27eb6493c6ee5b02011dcc5e8189b 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev

* commit '01105feea74a4d0a063774509efa21ae95d50a3a':
camera2: Hide JPEGs in RGBA gralloc buffers.
fb444ce6f82b47e3370c3854627dc481ac56430e 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev

* commit '6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
camera2: Hide JPEGs in RGBA gralloc buffers.
d16dba84172c8fe28b733aa1ba5485c202f730ec 25-Sep-2014 Derek Sollenberger <djsollen@google.com> am e696393b: am 869939a1: am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev

* commit 'e696393bea2e29c0d4655071035c655d9793eb7c':
Fix memory leak where we close the descriptor instead of the file.
b3385c278f4a7ece50da92277f093e202f8d1365 25-Sep-2014 Mathieu Chartier <mathieuc@google.com> am 787d0256: am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev

* commit '787d02560eda49ba5f304b9880ebc4758dbe7ba0':
Fix dalvik map names
4d64addc20ba14d6923de5853272260bf887efa5 25-Sep-2014 Andreas Gampe <agampe@google.com> am 43d02564: resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp

* commit '43d0256429c46a1243c8d85a34d029b40fd5e34e':
Frameworks/base: Early init native bridge
bc167acc25de66dbdfca0bd71333260b5ea6f9f4 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev

* commit '8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
camera2: Hide JPEGs in RGBA gralloc buffers.
13e659cc55d10ab1af96c4274b95ea0f91f37c3f 25-Sep-2014 Derek Sollenberger <djsollen@google.com> am 869939a1: am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev

* commit '869939a186c610de90d247bc27f26260a26c3daa':
Fix memory leak where we close the descriptor instead of the file.
4084fe72bb658ac97a2157dc9163b774da5e7211 25-Sep-2014 Mathieu Chartier <mathieuc@google.com> am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev

* commit '890ef76560d34e325b82e1bf72336de8de838844':
Fix dalvik map names
81ba98619b3b7d5856fe3787167333b05fe16f83 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
a2945aabd91a04c41ced273c2169bd5a74cf3e6f 25-Sep-2014 Andreas Gampe <agampe@google.com> resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp

Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
a103ebed6e9a44a406b31636791d2970c882ec44 25-Sep-2014 Andreas Gampe <agampe@google.com> resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aosp

Change-Id: Ia9c350dcfb41f9d04400a86bd7e5f2cf2af656f1
b468bba92aa9713c3a87bbf308206c5ff272a830 25-Sep-2014 Derek Sollenberger <djsollen@google.com> am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev

* commit '07f751baac5be1184fa8868176fc7e8b4791c3f9':
Fix memory leak where we close the descriptor instead of the file.
f5ced0a9edc97e35e3aa8c92adf41d503346ff43 25-Sep-2014 Mathieu Chartier <mathieuc@google.com> am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev

* commit '443c76479684c6aecf132b415aa7052c6bd9d174':
Fix dalvik map names
6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0 24-Sep-2014 Andreas Gampe <agampe@google.com> Merge "Frameworks/base: Early init native bridge"
899a28b28ebe29a7498f676069cc898d09bf21bc 24-Sep-2014 Derek Sollenberger <djsollen@google.com> am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev

* commit 'c37e905a245e3134a417677b93d5a020bab62d75':
Fix memory leak where we close the descriptor instead of the file.
a14ec04b1e640e580b0cda11b1c7a1ef3597d42b 24-Sep-2014 Derek Sollenberger <djsollen@google.com> Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
72536f1de9fdc4123e94555349593f541c00c320 24-Sep-2014 Mathieu Chartier <mathieuc@google.com> am a061388d: Merge "Fix dalvik map names" into lmp-dev

* commit 'a061388d3f230072661c55fcb4158f383fd9fe94':
Fix dalvik map names
544300db17b6641e2e948939cbb4cefb4fa96898 24-Sep-2014 Mathieu Chartier <mathieuc@google.com> Merge "Fix dalvik map names" into lmp-dev
eee9764418d13176c9671e453775d476c2206f6c 24-Sep-2014 Mathieu Chartier <mathieuc@google.com> Fix dalvik map names

Some maps which should have been dalvik other were incorrectly
accounted for in dalvik heap.

Bug: 17632563

Change-Id: I90d0bebf700650a445b19c4c72674b2941868d8b
ndroid_os_Debug.cpp
0fd198ad89ec9c600bb1761b10d938146c28bb98 24-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Hide JPEGs in RGBA gralloc buffers.

Bug: 17379185

- WAR for SW Write usage flags being unavailable on
certain devices for JPEG (blob) format buffers.

Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
dfc90e5e9d1ca7fd487c1ec88fe717cb124b6d9e 24-Sep-2014 Eric Laurent <elaurent@google.com> am e4c51fb1: am 2e0cb3c9: am 02e49c71: am b7e8fdce: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev

* commit 'e4c51fb10501a1bc6d57813cc7b2aedfdd982d55':
AudioRecord: add HW hotword capture flag
1b99187253fcb03698a7db71394ff8a900ce56a6 24-Sep-2014 Derek Sollenberger <djsollen@google.com> Fix memory leak where we close the descriptor instead of the file.

bug: 17541634
Change-Id: I842176213e0547dd737ef6e0b83c320a5cc32219
ndroid/graphics/BitmapFactory.cpp
0441fb8439a35277ab6b049ef47f37c32a2ab047 24-Sep-2014 Eric Laurent <elaurent@google.com> am 2e0cb3c9: am 02e49c71: am b7e8fdce: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev

* commit '2e0cb3c9c7654ef97aa0d8994452e26752321ca1':
AudioRecord: add HW hotword capture flag
c7fc0d632fe83f3d23fbcdd9cb201da1586a87f9 24-Sep-2014 Eric Laurent <elaurent@google.com> am b7e8fdce: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev

* commit 'b7e8fdcedb9e9f62cd91ec53384f9ab1571e3835':
AudioRecord: add HW hotword capture flag
c1aa0838c8c2eb90b2c29bf33e8d1f7b0a721d4a 24-Sep-2014 Eric Laurent <elaurent@google.com> am 337f4b98: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev

* commit '337f4b982e2405499270f4ea13abfa3cb221d3c6':
AudioRecord: add HW hotword capture flag
c1823452ad82d46534001434cf75b19cb986ca26 24-Sep-2014 Eric Laurent <elaurent@google.com> Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
2eacd06bfb82b33dfcbccafbcfc0bf1218484bb5 10-Sep-2014 jgu21 <jinghui.gu@intel.com> Frameworks/base: Early init native bridge

Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
om_android_internal_os_Zygote.cpp
27c5da9594d45f4bf1d7cfcaaca945f310c17480 20-Sep-2014 Christopher Ferris <cferris@google.com> am 9dce5bd2: am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references."

* commit '9dce5bd2c6e738d183fd514914684098d4ac2093':
Remove MALLOC_LEAK_CHECK references.
172fa08e9571d6e2bda6b2ab01242aa8ac1c3015 20-Sep-2014 Christopher Ferris <cferris@google.com> am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references."

* commit '7d1138298b37bca2340fc4610090b53f5b838f7a':
Remove MALLOC_LEAK_CHECK references.
5684e714a444ff745add458b8550fe6c881a1cf4 20-Sep-2014 Christopher Ferris <cferris@google.com> am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references."

* commit '7d1138298b37bca2340fc4610090b53f5b838f7a':
Remove MALLOC_LEAK_CHECK references.
bdad1afa92a6e7cd688061d5432f25a3dd15b64e 20-Sep-2014 Eric Laurent <elaurent@google.com> AudioRecord: add HW hotword capture flag

Bug: 17575019.
Change-Id: Ifa8b8342dffa12e1943b8f9105f6ab1fa4a2b1a6
ndroid_media_AudioRecord.cpp
f9974e9aaae0d230d7f76b23700b99daf7b96b5d 20-Sep-2014 Dan Albert <danalbert@google.com> am 6746b74d: resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp

* commit '6746b74de540f2899f886cd25827f3ca9901de32':
Clean up makefile cruft.
8ab25d82b56c7604dc945e4385b74a75de093e56 20-Sep-2014 Dan Albert <danalbert@google.com> resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp

Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
c04d92cac93fdbbdc6d104f15f6496d197753e92 20-Sep-2014 Dan Albert <danalbert@google.com> resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp

Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
8b1dfddf509aa879fd0740c5c1ed0f8e740e9659 19-Sep-2014 Christopher Ferris <cferris@google.com> Remove MALLOC_LEAK_CHECK references.

Bug: 17378595
Change-Id: Ib9680ef97dfea6bc20d96f0bed90f4553186315c
ndroid.mk
6d72b7376874ade4e21808c6599290277af3af92 19-Sep-2014 Mike Lockwood <lockwood@google.com> am 8d6a74e0: am b4b95714: am e996ea18: am ad421a8b: am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev

* commit '8d6a74e0c8a7ceead76dcaf3d17784302f9f78fe':
USB string descriptors are not UTF8, so it is not safe to treat them as such.
de060ec9266042890785a52067030f9a892d8275 19-Sep-2014 Igor Murashkin <iam@google.com> am 6f389c3f: am bf7bd5ed: am 4bf467a1: Merge "camera: Fix missing optional Face fields (eyes, mouth, id)" into lmp-mr1-dev

* commit '6f389c3f196ddd7a8d7efb981965f7bd9b1ca022':
camera: Fix missing optional Face fields (eyes, mouth, id)
15b3c63386978f01d4c35913a7e894602ceabcea 19-Sep-2014 Mike Lockwood <lockwood@google.com> am b4b95714: am e996ea18: am ad421a8b: am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev

* commit 'b4b957144368a23cd916b7d7f5656141b7cb0dae':
USB string descriptors are not UTF8, so it is not safe to treat them as such.
fb6bc257cd6e1057e6c02d2702306d79ab8cc9e8 19-Sep-2014 Igor Murashkin <iam@google.com> am bf7bd5ed: am 4bf467a1: Merge "camera: Fix missing optional Face fields (eyes, mouth, id)" into lmp-mr1-dev

* commit 'bf7bd5edf4164ed5d65172ea8402c33f4b68c680':
camera: Fix missing optional Face fields (eyes, mouth, id)
46e6acb35ae070d408a8ae4effc878bc6857c868 19-Sep-2014 Mike Lockwood <lockwood@google.com> am ad421a8b: am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev

* commit 'ad421a8bedd047366c80ae4338039aec8f5da796':
USB string descriptors are not UTF8, so it is not safe to treat them as such.
99f8f21c166cf262489633b2e6a8dbe5f1771a8d 19-Sep-2014 Mike Lockwood <lockwood@google.com> am d3d6ecdb: am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev

* commit 'd3d6ecdb7a6b00347920c5e706275017854849af':
USB string descriptors are not UTF8, so it is not safe to treat them as such.
51938c205f41da95486b17ea645fd0ce2a73be82 19-Sep-2014 Mike Lockwood <lockwood@google.com> Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
0601ab1618e95d455230c4801a40cbc5c25221fe 19-Sep-2014 Igor Murashkin <iam@google.com> camera: Fix missing optional Face fields (eyes, mouth, id)

Bug: 17557634
Change-Id: Ife2ba0cb881f9dba3195b02021fb1876a6d0825e
ndroid_hardware_Camera.cpp
027eb7c8749539c01192dde926dc4207807764f0 17-Sep-2014 Jorim Jaggi <jjaggi@google.com> am fb2fa955: am 185055cb: am dc29e524: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev

* commit 'fb2fa955e92e6066e21badebf16259acdcebae12':
Use RenderThread for navigation bar ripples
34ef9ec8d27cfaab30a93bd56380a7ebda7eb207 16-Sep-2014 Jorim Jaggi <jjaggi@google.com> am 99e9b12f: am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev

* commit '99e9b12fbe444414f7e4fd9a18aa40fee7bf2f1f':
Use RenderThread for navigation bar ripples
0768029b74ed57f5a79a1e94dc12c3eaef09bb9b 16-Sep-2014 Jorim Jaggi <jjaggi@google.com> am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev

* commit 'd2420d39c03c17ec62b283e5a99c33ff1360926f':
Use RenderThread for navigation bar ripples
072707dfad1da6f49f4d3ce58ca104f6c46a7266 15-Sep-2014 Jorim Jaggi <jjaggi@google.com> Use RenderThread for navigation bar ripples

Bug: 17506181
Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
ndroid_view_GLES20Canvas.cpp
1c96d878f0258e1b1321a05cf32cef8a13890375 13-Sep-2014 Alan Viverette <alanv@google.com> am 83eb619b: am 5dee9c9b: am 855fc8c7: Update icons to vectors, fix preload theming & vector tinting

* commit '83eb619bdcd6e2051166b8c72f7d2111e54ab548':
Update icons to vectors, fix preload theming & vector tinting
0cfc7717aa473262044c9edaddcfe7bc0caaa2ee 12-Sep-2014 Alan Viverette <alanv@google.com> am 5dee9c9b: am 855fc8c7: Update icons to vectors, fix preload theming & vector tinting

* commit '5dee9c9b3e68e7567e765b7abb5ba3d3f05ce989':
Update icons to vectors, fix preload theming & vector tinting
607bd848269fb802550e63aa61945790616f97a7 12-Sep-2014 Alan Viverette <alanv@google.com> Update icons to vectors, fix preload theming & vector tinting

Adds a missing JNI binding to AssetManager, ensures drawables have
default tint modes as documented, and updates vector tint appropriately
when state changes.

BUG: 17385604
Change-Id: Ice92885989ebc13b95952f5dc3b7904cc956da12
ndroid_util_AssetManager.cpp
80022ca34b6635acd2aee756a829fe27fe0db081 12-Sep-2014 Jeff Brown <jeffbrown@google.com> am 644c809c: am a38e59b1: am 683872af: Merge "Clean entire arg block when setting process name." into lmp-dev

* commit '644c809cd01e09891a464752347112d437e62ca6':
Clean entire arg block when setting process name.
35d7960cb292d47290e34036700f29c39a216273 12-Sep-2014 George Mount <mount@google.com> am 70005d59: am 217e34d0: am 51d20c87: Merge "Allow Path approximation to work with a single point Path." into lmp-dev

* commit '70005d594f263b964086db6b61d1fa7510f114ee':
Allow Path approximation to work with a single point Path.
c846e61639c3808889ac394366dd4db5379a3b88 12-Sep-2014 Jeff Brown <jeffbrown@google.com> am a38e59b1: am 683872af: Merge "Clean entire arg block when setting process name." into lmp-dev

* commit 'a38e59b1b4164a33c38fc522e56601d886c49833':
Clean entire arg block when setting process name.
71fb032b65dcc21d077fa13b2df0d2ffacba17ea 12-Sep-2014 George Mount <mount@google.com> am 217e34d0: am 51d20c87: Merge "Allow Path approximation to work with a single point Path." into lmp-dev

* commit '217e34d0fb9e3ae7e6b6e4bd8afb9a3d449989e5':
Allow Path approximation to work with a single point Path.
88ba339aefd74ffe0ea978ebb659a430f82940f0 12-Sep-2014 Dan Albert <danalbert@google.com> Clean up makefile cruft.

The build system already takes care of all these things.

Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
ndroid.mk
c46cd62b5c808101a204be6a5db2bf63701c8944 12-Sep-2014 Jeff Brown <jeffbrown@google.com> Merge "Clean entire arg block when setting process name." into lmp-dev
784ab49b6e36aa15ce6a00dfbba6215a7991fce3 11-Sep-2014 George Mount <mount@google.com> Merge "Allow Path approximation to work with a single point Path." into lmp-dev
00c0cd4a24bd0f040055f9e786e2df1fa3b7d2d3 11-Sep-2014 Jeff Brown <jeffbrown@google.com> Clean entire arg block when setting process name.

When Android processes fork from Zygote, we rewrite the command line
with a new name, eg. "system_server". When we do this, we should
fill the entire block with zeros to remove corrupted argument
information that may otherwise remain in the /proc/<pid>/cmdline buffer
and be seen in tools and stack dumps.

Fixed an issue where VM options could be overwritten after setting
the nice name if the name was too long.

Bug: 17474152
Change-Id: Ie6cf9ed7752a04300a340e26cd6812bb35c59e1b
ndroidRuntime.cpp
68cfdad20d83400e0cc0ddb4c86deaeda3337d4d 11-Sep-2014 George Mount <mount@google.com> Allow Path approximation to work with a single point Path.

Bug 17452965

A single point Path (move-to only) was not returning any
verbs in the verb list. This forces an approximation for
single move-to and empty paths by giving the same value
for fraction 0 and fraction 1.

Change-Id: Icb1b932d730457680cf422377a83fe669f0a7687
ndroid/graphics/Path.cpp
5014c1daf7eac44c4275808843ae20bdbe654de3 10-Sep-2014 Svetoslav <svetoslavganov@google.com> am 36a9a4c7: am f1b72b86: am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev

* commit '36a9a4c7920e7faa02a4b9444b7a247e89923b9d':
Trim unnecessary pages when printing.
87c8260341a54dbaa7a26eb81a40f65688c3ed36 10-Sep-2014 Svetoslav <svetoslavganov@google.com> am f1b72b86: am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev

* commit 'f1b72b86380b25b933be32c46d4f59a41699a546':
Trim unnecessary pages when printing.
15040e0a58b620e0fd75c8a6a8cd8b403aad5c22 10-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Trim unnecessary pages when printing." into lmp-dev
d2d01e9bd6bcd198933c8a7065763068476c9947 10-Sep-2014 Jeff Sharkey <jsharkey@android.com> am f77f306f: am a5746ce3: am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev

* commit 'f77f306f9803f4f9b9937b10a0a4dc545c86bd9b':
Use sscanf() for parsing tag values.
c890b81a7b62122cb540ec511b54baf873148370 10-Sep-2014 Riley Andrews <riandrews@google.com> am 3dec5a67: am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev

* commit '3dec5a67d900e18f3aa3607aeb20fa4e6586f771':
Use surfaceflinger for recents thumbnail rotations.
30d40e707b33152d23a00b47c73f6de8207e8746 09-Sep-2014 Jeff Sharkey <jsharkey@android.com> am a5746ce3: am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev

* commit 'a5746ce305bc331c4cb6a5bd1fa152c17813e0f8':
Use sscanf() for parsing tag values.
4ef0f50c2925491e6668ba4242d74579a83fe6ce 09-Sep-2014 Riley Andrews <riandrews@google.com> am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev

* commit 'f41b14855e6fd1bcf2ddaa843d0e177825010023':
Use surfaceflinger for recents thumbnail rotations.
a237e05cd7d86bd322b15b1552dcb93f9f70c0f1 09-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Use sscanf() for parsing tag values." into lmp-dev
e47d5435de839523c1bb05c283eaec5968167db0 09-Sep-2014 Jeff Sharkey <jsharkey@android.com> Use sscanf() for parsing tag values.

Neither strtoll() nor strtoull() can parse the %llx formatted tag
values coming from the kernel. We know the lowest 32 bits will never
be set, so fast-path the 3-character case as 0x0.

Bug: 17365163
Change-Id: I238bbd2830c9335e7ab7a53362d6e12b46e0bcb3
om_android_internal_net_NetworkStatsFactory.cpp
62ce332c141cf7bc7200c4c87d63e395874fc3ec 05-Sep-2014 Svetoslav <svetoslavganov@google.com> Trim unnecessary pages when printing.

A user may request a subset of the document's pages to be printed.
In this case the expectation is that the resulting document does
not include not selected pages. While print serivices can do the
trimming themselves or the printer may do so, moving, potantually
many, redundant pages is inefficient. The real problem is when
saving to a PDF file where the saved file must not have the pages
the user did not select. This change adds shredding of undesired
pages from the PDF before saving it or passing it to a print service.
:
bug:17285994

Change-Id: I7deba535af99457bea3c118202314f0f3812e809
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/pdf/PdfEditor.cpp
2ffa4aabd76353a907ee89a3e0c6f1961237f257 09-Sep-2014 Dan Albert <danalbert@google.com> Merge "Use char16_t for char things."
1d13406538b79785d2d0928689b8d5037e851ecf 22-Aug-2014 Riley Andrews <riandrews@google.com> Use surfaceflinger for recents thumbnail rotations.

+ This removes 30ms of latency on app to home transitions
on volantis.
Change-Id: Ia3747b8f8be0d41b9b3d095753edfe1df185c84d
ndroid_view_SurfaceControl.cpp
f348c15ecf78e9d58b8238ffcf1d78a279e3a862 09-Sep-2014 Dan Albert <danalbert@google.com> Use char16_t for char things.

When compiling in C++ mode, the compiler will complain about conversions
from uint16_t to char16_t. Be consistent in using char16_t for strings.

Change-Id: I052b6176ced635162920b31560052d9a64f92764
ndroid/graphics/TextLayoutCache.cpp
9ee5e7e17f7d65620f21d1a42865981e7bc56593 09-Sep-2014 Mike Lockwood <lockwood@google.com> USB string descriptors are not UTF8, so it is not safe to treat them as such.

Add AndroidRuntime::NewStringLatin1() to convert non-UTF8 strings to Java strings.

Bug: 17427781
Change-Id: I7df1d4e94a7beebc8b1a74c0c0a163b794025ae8
ndroidRuntime.cpp
6b0ed64fb868e64684031558cbdeedcd94d40713 05-Sep-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Add native bridge post-fork initialization

(cherry picked from commit d7746a8b65ee4690427ed798816f970218578fa3)

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
om_android_internal_os_Zygote.cpp
38088d941934b2d19c087fbbeae741f2d1e2c61d 07-Sep-2014 Eric Laurent <elaurent@google.com> am 5a8793f6: am 987ce7dc: am 2ff0e25f: Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev

* commit '5a8793f6d5d6cb28cc6548aa2e3bfca598f9059e':
SoundTrigger: fix capture format in recognition event
b8a8f33602fa34a53247d532ffaf35187ef87f3c 07-Sep-2014 Eric Laurent <elaurent@google.com> am 987ce7dc: am 2ff0e25f: Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev

* commit '987ce7dcb5485e3c593f6384eda91bfbb3f12969':
SoundTrigger: fix capture format in recognition event
8232d822aa97e78e982ed154ac618cde34baac2a 07-Sep-2014 Eric Laurent <elaurent@google.com> Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev
f4eaaadb8cb0e2ff8d1704827883b5a62173311d 06-Sep-2014 Christopher Ferris <cferris@google.com> Merge "Fix use of %llx for sscanf 64 bit values."
39fcca0a503658f91a14b4b1d35dfc4ac9fce9d9 06-Sep-2014 Eric Laurent <elaurent@google.com> SoundTrigger: fix capture format in recognition event

Also include capture format in recognition event
if capture is available for streaming. It was only
included if trigger was contained in event.

Bug: 17409062
Bug: 16731718
Change-Id: I5bf566e6bda57f23c870b4a1293e9b6d15d51e5a
ndroid_hardware_SoundTrigger.cpp
8f779d8401026eab13c33f6634b83cd5784636c0 06-Sep-2014 Jon Miranda <jonmiranda@google.com> am 50162904: am 6eed7489: am 9f7fee39: Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev

* commit '5016290424c15721021c5b7db0fe2abd759ed73d':
Added getStyleAttributes to access all Theme attributes.
739136002fcce46728b39768cc66e3b5028a0c82 06-Sep-2014 John Reck <jreck@google.com> am ce7e1c41: am bf6afec1: am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev

* commit 'ce7e1c41485cbc5dfdb6a11bde01d0d3aa5d15e6':
Disable RT-anim for AnimatorSet
d4b31eb9c4e54937f0d73fad1882e0b817194b01 06-Sep-2014 Jon Miranda <jonmiranda@google.com> am 6eed7489: am 9f7fee39: Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev

* commit '6eed7489395f3dddffbdae8f9b50a93ed630cada':
Added getStyleAttributes to access all Theme attributes.
ab95330acf27b29461070d79cc4a94a6df4cc17c 06-Sep-2014 John Reck <jreck@google.com> am bf6afec1: am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev

* commit 'bf6afec12bf123684c7e4893465dd8e1d13817bd':
Disable RT-anim for AnimatorSet
05cc48292b7c49be7aa11310173013cd3b656e08 06-Sep-2014 Jon Miranda <jonmiranda@google.com> Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev
3207ffe12045ed6d8a2ea04993738cf71320183d 06-Sep-2014 John Reck <jreck@google.com> Merge "Disable RT-anim for AnimatorSet" into lmp-dev
bebb26725ad04f775b040ca7b97ac4b930c0d362 02-Sep-2014 Christopher Ferris <cferris@google.com> Add new header to support 32 bit/64 bit dumps.

Bug: 17319589

(cherry picked from commit 0d3c045a0d48193150689e5924bd04c511380a8a)

Change-Id: I79aa035098115de7b02171a9432ff7e9393328ab
ndroid_ddm_DdmHandleNativeHeap.cpp
042ad633bc68bdda2bb0c50216706d73575a5992 04-Sep-2014 Jon Miranda <jonmiranda@google.com> Added getStyleAttributes to access all Theme attributes.

ViewDebug uses getStyleAttributes to get the attributes, and then gets the
attribute name and value so that Hierarchy Viewer can display it.

Bug: 17407087
Change-Id: I3577e32ae99668383701dc908bb46db14a75c3c4
ndroid_util_AssetManager.cpp
dbeef470960c590bba56890688f20841c628a873 06-Sep-2014 John Reck <jreck@google.com> am 5e2f494e: am fa097eea: am 4a94f088: Merge "Fix race condition" into lmp-dev

* commit '5e2f494ecbfb37f149819b88e38868c51b97fd4e':
Fix race condition
a2197d721d43436db9184384fc64fdca70790107 06-Sep-2014 Chris Craik <ccraik@google.com> am 1bd57d8b: am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev

* commit '1bd57d8b78d214a2bdeb0f11bba1a104b14ea84b':
Add shadow/clipping properties to HierarchyViewer
f5945a0c8bb868f978d9d0d22043a8b44464a86e 06-Sep-2014 John Reck <jreck@google.com> Disable RT-anim for AnimatorSet

Bug: 17317184

Unfortunately this will disable *all* RT animations in a scene,
but we don't have more selective targetting currently

Change-Id: I57e1c0ae43957f45229473bdcdaf34c05825fab7
ndroid_view_RenderNodeAnimator.cpp
07d90c4866568d240bcb4911f1753de2caeeb76a 06-Sep-2014 John Reck <jreck@google.com> am fa097eea: am 4a94f088: Merge "Fix race condition" into lmp-dev

* commit 'fa097eea8620158eef3592376afbcadca39b2e74':
Fix race condition
33f71d9b3276c496c3cf55c7a0cba9359528e368 06-Sep-2014 Chris Craik <ccraik@google.com> am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev

* commit '7ec137b7f9edb41117f822ef16bdaf5accbcc31c':
Add shadow/clipping properties to HierarchyViewer
4e849178ef35687d0ce679487d8cfb6c5521fe3b 06-Sep-2014 John Reck <jreck@google.com> Merge "Fix race condition" into lmp-dev
83eb430270a8de2e231639d6498f6451b9958fc6 06-Sep-2014 Chris Craik <ccraik@google.com> Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev
ec845a215e343cdb3b2e4c7b6aff7b24beb0236b 06-Sep-2014 John Reck <jreck@google.com> Fix race condition

Bug: 17372309

AnimationContext::startFrame() happens both with and without
the UI thread lock. Pass the TraversalMode into it so
that ThreadedRenderer's subclass can correctly decide
when it is safe to push over mPendingAnimatingRenderNodes, as doing
so outside of the lock is Very Bad.

Change-Id: Ife5dd3a2b46b0a207cd9234c159a674afdbf5efd
ndroid_view_ThreadedRenderer.cpp
5c75c52e048a01c23b18f4e31ae624b5fe43e23c 05-Sep-2014 Chris Craik <ccraik@google.com> Add shadow/clipping properties to HierarchyViewer

bug:15777980

Change-Id: Ic3d24326f585d2d2b9889486f0ed322eb98b5af8
ndroid_view_RenderNode.cpp
8f0b7cdd43c8a1021b9dda6afa306d140284d2c9 05-Sep-2014 Christopher Ferris <cferris@google.com> am a6905f59: am efc1c140: am 3110fe01: Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev

* commit 'a6905f596ef1ff344a5646fb62e709c23b91809b':
Add new header to support 32 bit/64 bit dumps.
be348c94b38d908c2a826431db9538c09b0ed79e 05-Sep-2014 Christopher Ferris <cferris@google.com> am efc1c140: am 3110fe01: Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev

* commit 'efc1c1406d11cd9a61851eb3262a0f48fc1c3d0b':
Add new header to support 32 bit/64 bit dumps.
982f21fec206e1e8100dd0739bb7c5a79a13dc84 05-Sep-2014 Christopher Ferris <cferris@google.com> Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev
248b369661f412bfac9b9b117d6911106558c1a0 05-Sep-2014 Anwar Ghuloum <anwarg@google.com> Merge "Timing Hacks DO NOT MERGE" into lmp-dev
629dc1801331ce89e8ee0ff7ee5dcde1d7512417 04-Sep-2014 Anwar Ghuloum <anwarg@google.com> Timing Hacks DO NOT MERGE

Let's submit to see any lingering effects.

Bug: 17310019
Change-Id: I791bceec0b6aa8b80ac4e6c582a10c3f0ec7a906
om_android_internal_os_Zygote.cpp
3b2dc9e2253671fd8432fb0b1e18a0b5a38c4dea 02-Sep-2014 Christopher Ferris <cferris@google.com> Add new header to support 32 bit/64 bit dumps.

Bug: 17319589
Change-Id: I2ca8150611794f16c148b2899e16b0a9ff77e686
ndroid_ddm_DdmHandleNativeHeap.cpp
c9ee16c3b551003992f65e3bb4f1705ea5e96ab8 05-Sep-2014 Andreas Gampe <agampe@google.com> am 3c34df69: Merge "resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp

* commit '3c34df69f398a540926854a4a27ffe8927e1a6db':
Frameworks/base: Add native bridge post-fork initialization
dc84c6ca86290393fec2bb730f125575ee9e168e 05-Sep-2014 Andreas Gampe <agampe@google.com> resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp

Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37
aec67dcc02362e4d2f7641c6605405b839bd1bd4 03-Sep-2014 Andreas Gampe <agampe@google.com> Frameworks/base: Add native bridge post-fork initialization

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
om_android_internal_os_Zygote.cpp
c70b5e66f7095d82465887b951aa7e0b79b4c6a9 04-Sep-2014 Christopher Ferris <cferris@google.com> Fix use of %llx for sscanf 64 bit values.

Change-Id: Ie7a0e243dfcf24722783fe7d697a1412de7efe68
om_android_internal_net_NetworkStatsFactory.cpp
e74166a618226f5d24f910b0362f16ea09ba9026 04-Sep-2014 John Reck <jreck@google.com> am 51c4d458: am 7499abd2: am 73339a99: Fix some wrong-thread issues around animator management

* commit '51c4d458b0fcb9b9cc393ca89afcc44c0fb80c1d':
Fix some wrong-thread issues around animator management
cc7c225f1b83e62823b68059eac81cbfdc930340 04-Sep-2014 John Reck <jreck@google.com> am 7499abd2: am 73339a99: Fix some wrong-thread issues around animator management

* commit '7499abd2d4604e0bdbeb91ed6c7e0155fb51dc6b':
Fix some wrong-thread issues around animator management
e2478d45ccbe5b6abb360ac9d44771b5f4a50bde 04-Sep-2014 John Reck <jreck@google.com> Fix some wrong-thread issues around animator management

Bug: 17372309

Fixes a case where UI thread and RT thread both used the same method
which wasn't safe for either of them.

Adds additional assertions & logging in unusual circumstances to
try and track down where the issue is occuring from.

Change-Id: I93d31a6fd0c5927259b67bdf96a475944226eee6
ndroid_view_RenderNode.cpp
ndroid_view_ThreadedRenderer.cpp
385052e24bc66b1cd7c192a0d15e027f0100b307 03-Sep-2014 John Reck <jreck@google.com> am e31c5e7e: am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev

* commit 'e31c5e7e07556d6b8775ab05cb61683b78c9bb4e':
Have destroy call freePrefetchedLayers
842bb5be5843e1981cc4d9e22b2617f83d7a5bdb 03-Sep-2014 John Reck <jreck@google.com> am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev

* commit '0f6c29dc47d4a9607e79480460a67837c527fd56':
Have destroy call freePrefetchedLayers
17035b0211a3c9d45ea46a99217a6acbe76e8fbe 03-Sep-2014 John Reck <jreck@google.com> Have destroy call freePrefetchedLayers

Bug: 17208461

There's a potential race condition between HardwareRenderer.destroy()
being called (which calls destroyCanvasAndSurface()) and the renderer
being finalized (which is what calls freePrefetchedLayers), during which
time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL
context.

Fix this race condition by moving stopDrawing() and freePrefetchedLayers()
into destroyCanvasAndSurface() where they should have been in the first
place.

Also, if we hit the assertion failure, dump the current state of
Caches to try and provide more context for the failure.

Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6
ndroid_view_ThreadedRenderer.cpp
a8a7a3fe40dc5ca1d2a47181950abe0fa53cd3b3 03-Sep-2014 Mathieu Chartier <mathieuc@google.com> am 2423b134: am d3f31288: am b980f460: Merge "Add missing null check to ninePatchInsets" into lmp-dev

* commit '2423b1342dad08dbf5a0d09e108aeac770ea005e':
Add missing null check to ninePatchInsets
a31a411462a4e8bb5d8e699702fb9bdb37e77674 02-Sep-2014 Mathieu Chartier <mathieuc@google.com> am d3f31288: am b980f460: Merge "Add missing null check to ninePatchInsets" into lmp-dev

* commit 'd3f312885208afca1d195fd5ac9059dd66dcb689':
Add missing null check to ninePatchInsets
43a1d02f82444ccee28f6424c638d5a2030fb78a 02-Sep-2014 Robert Phillips <robertphillips@google.com> Merge "Remove use of default SkPicture ctor"
a08d10fa7051668b629d561bb8411e34d28fdabf 30-Aug-2014 Mathieu Chartier <mathieuc@google.com> Add missing null check to ninePatchInsets

ninePatchInsets could be null after allocation, this possibly caused
a SIGABRT in GC or check_jni failure.

Bug: 17323232

Change-Id: Icd7e3819032e8e999d3c1483bf261bb39b3fe9e4
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
d21fb2fe933ffec36c7a1c65c00454b0a275c56a 28-Aug-2014 John Reck <jreck@google.com> am 7a86c785: am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev

* commit '7a86c7859b2ccdb4f424c4b9bd946ebf0b4cdf3f':
Animator stuff
59f71093feec63553f44cfb336bb2499c3ea8a7c 28-Aug-2014 John Reck <jreck@google.com> am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev

* commit '969f3860d940bdcaa66441d561448cca92ebd8ea':
Animator stuff
4c5a27b5f667ebc7cb2b188655820ad3fddedb52 28-Aug-2014 John Reck <jreck@google.com> Merge "Animator stuff" into lmp-dev
119907cd2575c56b1ebf66348b52e67aaf6a88d8 14-Aug-2014 John Reck <jreck@google.com> Animator stuff

Bug: 17228458

Change-Id: Id884a429a512f9cd2be0ed16dbd0f10e92b4440d
ndroid_view_RenderNode.cpp
ndroid_view_RenderNodeAnimator.cpp
ndroid_view_ThreadedRenderer.cpp
3aed587344d9f0cb0eb47ddac4c035e31ec62917 27-Aug-2014 Calin Juravle <calin@google.com> am 54d3fbb1: am d5f23f2e: am 2d3571cc: Merge "Fix the length of a profiler system property"

* commit '54d3fbb17b63785740257b9920bfcd52fab9ad24':
Fix the length of a profiler system property
6fb044412400fb786ca6dd01501962335d8fb041 27-Aug-2014 Raph Levien <raph@google.com> am 792877b1: am 6dcfc268: am b73047ff: Merge "New weight-aware font config" into lmp-dev

* commit '792877b1765687f1f8c748aa063d99b08ea5c99c':
New weight-aware font config
50f23d75f7230698ee421f151cfbe38824d1275d 27-Aug-2014 Raph Levien <raph@google.com> am 6f2e4a9f: am bdd95259: am 145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev

* commit '6f2e4a9f8ae13526cdd73ee28d4927197ada5629':
Fix incorrect return value on missing glyph
eee5254d783d80fd2b9bc5881b97931ec698a914 27-Aug-2014 Calin Juravle <calin@google.com> am d5f23f2e: am 2d3571cc: Merge "Fix the length of a profiler system property"

* commit 'd5f23f2ec0769248d00cfd6e9049cfa354492cce':
Fix the length of a profiler system property
9aa7028d257bef383754820df4e0682c20c9a861 27-Aug-2014 Raph Levien <raph@google.com> am 6dcfc268: am b73047ff: Merge "New weight-aware font config" into lmp-dev

* commit '6dcfc268954e2f1f23ccdfda4e6c6aa2c7c5a62d':
New weight-aware font config
648e94c2565362f3f9739c867814aaaa66664692 27-Aug-2014 Raph Levien <raph@google.com> am bdd95259: am 145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev

* commit 'bdd95259eb3ba6614734cd5947773cf61944c8ff':
Fix incorrect return value on missing glyph
2d3571cc17a5a6b1072951227d889ce14a3f88cf 27-Aug-2014 Calin Juravle <calin@google.com> Merge "Fix the length of a profiler system property"
772d576b97ac95cf9ed6cef365470e37fa4f4fda 27-Aug-2014 Raph Levien <raph@google.com> Merge "New weight-aware font config" into lmp-dev
2a5fab9d476f434818ba67d2b8b77208e881f0c1 27-Aug-2014 Raph Levien <raph@google.com> Merge "Fix incorrect return value on missing glyph" into lmp-dev
b8082603b60b50b42cf44e3d14f25ccb596fc069 27-Aug-2014 Raph Levien <raph@google.com> Remove duplicate line breaking

Fix for bug 17297223 "minikin crashing after boot on hammerhead in
master"

Due to improperly merged code, the line breaker was being run twice,
causing two copies of the layout. That in turn caused text crashes
because the line ends are not monotonic.

Change-Id: Ieaa702c530d6e9b2a90fb52a4ad716a9ddb567e7
ndroid_text_StaticLayout.cpp
4d033e1c44c1b94ea5311713b8cc8bfb56bdcdd2 27-Aug-2014 Wei Jin <wejin@google.com> Fix the length of a profiler system property

This patch changes the profiler system property
"dalvik.vm.profile.max-stack-depth" to "dalvik.vm.profile.stack-depth"
so that the length of the option is less than PROP_NAME_MAX.

Bug: 17294224
Change-Id: I5723883d7fa38dd5eaa276182e5d680d152cedad
ndroidRuntime.cpp
d71de10c4207617a8462d8b3ba893416173016ed 27-Aug-2014 Calin Juravle <calin@google.com> Update the handling of the native bridge property.

ro.dalvik.vm.native.bridge is expected to be always be set. A value of
"0" means that the native bridge is disabled and that no value should be
passed to the runtime.

Bug: 17104449

(cherry picked from commit 831bd75b2bbc126f02578a967e925271b9cac6d3)

Change-Id: Ib483ac8e96bdc66af2725815807d4deb36fb36ab
ndroidRuntime.cpp
0fcd10fc2aa6b36fcdb1ae1fff61eb402ea40ab1 27-Aug-2014 Calin Juravle <calin@google.com> am d911a3bd: am 0a63f754: am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev

* commit 'd911a3bd0f95721e0fcf26f61cfa517bbee359b9':
Update the handling of the native bridge property.
f924c027d3b34561e3008c3ef7a4e9f047bfaebc 27-Aug-2014 Calin Juravle <calin@google.com> am 0a63f754: am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev

* commit '0a63f754e6f192539be16f59bda3839aa5d24641':
Update the handling of the native bridge property.
9b5112c36b5163925cb303c0cd016bf4115c5800 27-Aug-2014 Calin Juravle <calin@google.com> Merge "Make native bridge property read-only."
531dab6d3a2ffcd13684367659dfd0296f86cfe5 27-Aug-2014 Raph Levien <raph@google.com> Fix incorrect return value on missing glyph

The GetGlyph function returns a boolean indicating whether the glyph
exists in the font. However, we were testing the pointer, so the test
would always succeed even if the glyph was missing. This interfered with
fallback algorithms for rendering compatibility characters.

Bug: 15816880
Bug: 16856221
Change-Id: I95cd45bb8f5e8ddf74cf23e6e624fbf30172e00a
ndroid/graphics/MinikinSkia.cpp
117cbebe810613d4a6de034f02652cdbbfef4cde 25-Aug-2014 Raph Levien <raph@google.com> New weight-aware font config

Parse new fonts.xml config file, and resolve weight selection based on
the base weight of the font (as defined by a weight alias specified in
the config file) and the requested bold flag. This change improves the
appearance of bold spans for alternate weights of Roboto.

In addition, this patch enables weight selection for fallback fonts.
For example, if an additional font with a weight of 100 is added to the
Hebrew font family in the fallback list, then requesting
"sans-serif-thin" would select that font for Hebrew text.

Bug: 14538154
Change-Id: I99a04fad4f7bf01c75726e760d42735dd9003496
ndroid/graphics/FontFamily.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/TypefaceImpl.h
be20ed41f7b8a8879da733c2b5bce85bcb30c76b 27-Aug-2014 Calin Juravle <calin@google.com> Update the handling of the native bridge property.

ro.dalvik.vm.native.bridge is expected to be always be set. A value of
"0" means that the native bridge is disabled and that no value should be
passed to the runtime.

Bug: 17104449
Change-Id: I94e60c68e732abdab18f14f960d3b80f32048a79
ndroidRuntime.cpp
8efef2162802feebdd31f2d269df3e410970d245 26-Aug-2014 Calin Juravle <calin@google.com> am 005b7828: am ad7a10cd: am 0bc3cd87: Merge "Make native bridge property read-only." into lmp-dev

* commit '005b7828ee122eeb65e87f12e28a283a2809a586':
Make native bridge property read-only.
a4ed6aeee41d33994a74382ddd0cce9429a0de1f 26-Aug-2014 Calin Juravle <calin@google.com> am ad7a10cd: am 0bc3cd87: Merge "Make native bridge property read-only." into lmp-dev

* commit 'ad7a10cd74a36ee3e7b1a143f659a6ebb0517b7f':
Make native bridge property read-only.
4db289eb54a91d269520fe8a36ce793d56f1c03d 26-Aug-2014 Calin Juravle <calin@google.com> Merge "Make native bridge property read-only." into lmp-dev
685a12b4466e67f944afd2a26ea11444fb528124 18-Aug-2014 Calin Juravle <calin@google.com> Make native bridge property read-only.

Bug: 17104449

(cherry picked from commit 53db6ae7819177abb9df156b269726a69a8c72df)

Change-Id: I926356f1e472a20d571e40c0c7dbb9c5a66a44a9
ndroidRuntime.cpp
7dd9776fa82ff86d4086a3ba61b57f0db00ae560 26-Aug-2014 John Reck <jreck@google.com> am d73a1aa3: am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev

* commit 'd73a1aa3b97d9cd9792dec4a58ab6150b76afb31':
DO NOT MERGE Copy shaders
1698297daf8068bc9e6971d43744d48f1672bab2 26-Aug-2014 John Reck <jreck@google.com> Merge "DO NOT MERGE Copy shaders" into lmp-dev
04db09c310205985df2be1109ade37e687a8144a 26-Aug-2014 Ruben Brunk <rubenbrunk@google.com> am b5b3beea: am 4d4e16a0: am 34b23108: Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev

* commit 'b5b3beea27c4c447f5bd6f3c32eb03a532d52f3d':
camera2: Fix number of DNG NoiseProfile coeffs.
36340182c0ea02221ec03157c9f06ab3fff8c422 26-Aug-2014 Ruben Brunk <rubenbrunk@google.com> am 4d4e16a0: am 34b23108: Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev

* commit '4d4e16a094d674d5a6f62ef8ec3b5671cc24f002':
camera2: Fix number of DNG NoiseProfile coeffs.
2302ab01826d1af094776436dcea1afd3283d71d 26-Aug-2014 Chris Craik <ccraik@google.com> am 9aa0af14: am b0640084: am 6210c6dc: Merge "Create z reordering boundaries around dispatchDraw" into lmp-dev

* commit '9aa0af1499694fce9d9404130579c540125072ac':
Create z reordering boundaries around dispatchDraw
bfc122aa9070750a893dcbc5067bec423f665488 26-Aug-2014 Raph Levien <raph@google.com> am c926bcf7: am a8eb3b2e: am 66cb62c6: Merge "Preserve paint parameters in Paint copy constructor" into lmp-dev

* commit 'c926bcf740fc4448953bcdeaf4e7636c690872eb':
Preserve paint parameters in Paint copy constructor
6d388af85379f4d534002118caa9ba4f7812e049 26-Aug-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev
c53e7c8578f02848507951a06947342885809762 26-Aug-2014 Chris Craik <ccraik@google.com> am b0640084: am 6210c6dc: Merge "Create z reordering boundaries around dispatchDraw" into lmp-dev

* commit 'b06400847cdfae6da8d3d4d5b52e2ff29d06cb7a':
Create z reordering boundaries around dispatchDraw
8433bf71907bc52c6fb70fd06ee8902b6e023b51 26-Aug-2014 Raph Levien <raph@google.com> am a8eb3b2e: am 66cb62c6: Merge "Preserve paint parameters in Paint copy constructor" into lmp-dev

* commit 'a8eb3b2ed7e91d601fe4ec0e763b1e8ca8ecbc13':
Preserve paint parameters in Paint copy constructor
8afd0f245cc0c4a0366f39f41b5f78e47ee83be3 22-Aug-2014 Chris Craik <ccraik@google.com> Create z reordering boundaries around dispatchDraw

bug:16012254

This means rendernodes with a Z will no longer be drawn at the end of
their parent's DisplayList, but at the end of the associated reorder
region (DisplayListData::Chunk).

Change-Id: Ia033fee9d9a4db567b2a8d5e90fc57a4d0a64544
ndroid_view_GLES20Canvas.cpp
c1469f39b571f5660346fc837ac30b19d7651a43 25-Aug-2014 John Reck <jreck@google.com> DO NOT MERGE Copy shaders

Bug: 16733996

Change-Id: I84afc1b24a23dd6ddf5ab48fb2bfcbe779f8d3e3
ndroid/graphics/Shader.cpp
d70132c373eee01b4e0a35250bd4246672e7a02e 23-Aug-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix number of DNG NoiseProfile coeffs.

Bug: 16369384
Change-Id: I3ceca5ed3489120664990c0d057e6537b357c788
ndroid_hardware_camera2_DngCreator.cpp
908040534dfc9f227c60dbf170c6b27a1ff123d8 25-Aug-2014 Raph Levien <raph@google.com> Preserve paint parameters in Paint copy constructor

The copy constructor for Paint was setting default values for additional
parameters, rather than copying them from the original object, resulting
in incorrect locale in the software text drawing path.

Fix for bug 17149910 "Chinese font is used on IME even if the system
language is Japanese"

Change-Id: I25f377ce4e0ea66946a27ea46a2db524872ae36f
ndroid/graphics/PaintImpl.cpp
4e93166b7d347bf8f3dc42afa4ef056113e4f7c8 23-Aug-2014 Pat Tjin <pattjin@google.com> am 68d6b8e7: am dce17b0f: am e0eb27c6: Merge "SurfaceControl: free ref when not used anymore" into lmp-dev

* commit '68d6b8e7992d13956f0ad64220082bd6a2b1d6f8':
SurfaceControl: free ref when not used anymore
59935635a2bb95bd940821bd89d4e59fbdfcdded 23-Aug-2014 Pat Tjin <pattjin@google.com> am dce17b0f: am e0eb27c6: Merge "SurfaceControl: free ref when not used anymore" into lmp-dev

* commit 'dce17b0faee9594b31839502966c03504d9684c0':
SurfaceControl: free ref when not used anymore
5fa3f3a995ba5bd86e460b1b5f72b2f1ada699fb 23-Aug-2014 Pat Tjin <pattjin@google.com> Merge "SurfaceControl: free ref when not used anymore" into lmp-dev
3b68f5fb3ff2558fb1d14dd4cf86eec8d3fd670e 22-Aug-2014 John Reck <jreck@google.com> am 55cf1206: am 661e8029: am 673b5523: Merge "Revert immutable Shader change" into lmp-dev

* commit '55cf1206cde733767caa25fb8d9e8ae35ff4e464':
Revert immutable Shader change
a5f9567f2e95bcb0eeb3033ee0d8acf81e02ec3d 22-Aug-2014 John Reck <jreck@google.com> am 661e8029: am 673b5523: Merge "Revert immutable Shader change" into lmp-dev

* commit '661e8029fd1e74f4a452ba57a21ef0912cf0df53':
Revert immutable Shader change
5474f3396a963196fa6dc05add85429e2358ec1a 22-Aug-2014 Thierry Strudel <thierry.strudel@intel.com> SurfaceControl: free ref when not used anymore

C standard does not ensure order in which arguments are evaluated leading to
faulty behavior in x86 case.

Bug: 17206275

Change-Id: I6553c55bcf646d93413135aed733f20b91852735
Signed-off-by: Thierry Strudel <thierry.strudel@intel.com>
ndroid_view_SurfaceControl.cpp
01edef10b9724fa5607d7918addc31a3b0c991dc 22-Aug-2014 John Reck <jreck@google.com> Revert immutable Shader change

Bug: 16733996

Change-Id: I51686aaf8f6ae8d0e390e298ad70f98f81c5f555
ndroid/graphics/Shader.cpp
f1a76832ad1d4b8c082fce20f9d8ac4ba5ab597f 22-Aug-2014 Lorenzo Colitti <lorenzo@google.com> am 7f42fe30: am f325858e: am fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev

* commit '7f42fe3008fa6fe203da776bc118aa5f57d8829e':
Rework the per-network URL API.
18bcd9561d7b24c3a3ad6a802710310c9b577ebd 22-Aug-2014 Lorenzo Colitti <lorenzo@google.com> am f325858e: am fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev

* commit 'f325858e128c77791d245a9a54aec0dbfc8665f0':
Rework the per-network URL API.
9f1274b7e43d14c7e3a42148ebfda3905fec8b06 21-Aug-2014 Lorenzo Colitti <lorenzo@google.com> Rework the per-network URL API.

This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
ndroid_net_NetUtils.cpp
e904b1398d516c2901d46de212438d479aff4d9d 21-Aug-2014 Chris Craik <ccraik@google.com> am 0b44762b: am 08ae94e2: am d093d695: Merge "Add bounds checking to nine patch scaling" into lmp-dev

* commit '0b44762bf7999b81d5d6b1b119ffb781342c8429':
Add bounds checking to nine patch scaling
70a0be6b751925386a86d6658e410761408f34d9 21-Aug-2014 John Reck <jreck@google.com> am 735164ad: am 17ed6e74: am 876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev

* commit '735164ad8b9c969227b3abe3aab8545f7172c29a':
Implement full View.buildLayer
16b77f116fd6df12505f862591f8b82fb614b942 21-Aug-2014 Chris Craik <ccraik@google.com> am 08ae94e2: am d093d695: Merge "Add bounds checking to nine patch scaling" into lmp-dev

* commit '08ae94e2d2f4643c40f7be24e72202132fb99e9e':
Add bounds checking to nine patch scaling
e4ed4f74d1ab69548f68617863ba5222ed151276 21-Aug-2014 John Reck <jreck@google.com> am 17ed6e74: am 876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev

* commit '17ed6e74ce560916d4a06198d4f6446562d9db34':
Implement full View.buildLayer
5800532cf475bbbdcf2bb7285d83238980d67b22 21-Aug-2014 Mathieu Chartier <mathieuc@google.com> am bc3bd0a4: am be39e991: am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit 'bc3bd0a4e67a00bcde97f297e6d8743bcac7f2df':
Clean up ExceptionOccurred.
2d84cdb414fe15fb8d12a870e76b1e9cfdb2e10b 21-Aug-2014 Chris Craik <ccraik@google.com> Merge "Add bounds checking to nine patch scaling" into lmp-dev
cbed4e523b01633414f1a5ccdae180b26df7799e 21-Aug-2014 Mathieu Chartier <mathieuc@google.com> am be39e991: am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit 'be39e99187eec88222722e9ec4c91f1744731cf4':
Clean up ExceptionOccurred.
bd8db2e87e16900ff9b87937d3ccff6a50bd5b2a 21-Aug-2014 Chris Craik <ccraik@google.com> Add bounds checking to nine patch scaling

bug:17114103

Better handle the case, when scaling the divs in a nine patch, where
divs fall outside of the bounds of the bitmap.

Change-Id: I244b9c45b938c2a15f29e4563a86825ee9439b5f
ndroid/graphics/BitmapFactory.cpp
98671c34fa00a79c62ff0d9d874428bed1f86e92 20-Aug-2014 Mathieu Chartier <mathieuc@google.com> Clean up ExceptionOccurred.

Use ExceptionCheck before ExceptionOccurred since ExceptionCheck
doesn't acquire any locks and is faster.

Change-Id: Ibd87fd1e33b339bd2a6effa1d20d3253c8a61bdc
ndroid_net_LocalSocketImpl.cpp
ndroid_os_MessageQueue.cpp
ndroid_os_SELinux.cpp
ndroid_server_NetworkManagementSocketTagger.cpp
ndroid_util_Binder.cpp
om_android_internal_os_ZygoteInit.cpp
aa740d3fdcf2fb67d6051fee1e72b87f7ca249a6 19-Aug-2014 Lorenzo Colitti <lorenzo@google.com> am 5eb792fc: am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev

* commit '5eb792fcdebc92a872c17a54310db3de60e7d620':
Stop using LinkProperties for static configuration.
56d4c18e2f5f4780b900f30c3f8cc52a25714d54 19-Aug-2014 Lorenzo Colitti <lorenzo@google.com> am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev

* commit '45b565ffdbd2962c336f385d80d6516cd1cc489a':
Stop using LinkProperties for static configuration.
7380d866e53849a225cfee562a8049fae8d48035 18-Aug-2014 Elliott Hughes <enh@google.com> am 72d3cef8: am 708da446: Merge "Use gettid directly in frameworks JNI."

* commit '72d3cef8675b4a8eced300adeb148a835b7fdd57':
Use gettid directly in frameworks JNI.
53db6ae7819177abb9df156b269726a69a8c72df 18-Aug-2014 Calin Juravle <calin@google.com> Make native bridge property read-only.

Bug: 17104449
Change-Id: If2e2a0c2cd1783883ef34d25a527ee93f9eadfa5
ndroidRuntime.cpp
3e8249568cc428296ac76c7ddce3f0382d40fe5b 20-Aug-2014 John Reck <jreck@google.com> Implement full View.buildLayer

Bug: 17152292

Change-Id: Ia3cc2aadf72fe14517f50762fc634794df51ad5a
ndroid_view_ThreadedRenderer.cpp
0a82e80073e193725a9d4c84a93db8a04b2456b9 30-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Stop using LinkProperties for static configuration.

LinkProperties can represent way more complicated configurations
than what we can actually apply to interfaces. This makes it
error-prone to use it to represent static configuration, both
when trying to apply configuration coming from LinkProperties
and when trying to save configuration from current
LinkProperties.

Instead, move static configuration (IPv4 only, since we don't
support static IPv6 configuration) into a separate
StaticIpConfiguration class.

Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
ndroid_net_NetUtils.cpp
06451fe081d5ae79121a6f301475c7042f7f3a5d 18-Aug-2014 Elliott Hughes <enh@google.com> Use gettid directly in frameworks JNI.

Bug: 17048545
Change-Id: I1cd45d85368c799b75f76e778722979cbbb68ed2
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
6f7344ff0bcc0352dda82ef2771157508e92c913 18-Aug-2014 Anish Athalye <aathalye@google.com> Merge "Add optimizing line breaker"
07723f3c6f44d0617eac7fb0f8bdd42ce072016a 18-Aug-2014 Elliott Hughes <enh@google.com> am dff21627: am 72d3cef8: am 708da446: Merge "Use gettid directly in frameworks JNI."

* commit 'dff21627fdc28d3fe8640c7dd3059cf8845f87b3':
Use gettid directly in frameworks JNI.
969e7b949633baebd3f6090a60d622ee475a5b22 22-Jul-2014 Anish Athalye <aathalye@google.com> Add optimizing line breaker

Change-Id: I1eabc863e7f027c4c19a9ab23e561c774c721993
ndroid_text_StaticLayout.cpp
c8f9e6218681640d5f384c12edf06619be56a583 22-Jul-2014 Anish Athalye <aathalye@google.com> Implement line breaking in native code

The main purpose for this change is to prepare for adding support for
alternative line breaking algorithms (such as optimal line breaking).

The existing implementation of line breaking was intertwined with
measurement, so it wasn't structured in a way such that other line
breaking algorithms could be easily added. In addition to this,
algorithms (such as optimal line breaking) are usually fairly complex
and computation-intensive, so it is advantageous to implement them in
native code.

This has several other advantages:

* Unlike the Java code in the previous version of generate(), this
implementation separates line breaking from measurement. This
makes it easier to understand and modify the line breaking process
without affecting measurement (and vice versa).

* This native implementation of greedy line breaking is identical to
the Java version in terms of functionality, and it is similar in
terms of performance, depending on the use case. The performance
gains from this change are not significant due to increased JNI
overhead. However, this change is a step in the right direction in
terms of increasing performance. Once more code moves to C++,
there will be fewer JNI crossings per layout call and less data
will be passed from Java to C++, resulting in better performance.

This change moves line breaking from Java to native C++ code. Inspired
by the "Breaking Paragraphs into Lines" paper by Knuth and Plass (1981),
we express the line breaking problem in terms of 'box', 'glue', and
'penalty' primitives, along with a few others. Our implementation
differs in a couple ways:

* We do not want to clip text when words are wider than the view, so
we add a new primitive type to represent break opportunities
between letters. These breaks are avoided whenever possible, but
when single words do not fit on lines by themselves, they can be
broken so the entire word is visible.

* We have to support tab characters, along with user*specified tab
stops, so we add a new primitive type for that purpose.

* We are left*aligning text, and so we are not using shrinking /
stretching glue.

* We do not support hypenation, so we do not use penalties that have
widths.

Change-Id: Ia22d1d1275ef26ff3d7b41ee2658e4db525a0305
ndroid_text_StaticLayout.cpp
4ee1076613780d91b29d28defcd364ddb20ab1e6 16-Aug-2014 Ruben Brunk <rubenbrunk@google.com> am ad3aaea5: am 8d392ff3: am f1aea7f9: Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev

* commit 'ad3aaea5a4fd0526637e5ebc8863e932b6f36b19':
camera2: Add jpeg metadata for LEGACY shim.
d927d37af782ccbc56d6e7cc64136470f6a731c1 16-Aug-2014 Ruben Brunk <rubenbrunk@google.com> am 0db517c8: am 8b90513e: am b62eea57: camera2: Fix shim aspect ratio scaling.

* commit '0db517c8fcc811d8871ce439a5c3a81d80511424':
camera2: Fix shim aspect ratio scaling.
a9bc3559109836efe7479a3279713bd58810b153 15-Aug-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix shim aspect ratio scaling.

Bug: 16494207
Change-Id: I4bd40dee1caaf8c83a0853d48d44cc97151f9b41
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
e364aecf17124e0ae443bf9fe0e1b7c588a0d25a 16-Aug-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev
1dc1326eaedd11ffd8f85927b8f0195f4f7598d3 31-Jul-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Add jpeg metadata for LEGACY shim.

Bug: 15116722
Change-Id: I8abef3ca9a47b2f93978a758aa59c3b915a7e000
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
cc55b21884c9763edf97a1752e0d69b3fb753ace 15-Aug-2014 Brian Carlstrom <bdc@google.com> am 0f1a985e: am 04996e70: am 7fca8e30: Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev

* commit '0f1a985e9c1979c1e9187806eacc6fb562700166':
Disable verification based on vold.decrypt. [frameworks/base]
21d1b115a1d79a00991dddb883d9fb3e1863e35c 15-Aug-2014 Brian Carlstrom <bdc@google.com> Merge "Disable verification based on vold.decrypt. [frameworks/base]"
1567d2f0b71ccb3c9e0af3d2f4c258721624a8c1 15-Aug-2014 Brian Carlstrom <bdc@google.com> Disable verification based on vold.decrypt. [frameworks/base]

Bug: 15165413

(cherry picked from commit 6d05323e97e98022be7fc1a803115e2628f2d1f4)

Change-Id: I5454488a9db0fd70c64e8fc78b622c56ea96e6fd
ndroidRuntime.cpp
a223cd8d1d1f71feff39fbf06354db4a89d8cd2e 15-Aug-2014 Narayan Kamath <narayan@google.com> am 07d033e9: am 5fb6ef85: am 09e5ce88: Merge "Remove system_server classes from the boot image." into lmp-dev

* commit '07d033e91b824417da9a605f8d0fabdb1d167b67':
Remove system_server classes from the boot image.
1982323f6569b99ac436e112d39b9b368d22a95a 15-Aug-2014 Calin Juravle <calin@google.com> am a3c567a7: resolved conflicts for merge of 32db2c97 to lmp-dev-plus-aosp

* commit 'a3c567a7f32c91b6ea7f46d331340a1722063fdf':
Integrate NativeActivity with NativeBridge interfaces
2737c914f789d5630a5579df4a06b5cd82b661d5 15-Aug-2014 Narayan Kamath <narayan@google.com> am 5fb6ef85: am 09e5ce88: Merge "Remove system_server classes from the boot image." into lmp-dev

* commit '5fb6ef85d5700ab1ceef6459d2b28da618b54717':
Remove system_server classes from the boot image.
6e0d80bac5901aad8356f6cead96a2dc86dd4a17 15-Aug-2014 Calin Juravle <calin@google.com> resolved conflicts for merge of 32db2c97 to lmp-dev-plus-aosp

Change-Id: I3337fdd1ed0fcc5022f98629aea59a97aa6dff28
03c866020b46079afe895dd90f2d60bda06dbe05 28-Jul-2014 Yong WU <yong.wu@intel.com> Integrate NativeActivity with NativeBridge interfaces

Bug: 16884833

Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
ndroid.mk
ndroid_app_NativeActivity.cpp
261e240c05a32aec20022ae3f527dafea5f3f0d8 15-Aug-2014 Brian Carlstrom <bdc@google.com> Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev
df6c83fa7bbef0f69fe2ed0a338ac8a798c30f42 15-Aug-2014 Brian Carlstrom <bdc@google.com> Disable verification based on vold.decrypt. [frameworks/base]

Bug: 15165413
Change-Id: I7aff8e2a2890971fe97769d42121c207dc36aa7c
ndroidRuntime.cpp
508e768d956384d09c755c43c019559ebd481f2c 15-Aug-2014 Calin Juravle <calin@google.com> Merge "Integrate NativeActivity with NativeBridge interfaces"
ec923978943c0698cdc45dbe59f373fb849b9518 15-Aug-2014 Calin Juravle <calin@google.com> Merge "Integrate NativeActivity with NativeBridge interfaces" into lmp-dev
abd76d0a091e283117b8aeb642833b8869ea81bf 28-Jul-2014 Yong WU <yong.wu@intel.com> Integrate NativeActivity with NativeBridge interfaces

Bug: 16884833

(cherry picked from commit I73aab8e212860ba5aee9444d801806d3da326a41)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
ndroid.mk
ndroid_app_NativeActivity.cpp
29564cd24589867f653cd22cabbaac6493cfc530 07-Aug-2014 Narayan Kamath <narayan@google.com> Remove system_server classes from the boot image.

We set the system_server classpath in the environment
(like we do with BOOTCLASSPATH). After the zygote forks
the system_server, we dexopt the classpath (if needed)
and then launch the system server with the correct
PathClassLoader. This needed several small / medium
refactorings :

- The logic for connecting to installd is now in a separate
class and belongs in the system_server.
- SystemService / SystemServiceManager have now moved to
classes.jar. They are only used from there, and since they
use Class.forName, we want them to be loaded by the
system_server classloader, and not the bootclassloader.
- BootReceiver now moves to frameworks.jar, because it is
used by ActivityThread and friends.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
ndroidRuntime.cpp
021a3443c6f86ece7f59fa9291cc0ba70ba71b1f 07-Aug-2014 Mike Reed <reed@google.com> SkBitmap::Config is deprecated

Change-Id: I0bbd929074474ae3c1d497c2f645417e4876d9e3
ndroid/graphics/NinePatchPeeker.cpp
3e1902504979b9b456a14dffa6507ee2d9ea3d6a 12-Aug-2014 Ruben Brunk <rubenbrunk@google.com> DNG: Fix row stride check.

Bug: 16986715

Change-Id: I5337194f7078d394b9e972e81861794283925612
ndroid_hardware_camera2_DngCreator.cpp
ccf25c7bf69eb8c04246e3f79da31b52c2922a80 09-Aug-2014 Adam Lesinski <adamlesinski@google.com> Fix shared library bug in bag attributes

A ResTable_map entry has a name attribute, which
could be a dynamic reference if it comes from
a shared library. It was not being patched with
the correct package id.

Bug:16795890
Change-Id: Ia8df6a943269b2fefb2132c3ed74eb1997d7701b
ndroid_util_AssetManager.cpp
2f4cf2cfd1125abfe928d6137f3d1553b0888f61 07-Aug-2014 Calin Juravle <calin@google.com> Pass the name of the native bridge library to the runtime

Bug: 16843953
Change-Id: Ia0f57a9b3e30a74fe4e93eb4453f841c1ef512eb
ndroidRuntime.cpp
3d274434c78856388484a722da2887ca846907ee 08-Aug-2014 Calin Juravle <calin@google.com> Merge "Pass the name of the native bridge library to the runtime"
01db916970ece2382ebf9e06873a14aee9543a9d 07-Aug-2014 Calin Juravle <calin@google.com> Pass the name of the native bridge library to the runtime

Bug: 16843953

(cherry picked from commit 2f4cf2cfd1125abfe928d6137f3d1553b0888f61)

Change-Id: I223f9041e424be024265e46bcff19cd9dfd18dfc
ndroidRuntime.cpp
6f03023ece076d33d8b171d5398c8ed70abf3f54 07-Aug-2014 Derek Sollenberger <djsollen@google.com> Remove dependency on SkPaintOptionsAndroid

Change-Id: I579a3503697efe3b8fd9bc809a6c9bfbf735cb1b
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
cf6775eece8628ac069a6d4803e7f20a017e7e62 06-Aug-2014 Mathieu Chartier <mathieuc@google.com> Fix JNI error in exception reporting.

There was a JNI error where when you got an OOM and called
report_exception, it would call two NewStringUTF in a row without
checking the return values. This could mean that the first one
threw a new OOME and the second one would cause a JNI error when
it also attempted to throw an OOME with a pending OOME.

Bug: 16843627
Change-Id: Ie4f9f9a5f8b7993cd3655d42a6718c0a5e1199f8
ndroid_util_Binder.cpp
ce5bbbea08e9dca963a208f5199aad699d4a854d 31-Jul-2014 Brian Carlstrom <bdc@google.com> Move image classes options from art to AndroidRuntime [frameworks/base]

Bug: 15165413

(cherry picked from commit 108166c749f0418d45f220419a9611c4afec1311)

Change-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa
ndroidRuntime.cpp
0d8fb019633300a6636f1bf99f0716e8579dab35 30-Jul-2014 Brian Carlstrom <bdc@google.com> Disable compilation based on vold.decrypt. [frameworks/base]

Bug: 15165413

(cherry picked from commit 4fd561637a173c7fa6a1d71e9115db1db90514ff)

Change-Id: I2a13b63f9d4a7ffd69a8d21666c6dce84739c6ed
ndroidRuntime.cpp
3fbfbb4adeec1dda1e149758ea302c386101f267 29-Jul-2014 Brian Carlstrom <bdc@google.com> Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]

This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413

(cherry picked from commit f60d3a4702f6d00d7edb5d348c53b9b03ae16b76)

Change-Id: I293c81ba817e9abbf9c05b3fb554ef2f0ad0c4ed
ndroidRuntime.cpp
796475006f5d670e8383a2050f11719522437a43 06-Aug-2014 Chris Craik <ccraik@google.com> Move bitmap transforms out of bitmap ops

bug:11359533

This allows us to deduplicate a lot between the two ops, and fixes the
shader coordinate space for the left,top argument drawBitmap to match
software.

Change-Id: I53da05af9ee74c74e9e70b4ab8053190ca220b16
ndroid_view_GLES20Canvas.cpp
d1a7fca1451bf4ab7f9b704c0bace180095c2237 06-Aug-2014 Mathieu Chartier <mathieuc@google.com> Fix JNI error in exception reporting.

There was a JNI error where when you got an OOM and called
report_exception, it would call two NewStringUTF in a row without
checking the return values. This could mean that the first one
threw a new OOME and the second one would cause a JNI error when
it also attempted to throw an OOME with a pending OOME.

Bug: 16843627

(cherry picked from commit cf6775eece8628ac069a6d4803e7f20a017e7e62)

Change-Id: Ibdc7d0e55a48b2a61a1db0868a5d77c2ae53f6f3
ndroid_util_Binder.cpp
b634e1b6d6bda56128c354b1803b04b537e3799d 01-Aug-2014 Eric Laurent <elaurent@google.com> AudioSystem: add API to query audio HW sync source

Add a method to query from the audio HAL the HW sync
source used for a given audio session.
Add an AudioAttributes flag to request an output with
HW sync source.

Bug: 16132368.
Change-Id: Ic31b2924b98f242c3aa0d58688879f05ea02d6f7
ndroid_media_AudioSystem.cpp
01e840ff9441e005153d799e71d65b38bcb21902 27-Jun-2014 Michael Wright <michaelwr@google.com> Add resize method for virtual displays

Change-Id: I2632fc56c2d2cba356379e42f5c1a3e283b11d1e
ndroid_view_SurfaceControl.cpp
d3b8223377b8046280e4c09e728edc600171f941 30-Jul-2014 Eric Laurent <elaurent@google.com> SoundTrigger API update.

Add sound model update callback.
Add native service state change callback.
Add vendor UUID in sound model description.
Add coarse confidence level in recognition event.
Add capture format in recognition event.

Bug: 12378680.

Change-Id: Id63437819ec7b9a4a69e1ff6185b747e20cad95e
ndroid_hardware_SoundTrigger.cpp
e9ad3931fae71c8a8cd000fd52d5df4be79b0895 31-Jul-2014 Behdad Esfahbod <behdad@google.com> Add fontFeatureSettings to TextView and attrs

New API is hidden.

Bug: 15246510
Change-Id: I8cdbbd3a36fc280e07569dbb130f8c237062fff5
ndroid/graphics/Paint.cpp
108166c749f0418d45f220419a9611c4afec1311 31-Jul-2014 Brian Carlstrom <bdc@google.com> Move image classes options from art to AndroidRuntime [frameworks/base]

Bug: 15165413
Change-Id: I69c064b05f62a2e8a3801dc924f5b032dedc8e51
ndroidRuntime.cpp
4fd561637a173c7fa6a1d71e9115db1db90514ff 30-Jul-2014 Brian Carlstrom <bdc@google.com> Disable compilation based on vold.decrypt. [frameworks/base]

Bug: 15165413
Change-Id: I1972c5af5f392c2ed247888ef33c03e9ffe4d588
ndroidRuntime.cpp
f60d3a4702f6d00d7edb5d348c53b9b03ae16b76 29-Jul-2014 Brian Carlstrom <bdc@google.com> Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]

This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: I1676987c69a3cad4217dc4b56465ef3ae886122a
ndroidRuntime.cpp
8e554924c527183962fc908c5f916f390f806c74 01-Aug-2014 Chris Craik <ccraik@google.com> Merge "Add outline alpha" into lmp-dev
77b5cad3efedd20f2b7cc14d87ccce1b0261960a 31-Jul-2014 Chris Craik <ccraik@google.com> Add outline alpha

bug:16140822
bug:16566746

This allows background drawables to alter the opacity of a shadow
being cast with their own alpha values.

Change-Id: I49698cc7c1bf4b2b55ffe2f82899543ca62bc61c
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/NinePatchPeeker.h
ndroid_view_RenderNode.cpp
805f6ebf17e2791624bb1a30834b4c1cc65583bf 30-Jul-2014 Behdad Esfahbod <behdad@google.com> Support FontFeatureSettings in Paint

New API is hidden.

Bug: 15246510
Change-Id: Idefca06a366de0d87f53d123b5291788448de4d0
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
ed1e6962bafb0c295cf8bdee778ee4af8ec01171 30-Jul-2014 Raph Levien <raph@google.com> Merge "Bump refcount of canvas created for Picture" into lmp-dev
febccd05f2e9ad2422d74fcf33ec9bc900ae83bb 30-Jul-2014 Raph Levien <raph@google.com> Bump refcount of canvas created for Picture

Both the Canvas and Picture objects will unref the canvas in their
finalizers, so an extra ref is needed. This had been present but was
inadvertently removed in the patch "Refactor android.graphics.Picture
JNI bindings." This patch simply restores the previous ref and comment.

Bug: 16399257
Change-Id: I9911826bd0e668bd25546ef54b0c9c1d467538c8
ndroid/graphics/Picture.cpp
fa80f7491df82d71b7084500519a2195afbea706 18-Jul-2014 Behdad Esfahbod <behdad@google.com> Add letter-spacing to Paint and TextView

New API is hidden.

Bug: 15594400
Change-Id: I5cbe7aebef0b7280eb13924f2a706c0cb4a4688e
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
73e8205f75908521fb3dd7ffd29f51484b5e90a7 24-Jul-2014 John Reck <jreck@google.com> fix build

Change-Id: I597255b2b311b7daec7ffe537f62ee78eace50be
ndroid_view_ThreadedRenderer.cpp
c41d941f1b999502a2121597edeb3c23d26a2269 30-Jul-2014 Derek Sollenberger <djsollen@google.com> Disable fallback chaining in Skia.

Change-Id: I6e57b525bc4953a5b8969bb4c3e71b4a53de33d3
ndroid/graphics/Paint.cpp
af4d04cab6d48ae0d6a5e79bd30f679af87abaad 29-Jul-2014 Chris Craik <ccraik@google.com> Use RoundRect clipping for circle reveal animation

bug:16630975

Also, remove inverse clipping feature from reveal animator.

Change-Id: I770a4eb48cd123b0ca0f39d16a0f3eefd1be3653
ndroid_view_RenderNode.cpp
ndroid_view_RenderNodeAnimator.cpp
e21e2a2d1d85d422230c1115abba824338763a88 29-Jul-2014 Behdad Esfahbod <behdad@google.com> Clean up Minikin includes

Include headers where they are used. Add header guards to MinikinSkia.h

Change-Id: If341231625348290d28a7d625561fffc171a8407
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinSkia.h
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
ndroid/graphics/SkiaCanvas.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_GLES20Canvas.cpp
0288ca63e3f0aee05ad2ede23564e04e53aca950 28-Jul-2014 Aravind Akella <aakella@google.com> SensorManager API changes.

i) Remove WAKE_UP_* sensor constants and corresponding string constants.
ii) Add getDefaultSensor(int, boolean) API.

Bug: 16399898
Change-Id: I53cb7dec02568503ebd35983e6b0c64e9c5070d7
ndroid_hardware_SensorManager.cpp
5ec789608bda858a0c6d669bb44a35a5a99abcdb 29-Jul-2014 Behdad Esfahbod <behdad@google.com> Use new minikin Layout::doLayout() that doesn't use a CSS string

The CSS version will be removed in minikin soon.

Bug: 16651112
Change-Id: Icebcbde6869e64399f160e1773e843cdd0199bc8
ndroid/graphics/MinikinUtils.cpp
62dc1768d6a2fcbed9e5dc4b26ecc4ccd22122fd 25-Jul-2014 Eric Laurent <elaurent@google.com> rename AudioSystem::newAudioSessionId()

Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.

Bug: 12378680.

Change-Id: I3f6658db2b8db8f56d1a99f12b15429e293631e6
ndroid_media_AudioSystem.cpp
701d6ff12f36bf5e9de0dafdaced06744fd411eb 16-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioAttributes and AudioRecord.

Add audio recording source in AudioAttributes.
New AudioRecord constructor with AudioAttributes and
AudioFormat.
Legacy AudioRecord constructor is calling into the new
constructor.

Bug 16009464

Change-Id: I69d81f9e71bdf946c4cfbda6d3d8552ffac6b5c2
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
39c12fab49075b715c253c68c84b5c10c3150197 26-Jul-2014 Sandeep Siddhartha <sansid@google.com> Use blob (shared memory) for large data in sound model/recognition event/config

Also add a missing null check in writeBlob

Bug: 16516353
Change-Id: Ie702f8daae541cab7c2cee6e13d49e7fc84c84e1
ndroid_os_Parcel.cpp
c8d6b6fc7dd05c10ca301e654f063cc89781c9be 28-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioTrack transfer mode in JNI

Set the correct transfer mode in AudioTrack JNI and configuring
the native AudioTrack instance, based on the memory mode
passed in Java.
Add comment about the audio attributes parameter superseeding
the stream type parameter in the AudioTrack constructor.

Change-Id: Ia43f42874452ac47c3c044d5446a4732da0fd56c
ndroid_media_AudioTrack.cpp
058fc640017c90120c599d378a4cbc55668b05b7 24-Jul-2014 Chris Craik <ccraik@google.com> Connect shadow style attributes to renderer

bug:15859361

Moves lighting info out of StatefulBaseRenderer, since it's not useful
at record time, and only used by OGLR.

Change-Id: I7ab065d02d9304afad1dc4c48597a7a621366f8e
ndroid_view_ThreadedRenderer.cpp
1032332cef64667edfd19e4e19a57e7ce0f42486 26-Jul-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Add noiseModel when saving DNG tag."
90d7a3e996ee3a6e33e655341c5d301fbe30cd58 26-Jul-2014 Sandeep Siddhartha <sansid@google.com> Add read/writeBlob to Parcel

These are {@hide}en for now.

Bug: 16516353
Change-Id: Ie1635617ee8611a78be9068a7ce674e34c30301d
ndroid_os_Parcel.cpp
b1971dc8a69b8cee91208b7d3017c52b36e55721 23-Jul-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Add noiseModel when saving DNG tag.

Bug: 16369384

Change-Id: I3c84dd3e5f3279bcfe56637b23f37c3b6984774d
ndroid_hardware_camera2_DngCreator.cpp
a753f4c6cb8558795e673df1896532cd148781e2 24-Jul-2014 Chris Craik <ccraik@google.com> Move ClipBounds to native

bug:15698973

Also simplifies RenderNode LTRB properties

Change-Id: I09263a697b71d325a46b57cd5250a2b165f251c8
ndroid_view_RenderNode.cpp
c437f6eef2e92fd1ca1c542a8e41315253ec7747 25-Jul-2014 Behdad Esfahbod <behdad@google.com> Merge "Further centralize Minikin interaction" into lmp-dev
63c5c78a72a21d57913e8601cc2a1ab72a424a02 25-Jul-2014 Behdad Esfahbod <behdad@google.com> Further centralize Minikin interaction

Part of the fix for bug 15246510 and others.

Change-Id: Ie99000989dfcd7a81aaa1233dec522344f852f31
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_GLES20Canvas.cpp
b9333b5970911343950900a6f46dcbbd6d920ce9 25-Jul-2014 Behdad Esfahbod <behdad@google.com> Merge "Remove unused TextLayout.h" into lmp-dev
1fc68395d3851a49825cdcbfc7f9ceb4fb206ec1 25-Jul-2014 Behdad Esfahbod <behdad@google.com> Remove unused TextLayout.h

Respective code was removed when switching to Minikin.

Change-Id: I353c834457145ccd9462a439dfdf16d4adb8b695
ndroid/graphics/TextLayout.h
cae05e0b4c4726236487bdd7c23b82e93f85fd23 24-Jul-2014 Derek Sollenberger <djsollen@google.com> Move Canvas.h to a new location so that it can be shared with HWUI.

Bug: 15672762
Change-Id: Ia59e986cd4034e16b2e54e8d594e6941a6c9fb1b
ndroid/graphics/Canvas.h
91838ded36131525312739c0929913b215519c2a 17-Jul-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix LEGACY mode timestamps.

Bug: 15116722

- Add CaptureCollector class to accumulate buffer timestamps
and manage lifecycle callbacks for each request.
- Set correct timestamps for buffers, results, and callbacks.

Change-Id: I75fa1049cf100d9d14c5ba8992be93ba1048df19
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
acb4099deff72c2c631f7110a405a3331d3e8b27 21-Jul-2014 Derek Sollenberger <djsollen@google.com> Refactor text drawing to move minikin interactions outside of the canvas interface.

bug:15672762
Change-Id: Iad63855424b4eeccef67a7341a9c2b0018c64c30
ndroid/graphics/Canvas.h
ndroid/graphics/SkiaCanvas.cpp
ndroid_graphics_Canvas.cpp
866cf65cc3c53f67836c9157d5c661adfdbd25e1 22-Jul-2014 Leon Scroggins III <scroggo@google.com> Make updateLocalMatrix replace the current Matrix.

Fixes a bug introduced in I3c3316377874e89fccc85afb864bc038b0ef3890.

CreateLocalMatrixShader combines the existing matrix with the new
matrix, which is not what we want. Keep track of the original
SkShader at all times, and always create the local matrix shader
with the original. Store the SkShader with a local matrix as
Shader.native_with_local_matrix.

Make Shader.native_instance private. Instead of allowing direct
access, add an init() method which sets it, and getNativeInstance(),
which returns either native_instance or native_with_local_matrix,
as appropriate.

Make Shader subclasses call init(), instead of setting native_instance
directly.

Pass native_with_local_matrix pointer to nativeSetLocalMatrix and
nativeDestructor, which unrefs it (if not null).

Since nativeSetLocalMatrix no longer replaces the original, do not
unref it.

Add a comment to Shader.updateLocalMatrix that it does not affect
ComposeShaders created with this Shader. (This should have been a
part of I3c3316377874e89fccc85afb864bc038b0ef3890.)

BUG:16293121
Change-Id: Ieb31c7e1fe99081f6b81493178f4a18d3c5df643
ndroid/graphics/Shader.cpp
3b852e3489e995600fce19dfdbf3a5d769374d74 25-Jun-2014 Neil Fuller <nfuller@google.com> Rewriting android.text.format.Time without the native _tz functions

(cherry picked from commit d7f0849b8c053ccc6abf0dc7d5bc07da502782a4)
Bug: 15765976

Change-Id: I00f72bd1043ef20f22d25559206b2f741334ba9c
ndroid.mk
ndroidRuntime.cpp
ime.cpp
imeUtils.h
ndroid_text_format_Time.cpp
bfb349e2421d5b74701818f6aa486f057b2e5884 22-Jul-2014 Chris Craik <ccraik@android.com> Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"
c403a3908940ff9c7436c0153f941bec693bb39d 23-Jul-2014 Chris Craik <ccraik@google.com> Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev
0645128b80621edee70f8cab4afb208fe0c26bec 21-Jul-2014 Chris Craik <ccraik@google.com> Make setter methods on Outline call setEmpty() based on params

bug:16142564

Additionally, better define behavior around null outline providers:

A view with an empty outline, and setClipToOutline=true will not be
rendered, though one with a null outline provider
(and thus no outline) will be.

Change-Id: Ic9549841b107b2eb51b417c66058a0cd69dd89eb
ndroid_view_RenderNode.cpp
03666c705ddabe0e7c5869ab69c2ca8b964164e9 20-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Cleanup: Delete dead code.

Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
ndroid_net_NetUtils.cpp
f23f5de1731be798f03a7808cf205457522e5d2e 22-Jul-2014 Chris Craik <ccraik@google.com> Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev
53001ca3a629c0069f4fdac44f7711ad4a0c395a 03-Jul-2014 henry.uh_chen <henry.uh_chen@htc.com> [Bitmap] Add null pointer protection in Bitmap_sameAs()

Symptom: SkBitmap::getAddr(int, int) may return NULL due to unrecognized config
(ex: kRLE_Index8_Config). This will cause memcmp method to crash. Since bm0 and
bm1 both have pixel data() (have passed NULL == getPixels() check), those 2
bitmaps should be valid (only unrecognized), we return JNI_FALSE to warn user
those 2 unrecognized config bitmaps may be different.

Cherry-pick of 3a1bffa835f279628e50385af3c85789bc737f64 from AOSP

Change-Id: I6970c27de412110a3035d0a783112c4cd3ebc35b
ndroid/graphics/Bitmap.cpp
6ba30b85ddfbe37c338ee8dde3dd33322eb38d47 15-Jul-2014 Behdad Esfahbod <behdad@google.com> Add android.Paint that inherits SkPaint

The idea is that extra paint parameters that only affect text layout
(not rendering) will go in android.Paint instead of going into
SkPaintOptionsAndroid. We will eventually move those out of SkPaint
too.

This is currently implemented in PaintImpl.cpp. Will be renamed when
current Paint.cpp that has JNI bits is moved to android_graphics_Paint.cpp.

Change-Id: Iba66c34dea5da503a13b9c864cb9f2211ac4ba7d
ndroid.mk
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Canvas.h
ndroid/graphics/CanvasProperty.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Paint.h
ndroid/graphics/PaintImpl.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/SkiaCanvas.cpp
ndroid_graphics_Canvas.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_RenderNode.cpp
d7f0849b8c053ccc6abf0dc7d5bc07da502782a4 25-Jun-2014 Neil Fuller <nfuller@google.com> Rewriting android.text.format.Time without the native _tz functions

Bug: 15765976
Change-Id: I666b72ecf9da8a9dcfb97cc503006b415909a558
ndroid.mk
ndroidRuntime.cpp
ime.cpp
imeUtils.h
ndroid_text_format_Time.cpp
2cb8c3c9e5d79dfba10d2f39792ad553d4fbc292 21-Jul-2014 Derek Sollenberger <djsollen@google.com> Remove invalid SkASSERT that prevents us from running with SK_DEBUG

Change-Id: I5634990e6cb962d72b686f7f103b9af7d96d4b55
ndroid/graphics/Graphics.cpp
8872b38ef403cc2c44aca07d392f5e9426fd7f54 23-Jun-2014 Derek Sollenberger <djsollen@google.com> Separate Canvas JNI code from the implementation.

This introduces Canvas.h which is a pure virtual interface that
is intended to be used by both Skia and HWUI implementation. To help
stage this transition this CL only introduces the interface and Skia
implementation. The interface is not intended to be final and will
undoubtedly go through iterations in both style and location as we
look to introduce the HWUI implementation.

BUG:15672762
Change-Id: Ibaccdddb87d3b9358f4f0c1d317ead5282d4ee16
ndroid.mk
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Canvas.h
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/Picture.h
ndroid/graphics/SkiaCanvas.cpp
ndroid/graphics/pdf/PdfDocument.cpp
ndroid_graphics_Canvas.cpp
ndroid_graphics_Picture.cpp
d3de42cae84fadfa1befd082a2cf1bf72f9ad82a 15-Jul-2014 John Reck <jreck@google.com> Add RT-enabled reveal animator

Bug: 16161431

Also re-writes RevealAnimator to avoid using any listeners internally,
removing the logic around shadowing the update listeners.

Change-Id: I6ed8126398eed971a87f20bccb7584c9acafbb6c
ndroid_view_RenderNodeAnimator.cpp
3b0224dc3c2e7ffb93dc56970395003d0e387545 16-Jul-2014 destradaa <destradaa@google.com> Fix exceptions in ActivityRecognition platform stack.

b/16348349

Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
ndroid_hardware_location_ActivityRecognitionHardware.cpp
580ff8142b7d0455d0d41ee77572b4f55dd935f0 17-Jul-2014 John Reck <jreck@google.com> Revert "Separate Canvas JNI code from the implementation."

This reverts commit e28a5afee885cd69a5be5809f88116b601cb1a72.

Appears to cause memory corruption and random appearances of
chinese

Bug: 16343240
Bug: 16336642

Change-Id: Ife169181f40adff4b12948ed5f9d3a88dcec935b
ndroid.mk
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Canvas.h
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/Picture.h
ndroid/graphics/SkiaCanvas.cpp
ndroid/graphics/pdf/PdfDocument.cpp
ndroid_graphics_Canvas.cpp
ndroid_graphics_Picture.cpp
889fc94ffa70633e510e812b9da86723f4eee384 17-Jul-2014 Chris Craik <ccraik@google.com> Merge "Add accessibility text contrast setting" into lmp-dev
cce47eb580d666ead1f6095d1e3b65233592bbaa 17-Jul-2014 Chris Craik <ccraik@google.com> Add accessibility text contrast setting

b/14624452

Adds a feature which draws all text (in the HW accelerated standard
path) in a high contrast mode. Text is drawn at full alpha, and either
white or black (depending on its original color) with a starkly
contrasted outline beneath it.

Change-Id: I943f624b6367de35367cced3b2a8298f2bc62377
ndroid_view_GLES20Canvas.cpp
514a8b88f7a57fd348dde193ee9ced0403deebd4 17-Jul-2014 John Reck <jreck@google.com> Merge "Fix root RenderNode damage calculation" into lmp-dev
0a97330b98dd633b58dcfff405d94476c89e867d 16-Jul-2014 John Reck <jreck@google.com> Fix root RenderNode damage calculation

Bug: 15888445

Change-Id: I281ec9271c9889673dcdfcb6d31e341a7b47b7de
ndroid_view_ThreadedRenderer.cpp
4990e4f0e3d493036e99e1f5fb893635a9b66eb1 30-Jun-2014 Sharvil Nanavati <sharvil@google.com> Launch processes running under the 'bluetooth' uid with CAP_WAKE_ALARM.

This is required since bluedroid needs to set wake alarms and timers.
Going through JNI back into Java code and then across Binder to
AlarmManager is both inefficient and doesn't provide the resolution
required for functions like A2DP.

Change-Id: I619be0b18a9e7ac2567b7c68ba84fcd15eecf715
om_android_internal_os_Zygote.cpp
f5d6c555c3430f6e423952ba3ab024380e550bba 23-Jun-2014 Derek Sollenberger <djsollen@google.com> Separate Canvas JNI code from the implementation. DO NOT MERGE

This introduces Canvas.h which is a pure virtual interface that
is intended to be used by both Skia and HWUI implementation. To help
stage this transition this CL only introduces the interface and Skia
implementation. The interface is not intended to be final and will
undoubtedly go through iterations in both style and location as we
look to introduce the HWUI implementation.

BUG:15672762
Change-Id: Idefadede356f688edb8eb09b4a02aa01b4077f62
ndroid.mk
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Canvas.h
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/Picture.h
ndroid/graphics/SkiaCanvas.cpp
ndroid/graphics/pdf/PdfDocument.cpp
ndroid_graphics_Canvas.cpp
ndroid_graphics_Picture.cpp
757f0f36b9088def734575482cd128a0e78fac24 15-Jul-2014 Chris Craik <ccraik@google.com> Merge "Implement outline support for nine patches" into lmp-dev
47cd8e921db73e894f94ec4729ade90da50996f5 09-Jul-2014 Chris Craik <ccraik@google.com> Implement outline support for nine patches

b/15856895

Nine patches now have outline round rect metadata stored as optional
png tags. aapt generates these automatically by inspecting the bitmap
pixels to estimate outline bounds and round rect radius, based on
opacity.

Change-Id: I226e328a97873010d9e1adb797ac48f93a31183c
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/NinePatchPeeker.h
28c49c9d202a9f4675c1c1e5d4562492d2107b79 17-Jun-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Update shader scaling matrix for legacy mode.

Bug: 15116722
Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
3089bed197a4fbfcc3fb741aa0ed6b3e162e392c 15-Jul-2014 Colin Cross <ccross@android.com> Zygote: make libprocessgroup failures non-fatal

createProcessGroup can fail if the kernel does not support the
cpuacct cgroup. Print a more useful error message, and don't
runtime abort.

Bug: 16243791
Change-Id: Ibbf081bda58a99c83b8070f55d151905c706b378
om_android_internal_os_Zygote.cpp
25bdb88d844a442579debcece2341b285a58dc7b 13-Jul-2014 Robert Phillips <robertphillips@google.com> Remove use of default SkPicture ctor

Change-Id: I8c623a1aac82cea29a5f48e011a43e568f7fb81f
ndroid/graphics/Picture.cpp
06b6cdaed5c68816faac9d2354c6caf61e65e19d 12-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Remove unnecessary code and APIs.

This stuff has been replaced by setNetworkForUser() in NetdClient.

Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
ndroid_net_NetUtils.cpp
a4fa3b5aa53cf677b623fe346c585cb8a0c1ce26 09-Jul-2014 destradaa <destradaa@google.com> Add support in the platform for Activity Recognition Hardware.

Change-Id: I7c4fff3526583475a5edf1f4ba8fede4e9419ead
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_location_ActivityRecognitionHardware.cpp
1397751c7f74a268d7bd7caf35de604b3edf13f0 11-Jul-2014 Paul Jensen <pauljensen@google.com> Merge "Define NETID_UNSET in ConnectivityManager."
bcc76d345cdad2eff0f64d1dca9f92f94c8b9f07 11-Jul-2014 Paul Jensen <pauljensen@google.com> Define NETID_UNSET in ConnectivityManager.

This allows some cleanup and removal of dead code.

bug:15489928
Change-Id: Iaf0507bc2e8ec6dcc253f01f61c5b221d46581f9
ndroid_net_NetUtils.cpp
e1f57d6f44909a66c7ab0af33dbc5289287e823a 30-May-2014 Eino-Ville Talvala <etalvala@google.com> Camera2: Add CPU/GPU overhead measurement to legacy mode

Dumps GL and CPU processing duration and frame timestamps to a file,
whenever the device is closed or the stream configuration is changed.

- Add PerfMeasurement class to legacy mode
- Wire up minimal usage to SurfaceTextureRenderer

Change-Id: Ic9d74ca26f706780b746175aa615c7aae4ae52e7
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_camera2_legacy_PerfMeasurement.cpp
47e91f20952e5eb2290146ba6e33a694dd2e45e8 29-May-2014 Ruben Brunk <rubenbrunk@google.com> DNG: Implement remaining interface methods.

Bug: 15112503
Bug: 16206973
Bug: 15748139

- Adds remaining write methods.
- Adds GPS and description convenience methods.
- Unhides convenience methods.

Change-Id: I9535b21261027f6c06a041c1621de8f865a0ad32
ndroid_hardware_camera2_DngCreator.cpp
d66a8719b019e948d1dfbda2dace8762189e298f 11-Jul-2014 Leon Scroggins III <scroggo@google.com> Merge "Simplify Shader.setLocalMatrix."
ab87983a11e0bd2e08d752d86d5e945ea7d39a04 09-Jul-2014 Leon Scroggins III <scroggo@google.com> Simplify Shader.setLocalMatrix.

Previously, calling setLocalMatrix updated any Paint that had the
Shader attached. This depended on deprecated behavior in Skia. Use
new Skia APIs, and do not modify any Paints that use the Shader.

In addition, update callers to call setShader (again) after modifying
the Shader.

Sample app at ag/499573 for testing.

Depends on I673801444f0a8fd4f192b5b7effdde1aa83e702b in external/skia.

BUG:14315916
Change-Id: I3c3316377874e89fccc85afb864bc038b0ef3890
ndroid/graphics/Shader.cpp
6bc2c2c34f2b23eae79ad733c97a691734055c4f 07-May-2014 Paul Jensen <pauljensen@google.com> Convert Vpn from NetworkStateTracker to NetworkAgent.

This eliminates the need for the ConnectivityService.VpnCallback class.
This requires shifting VPNs to the new "network" netd API.
VpnService.protect() is modified to no longer go through ConnectivityService.
NetworkCapabilities is extended to add a transport type for VPNs and a
capability requiring a non-VPN (so the default NetworkRequest isn't satisfied
by a VPN).

bug:15409918
Change-Id: Ic4498f1961582208add6f375ad16ce376ee9eb95
ndroid_net_NetUtils.cpp
0161bbc6e54744d5e0348af3d123858818f966e9 03-Jun-2014 Colin Cross <ccross@android.com> ActivityManager: use Process.killProcessGroup to kill forked processes

Place newly-created processes in a process group, and use
killProcessGroup to kill any forked processes.

Bug: 15313911
Change-Id: I0f3e2eeebd9a910dae3f6b2801826c92aea03030
om_android_internal_os_Zygote.cpp
0769e550011d8f8a19e333efe1706ef0e6cc6a5f 03-Jun-2014 Colin Cross <ccross@android.com> android.os.Process: add killProcessGroup

Add Process.killProcessGroup to interface between ActivityManager and
libprocessgroup.

Bug: 15313911
Change-Id: I5226a6d86153b863e30d936cf1c84e256f0d7ea5
ndroid.mk
ndroid_util_Process.cpp
effcc83e42638a5fa7eceaebe22081a1b9eaebaf 10-Jul-2014 Elliott Hughes <enh@google.com> Merge "Switch frameworks/base/core/jni to the new icu."
92b1896dfd42079c264e68f819273ba71f177fea 10-Jul-2014 Elliott Hughes <enh@google.com> Switch frameworks/base/core/jni to the new icu.

Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9
ndroid.mk
b58d385e17f3b71705f23fe77aa8c12147ec9ea5 10-Jul-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of f6be5a7a to master

Change-Id: I6dcfb33981df90877fb9f3752b853cf377633edf
f6be5a7ac8c3891d79dd836ac5cfdc0588859494 10-Jul-2014 Elliott Hughes <enh@google.com> am f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."

* commit 'f072fda13fd47d7dc7246cb821a26990d8fb271f':
Switch frameworks/base/core/jni to the new icu.
9b727000360c3cc103a36d4eb1f3b15e0ed8eae8 08-Jul-2014 Anish Athalye <aathalye@google.com> Fix extraneous allocation and copying

With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.

Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
ndroid_text_StaticLayout.cpp
525a66b2bb5abf844aff2109bdc9ed819566bece 15-Jun-2014 Svet Ganov <svetoslavganov@google.com> Adding print preview.

This change adds the pring preview part of the new print UX. The
UI has two parts, the top section is the print options and the
bottom section print preview with a list of pages. The user can
interact only with one of them. When print options are expanded
they cover the preview content and a scrim is laid out on top of
the preview. Tapping the scrim collapses the print options. When
the user types in page ranges and closes the options to look at
the preview, the latter is updated to show only these pages. In
the list of pages the user can further prune pages by deselecting
them.

Change-Id: I0b23d2c598afe2a34400ccfa43e4e935af83c72f
ndroid/graphics/pdf/PdfRenderer.cpp
ce75618e12deebe302c551281ce56c0d60138e0f 09-Jul-2014 Brian Carlstrom <bdc@google.com> am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

* commit '5aba0149b953fb8e85851811dde995fb35c10051':
Make dex2oat heap size product configurable [frameworks/base]
6d77eb99bfc5471f9765e3fa7ea42022197aa9f5 08-Jul-2014 Brian Carlstrom <bdc@google.com> Make dex2oat heap size product configurable [frameworks/base]

Bug: 15919420
Change-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006
ndroidRuntime.cpp
2d067babdb9ff124f18797c5b44222379fe95fd9 04-Jul-2014 Narayan Kamath <narayan@google.com> am 29a9d27d: am 358a3f71: Merge "fix AudioTrack and AudioRecord JNI"

* commit '29a9d27d3c9224a7709a41096d7a958c8177ac19':
fix AudioTrack and AudioRecord JNI
42856eb4f11a13391fbbeb80481d543568404cd7 03-Jul-2014 henry.uh_chen <henry.uh_chen@htc.com> [Bitmap] Add null pointer protection in Bitmap_sameAs()

Symptom: SkBitmap::getAddr(int, int) may return NULL due to unrecognized config
(ex: kRLE_Index8_Config). This will cause memcmp method to crash. Since bm0 and
bm1 both have pixel data() (have passed NULL == getPixels() check), those 2
bitmaps should be valid (only unrecognized), we return JNI_FALSE to warn user
those 2 unrecognized config bitmaps may be different.


Change-Id: I6970c27de412110a3035d0a783112c4cd3ebc35b
ndroid/graphics/Bitmap.cpp
90d0b9e1bb4f1e4dac77388f79f6e53e8619751d 30-Apr-2014 Eric Laurent <elaurent@google.com> fix AudioTrack and AudioRecord JNI

AudioTrack and AudioRecord JNI should not cast
jshortArray to jbyteArray. This appeared to work with Dalvik
but causes data corruption with ART.

(cherry picked from commit 9d02848e902d04417df616354db3a18c03e639b7)

Change-Id: Ie36624d3ea06042373c64edced4b5e30b7b1ee86
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
21949631815703ef2f04b304b4cedff3646a0d73 09-Jul-2014 Brian Carlstrom <bdc@google.com> am ce75618e: am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

* commit 'ce75618e12deebe302c551281ce56c0d60138e0f':
Make dex2oat heap size product configurable [frameworks/base]
66c6747179576a7477ff2c22f737f8e24c762b81 08-Jul-2014 Eric Laurent <elaurent@google.com> Merge "SoundTrigger: update API"
013f66b92db609fceeff9c8171daca13d057cc95 07-Jul-2014 Eric Laurent <elaurent@google.com> SoundTrigger: update API

class Keyphrase: replaced number of users by list of user IDs.
class RecognitionEvent: added capture preamble duration.
class KeyphraseRecognitionEvent: add keyphrase ID and explicit list of
user ID/confidence level pairs.
startRecognition(): takes a RecognitionConfig specifying the list of
keyphrases to listen to as well as for each keyphrase the recognition mode,
users and min confidence levels for each user.

Bug: 12378680.
Change-Id: I57036cc83b5d9e90512b8bb3f951af3a4a74c0ce
ndroid_hardware_SoundTrigger.cpp
1103b3255945d2eb2fa9c191e84e2270b343cca9 08-Jul-2014 Mike Reed <reed@google.com> SkBitmap::Config is deprecated, use SkColorType

Change-Id: Ic953741325607bf85598c097bb3ab648d4a08996
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatchImpl.cpp
ndroid/opengl/util.cpp
om_google_android_gles_jni_EGLImpl.cpp
d4233c68fc17f0909e9e36494db85a634f8e2665 13-Jun-2014 Sandeep Siddhartha <sansid@google.com> Initial code for listing/storing sound models

- We use a DB to store and persist the sound models.
- This'll be used by SoundTriggerModelManager, a service that lists,
deletes and registers new models. This'll be used by the enrollment
client to enroll and unenroll users.

- This needs the unique identifiers for sound model & keyphrases to be
present in the respective data structures

This is very early stage so please point out any concerns.

Change-Id: I82962895bf326167458f20e6ba995295551de025
ndroid_hardware_SoundTrigger.cpp
d746057f2414cba2bdc69257cc5be8cb681bb592 07-Jul-2014 Jeff Sharkey <jsharkey@android.com> Change new file installs to be cluster-based!

Now that all the other pieces are in place, we're ready to start
installing new file-based packages as a cluster (the new unified
directory-based layout). This greatly simplifies the renaming
process.

Also add helper methods to ApplicationInfo to give a much clearer
mapping between it and internal field names, since we can't change
the public API.

Add recursive restorecon().

Bug: 14975160
Change-Id: I72a63c5ddbc594c2fec4a91dd59f73ef253fbfd7
ndroid_os_SELinux.cpp
42a1d08df7d417fd4e67eabc91ff05ee77fd9995 08-Jul-2014 Mike Reed <reed@google.com> SkBitmap::Config is deprecated, use SkColorType

Change-Id: Ida181d2aac760072cf2d01409edac37699dea216
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
4a9c3891d4f890109e02bc83fecf9bcdf56a9395 07-Jul-2014 Mike Reed <reed@google.com> kNative_8888_SkColorType is now kN32_SkColorType

Change-Id: I13421a21de611203c62c1c1c36570a8cc803907b
ndroid/graphics/BitmapFactory.cpp
c054966b719c8a7255f7cf4120cca5050acb68bd 04-Jul-2014 Alan Viverette <alanv@google.com> Make optical insets actually work

Change-Id: I9fabf4cb939cc7a868f95580e7229745acde0418
ndroid/graphics/BitmapFactory.cpp
27bb05f2dccf1ac2ca55515aa0f4a99cd9c548a7 03-Jul-2014 Raph Levien <raph@google.com> Fix native crash when typeface is missing

Creating a typeface from a missing file crashes when it tries to extract
the style from the font. This patch just uses default style when the
resulting font object is NULL.

Bug: 15930808
Change-Id: I9438687100026f336db7aa204fe3a0232eee2db6
ndroid/graphics/TypefaceImpl.cpp
c61a7575eb0e3d1788ce1946da81d6c5e6812b9c 02-Jul-2014 Narayan Kamath <narayan@google.com> am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."

* commit 'd62196cfeffe5e4d725b5388fca57a18c154a44b':
Remove bogus 2 char limit for locales and countries.
bd71bf1814ffa484e56aafc1f7c155148eda773f 02-Jul-2014 Brian Carlstrom <bdc@google.com> am 8922ddba: am a6e06889: Merge "Add profiler type options"

* commit '8922ddbab1e394a59f957e8598fbbf88357e7838':
Add profiler type options
3fa99ec77ee52164575375c7709923c94d9693a6 02-Jul-2014 Narayan Kamath <narayan@google.com> Merge "Remove bogus 2 char limit for locales and countries."
be55c0d23b02f9de9f295f3bca2f7cd7f016c4d6 02-Jul-2014 Eric Laurent <elaurent@google.com> Merge "audio: fixed channel count determination from channel mask"
dbf55665c5c4802cbfc56463198805be48ec75af 02-Jul-2014 Eric Laurent <elaurent@google.com> audio: fixed channel count determination from channel mask

Do not use popcount() to derive channel count from channel mask.

Bug: 15000850.
Change-Id: Id52fc517bedaf1c42b9cd59857e3d19c251b97bf
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
4cce48e63fe9d63bac1f5a3b43ebb3ec6a1a730b 02-Jul-2014 John Reck <jreck@google.com> Merge "Fixes to startDelay"
8d8af3c1b768d590754d657a7d1242dcb462454b 02-Jul-2014 John Reck <jreck@google.com> Fixes to startDelay

Bug: 15991758

Don't update the UI thread with final value until after
startDelay

Change-Id: Ie8bffb5a3ace353ec1d82943a4efcbd01c42c28f
ndroid_view_RenderNode.cpp
ndroid_view_RenderNodeAnimator.cpp
46b6a1b4d0c6c5850ca2407096df2b2eb75f6215 02-Jul-2014 Narayan Kamath <narayan@google.com> am c61a7575: am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."

* commit 'c61a7575eb0e3d1788ce1946da81d6c5e6812b9c':
Remove bogus 2 char limit for locales and countries.
3c8fa3b356fa8f24b55d3dc42d4313297542e9f2 01-Jul-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix configured surface check in Legacy shim.

Bug: 15116722

- Switch to checking IBinder pointer when making sure
requested output surface has been configured (same as
the camera service).
- Needed to use TextureView in TestingCamera2.

Change-Id: If8831a9b2f9ec3e81cc8348e067a57cca2d46440
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
7de699fb68a5219f6801bf0c978fb9f739e54d3f 02-Jul-2014 Brian Carlstrom <bdc@google.com> am bd71bf18: am 8922ddba: am a6e06889: Merge "Add profiler type options"

* commit 'bd71bf1814ffa484e56aafc1f7c155148eda773f':
Add profiler type options
57ee620ced8caed1eb8651717f6a6d2d5f1f9a5b 05-Jun-2014 Leon Scroggins III <scroggo@google.com> Read premultiplied status from the SkBitmap.

Replace the Java variable with mRequestPremultiplied, to better
reflect what it represents. In both native and Java, the SkBitmap
is used as the decision maker of whether a Bitmap is premultiplied.
When changing other settings, mRequestedPremultiplied is used to
determine whether it should be premultiplied (if the new config/
hasAlpha-ness etc supports it).

ChooseFromColorProc now reads both the colortype (instead of the
deprecated Config) and alphatype on the SkBitmap. Same with
ChooseToColorProc. In the process, this caught a bug, where the
wrong procs were being used for Index8.

Replace instances of SkBitmap::Config with SkColorType where I
was already changing code.

Use the new versions of setConfig/allocPixels that take an SkImageInfo
as a parameter.

Document isPremultiplied's return value for ALPHA_8.

BUG:13618134
Change-Id: I91fc1f1e46e9294364b1af0ab4bdb37c68d7058e
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_view_GLES20Canvas.cpp
37151b5032c381391440019a76022ff8dd8196d0 01-Jul-2014 Narayan Kamath <narayan@google.com> Remove bogus 2 char limit for locales and countries.

Locale settings are persisted to system properties
and not to system settings, so the values read here
are used pretty much everywhere.

bug: 15873165
bug: 10090157

Change-Id: Ie7cda166439112c615afbd38253cf4fbb5791242
ndroidRuntime.cpp
d907e5b1efeae51c302fd502f42a06bd16d6cae3 01-Jul-2014 John Reck <jreck@google.com> Merge "Fix onTrimMemory for HardwareRenderer"
f47a594f5250b1914c36423ee6b371f0b8db09d0 01-Jul-2014 John Reck <jreck@google.com> Fix onTrimMemory for HardwareRenderer

Also fixes detachFunctor possibly drawing after return

Bug: 15189843
Bug: 15990672

Change-Id: I64c48cb674c461a8eeaba407b697e09f72c98ce3
ndroid_view_ThreadedRenderer.cpp
88b5b0be887fc5dc3b0b879b4179dde200d2e4d6 24-Jun-2014 Anish Athalye <aathalye@google.com> Implement line breaking using ICU break iterator

Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
ndroid.mk
ndroidRuntime.cpp
ndroid_text_StaticLayout.cpp
711ecaf000f66ea8e68e3d6fc8fe9212d1882e2a 30-Jun-2014 John Reck <jreck@google.com> Merge "More cleanups"
918ad523b2780e0c893f3d2a32d4ec13f2a7e921 27-Jun-2014 John Reck <jreck@google.com> More cleanups

Change-Id: Id5967944b949a2aec57e4fe9fdcdc04c11b8c35a
ndroid_view_HardwareLayer.cpp
ndroid_view_ThreadedRenderer.cpp
f23b25abfb76e75f63103abc882bc91b8327a957 27-Jun-2014 Chris Craik <ccraik@google.com> Remove isRecording() method from renderers

DisplayListRenderer is all that's accessed from java, and is entirely
separate from OpenGLRenderer now.

Change-Id: Ie733be71520c13fdb55dfe3522bb445ae2b50ac1
ndroid_view_GLES20Canvas.cpp
f74930be6037b858f956093ce1b45bd7b6c1e48a 30-Jun-2014 Dan Stoza <stoza@google.com> Merge "Surface: Add allocateBuffers to avoid render delay"
493f2e11909e2d5839ca81ddc66d48d538192478 26-Jun-2014 Dan Stoza <stoza@google.com> SurfaceTexture: Allow creation in detached mode

Adds a constructor that doesn't require a GLES texture name and sets
up the SurfaceTexture in detached mode.

Bug: 15616428
Change-Id: I375495f481bfbe43b3830ab7d124cef8f1be0ac6
ndroid/graphics/SurfaceTexture.cpp
54fc18b925d0dbb0a5c9a1b21956e23b4eaaf31d 10-Jun-2014 Wei Jin <wejin@google.com> Add profiler type options

This is related to the CL that adds a new type of profile data.

Change-Id: I3e4e502da8e1b0dd9b32ddcbc5d11eca0d1ba2e5
ndroidRuntime.cpp
d5d80801d2300fd6849ad2ef0fda9a34e7762fce 26-Jun-2014 Paul Jensen <pauljensen@google.com> Merge "Use return values from JNI functions binding sockets and processes to networks."
32a58f00d388584f5f47c0d5d4c74ce7c8457d78 20-Jun-2014 Paul Jensen <pauljensen@google.com> Use return values from JNI functions binding sockets and processes to networks.

bug:15757549
Change-Id: If23b14febc923b9a0348f0cf9029fd4bf6e8d725
ndroid_net_NetUtils.cpp
cd0741d962057e3dbf8a48110df622a7e47efcf8 26-Jun-2014 John Reck <jreck@google.com> Merge "Animator refactoring & fixes"
68bfe0a37a0dcef52abd81688d8520c5d16e1a85 25-Jun-2014 John Reck <jreck@google.com> Animator refactoring & fixes

Tweaks animators to have less unnecessary refcounting

Pull animator management out into seperate class

More control to tweak animator lifecycle, such as doing
Java-side handling of start delay by attaching but not
starting the animator

Change-Id: I4ff8207580ca11fb38f45ef0007b406e0097281c
ndroid_view_RenderNode.cpp
ndroid_view_RenderNodeAnimator.cpp
ef14da32804b06bac872c9e0e14ce0e52120a0bd 25-Jun-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix handling for abandoned bufferqueues.

Bug: 15116722

- Adds exception handling utility for legacy device.
- Skip/ignore abandoned surfaces in legacy camera.

Change-Id: Id4de587779d3bc2415e22b10bcc841cc46ac5f1d
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
a1d80e3b1d210c60c6881a55ed39a4077ff66080 18-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioTrack Java constructor with AudioAttributes and AudioFormat

Change-Id: I82758a4231b8dc0b8d8e72acf3c896a289c28f60
ndroid_media_AudioTrack.cpp
04d480e1c338a921a8659e165d74f8437785acc1 25-Jun-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix some problems with proc stats collection."
306af678a5f1938629e1182b46cc43f2da6e7774 25-Jun-2014 Dianne Hackborn <hackbod@google.com> Fix some problems with proc stats collection.

Also start debugging why we aren't being able to open
/proc files.

Change-Id: I4655904691ac22108c29858cbd01153a251ccbf5
ndroid_util_Process.cpp
3d528c403c8945cc326bb656ff0c2e11373401da 26-Jun-2014 Raph Levien <raph@google.com> Fix build breakage

Other files were including GraphicsJNI.h and didn't have Minikin in the
include path. This patch eliminates the offending include.

Change-Id: I05c9dbf80b93f1731fd0192015e2c9c68a9dd3c6
ndroid/graphics/FontFamily.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Paint.cpp
3660789f06c5fbcb81e6c7c79612048bff8f0f66 26-Jun-2014 Raph Levien <raph@google.com> Switch all text layout to Minikin

This patch switches all text layout operations to use Minikin, removes
the USE_MINIKIN #ifdef, and deletes some of the code that was only used
in the old TextLayout path (although some more refactoring remains).

Change-Id: I51b5c4e2bb46cfd9d204c12b9f16f135c769f5b5
ndroid.mk
ndroid/graphics/Canvas.cpp
ndroid/graphics/FontFamily.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/TypefaceImpl.h
ndroid_view_GLES20Canvas.cpp
d194262f53799ef7cd660729a8f1027263f73e27 26-Jun-2014 Raph Levien <raph@google.com> Delete Paint.getTextGlyphs()

The Paint.getTextGlyphs() method was used for testing the old Arabic
shaper and is entirely obsolete. Note that this is the very last
dependency (other than some enums in the header) for the old TextLayout
code path.

Change-Id: I7b596f0c0942ed50987fc8e0478cd93e667f1f9e
ndroid/graphics/Paint.cpp
3744a64a8ade439f85f27c34369f2c1207e6c252 26-Jun-2014 Raph Levien <raph@google.com> Use Minikin's purgeCaches

In USE_MINIKIN builds, purge the Minikin caches rather than the
TextLayout caches.

Change-Id: Id6bf9db38488ed5023a61feab88004511393644c
ndroid/graphics/Canvas.cpp
ndroid/graphics/MinikinUtils.cpp
5096defdaa4716ce81047a855d6e5ce3f8263600 24-Jun-2014 Igor Murashkin <iam@google.com> camera2: (legacy) Write the JPEG size as part of the blob transport

This fixes StillCaptureTest#testStillPreviewCombination

Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
2ce932832e7caa1a6021539a9b7828ee5f49a610 24-Jun-2014 Chris Craik <ccraik@google.com> Fix xfermode usage in GLES20Canvas.drawColor

bug:15762917

Was previously casting the SkPorterDuff::Mode directly into
SkXfermode::Mode, which is incorrect. Now convert as a first step, as
Canvas does.

Change-Id: I66695b08866ca2008b17f2ff30a36d9ed4d2ed80
ndroid_view_GLES20Canvas.cpp
ac777c821958e68a3be41d11d97aefa9182eab5a 23-Jun-2014 Calin Juravle <calin@google.com> am 3e836835: am a06f5fa6: Merge "Fix the initialization of some profile properties"

* commit '3e8368350e4098a5a5bd88fc2cb623f58c012ba2':
Fix the initialization of some profile properties
5795d6408d8bf44ffe2f49a25f9f333069b59a49 20-Jun-2014 Dan Stoza <stoza@google.com> Surface: Add allocateBuffers to avoid render delay

This plumbs up a new call on the native Surface object that allows
the client to request that BufferQueue pre-allocate all of the buffers
that it might need for rendering. This hopefully prevents allocation
delays during dequeuing and reduces jank.

Bug: 11792166
Change-Id: Ibeaa7475492d4ac2bcacb107ef60c6240081d8b7
ndroid_view_Surface.cpp
19597647f957c4f9755af2f405160f76460ca26d 20-Jun-2014 Elliott Hughes <enh@google.com> am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"

* commit 'ff6b0e24725c642f0681e214f143a8151e4e6bea':
Fixed VM memory leak in AudioSystem JNI interface
a06f5fa6563f7fc08b7bb2305f61bf649add0b5a 23-Jun-2014 Calin Juravle <calin@google.com> Merge "Fix the initialization of some profile properties"
f18961066b7029652dacb9016bacbf192a6cf73d 20-Jun-2014 Elliott Hughes <enh@google.com> Merge "Fixed VM memory leak in AudioSystem JNI interface"
3b20251a355c88193c439f928a84ae69483fb488 23-Jun-2014 John Reck <jreck@google.com> No-fail invokeFunctor

Bug: 15513308
Bug: 15449247

Change-Id: I13a29f9c8d4975cdda6dcb33b6332c2555ff0f7c
ndroid_view_GLES20Canvas.cpp
ndroid_view_ThreadedRenderer.cpp
97a6c20a6a52c9429ed2c8837086f3003e5da274 23-Jun-2014 Vineeta Srivastava <vsrivastava@google.com> Merge "Removed hack for fingerprint HAL."
fc0fa9abd2a155776f3682dc69163a3b9535724c 23-Jun-2014 Calin Juravle <calin@google.com> am ac777c82: am 3e836835: am a06f5fa6: Merge "Fix the initialization of some profile properties"

* commit 'ac777c821958e68a3be41d11d97aefa9182eab5a':
Fix the initialization of some profile properties
a2e897428aad870b909d7d13460bcdf4d221e39d 21-Jun-2014 Vineeta Srivastava <vsrivastava@google.com> Removed hack for fingerprint HAL.

Change-Id: Idb5c464950a83db337b8e9d5bc44487cc8b129e0
ndroid_server_FingerprintManager.cpp
a7090e0cfd7c719a6d4c03aae34f5db98754cbdd 21-Jun-2014 Chris Craik <ccraik@google.com> Update 'DisplayList' vs 'RenderNode' naming in several places

Change-Id: I635c6627d098b661fb9b0ba1bd42fa6d7277d287
ndroid_view_GLES20Canvas.cpp
5e6421bd8f0ac6efd617b1bcdb976b10f001654e 21-Jun-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Switch to using YV12 for ImageReader."
91b9aabc9fa0c058ecc4a8b3f486540c28fe1cc0 20-Jun-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Switch to using YV12 for ImageReader.

Bug: 15116722

- Also fixes incorrect frame number for single captures.

Change-Id: I8552124d18ad176e6724f089a1e3a3f49a5eeec4
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
60679f6b7d45c45be5bd0a44026711890f6ff291 20-Jun-2014 Igor Murashkin <iam@google.com> Merge "camera: Get detailed error reporting from api1 Camera if open fails"
a1d662716b3da384dfe3a758f079e0cbd089784a 20-Jun-2014 Igor Murashkin <iam@google.com> camera: Get detailed error reporting from api1 Camera if open fails

* Also maps camera2 open errors the same for shim/nonshim paths

Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
ndroid_hardware_Camera.cpp
402c8f5a07470bd582a5e7d5c5ff581c5e03a545 20-Jun-2014 Mike Reed <reed@google.com> Merge "stop using (deprecated) SkBitmap::Config"
b933055cf3f7f8ea89bfd3bc9c37a3891ff7310a 16-Jun-2014 Mike Reed <reed@google.com> stop using (deprecated) SkBitmap::Config

Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
f44d49995673dedfd67bd0171066525db8bbf9f4 20-Jun-2014 Elliott Hughes <enh@google.com> am 19597647: am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"

* commit '19597647f957c4f9755af2f405160f76460ca26d':
Fixed VM memory leak in AudioSystem JNI interface
6e335c44c62c3f735efd333bcf0d459a843f90b8 20-Jun-2014 Zhijun He <zhijunhe@google.com> Merge "Camera: Implement HAL1 and higher HAL API coexistence"
4c913801141163362dd5bb7c9784c83f69c11054 17-Jun-2014 Zhijun He <zhijunhe@google.com> Camera: Implement HAL1 and higher HAL API coexistence

A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.

Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
ndroid_hardware_Camera.cpp
e279cd6d219de57cd56291e93a284c18d681edf0 19-Jun-2014 Calin Juravle <calin@google.com> Fix the initialization of some profile properties

Change-Id: I959cb53f262cfb9d1621e4cd99bec05514f7f11f
ndroidRuntime.cpp
0ead2a00f4eebb36c2c1206e156fbf1543ee0dd6 18-Jun-2014 Colin Cross <ccross@android.com> am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"

* commit '15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
Fix reading memory usage for 64-bit processes
88b37edaeab7b31cab0f5115e5c9f63a49991408 18-Jun-2014 Colin Cross <ccross@android.com> Merge "Fix reading memory usage for 64-bit processes"
0c6bc73c5e12dd4caae5bf3acbf1d26c3a9ad130 18-Jun-2014 Colin Cross <ccross@android.com> Fix reading memory usage for 64-bit processes

64-bit process will have virtual addresses that don't fit in an
unsigned long if ActivityManagerService is in a 32-bit process,
and the locations of the '-' and ' ' characters in the maps
are not predictable. Fix the sscanf for finding the start of the
mapping, and use it again to find the end of the mapping. Also
fix a few 64-bit warnings.

Change-Id: I8855c76085142768be1d45346f1032fd37cbe4eb
ndroid_os_Debug.cpp
17e64ffd852f8fe23b8e2e2ff1b62ee742af17a6 19-Jun-2014 Raph Levien <raph@google.com> Merge "Use Minikin grapheme cluster breaking"
e368b6bcfd499543a876b4cae02f1ca563ff1cb6 16-Jun-2014 Raph Levien <raph@google.com> Use Minikin grapheme cluster breaking

This patch uses the Minikin implementation of grapheme cluster breaking,
which improves the behavior of left and right arrow keys for moving the
cursor. Among other things, it fixes the behavior of jumping over the
"fi" ligature in Roboto.

Part of a fix for b/15653110 Improve behavior of arrow keys in EditText

Change-Id: I80ca54c973d85c49f23b81d51a0fe07a7a853d81
ndroid/graphics/Paint.cpp
3f0d6167227d6d2cdd85f7718d92db859b443e92 18-Jun-2014 Raph Levien <raph@google.com> Simple implementation of drawPosText

The existing implementation of drawPosText is broken in various subtle
ways, in any case doesn't work with Minikin. This patch just implements
it by drawing a separate run for each Unicode character, which should
have the least surprising results for complex scripts such as Khmer.

Part of b/11750374 Resolve TODO items for Minikin

Change-Id: I874ae3c163f0cbe3cdf0160564fab04305aed5aa
ndroid/graphics/Canvas.cpp
ndroid_view_GLES20Canvas.cpp
580ecd4b2b6698d3597a32654dcd948fe69ebfdb 19-Jun-2014 Raph Levien <raph@google.com> Merge "Simple implementation of drawPosText"
ff0d9f098e51c54e1a030ed21fd980680cb7b405 10-Jun-2014 Eric Laurent <elaurent@google.com> AudioTrack: Add support for compressed audio

Add AudioFormat encoding definitions for compressed audio
and modify AudioTrack to accept compressed audio data.

Bug: 9428304.

Change-Id: Ib85a4d0d78af45924328f4d2d2ffebe83f4a00c5
ndroid_media_AudioFormat.h
ndroid_media_AudioTrack.cpp
ca48160138eccf5d3f3715bb144a144e77726a23 18-Jun-2014 John Reck <jreck@google.com> Merge "Throw ISE on too-big-views-with-layers"
c25e506f7fc08790c0532f927f31310a2ca778b7 18-Jun-2014 John Reck <jreck@google.com> Throw ISE on too-big-views-with-layers

Bug: 12971954

Change-Id: I3ef995e91f236014b0a72a90846ef19ce6dc42b1
ndroid_view_ThreadedRenderer.cpp
a0dc40409265fa46c3ceee91ec68d2f45b8f67e8 18-Jun-2014 Derek Sollenberger <djsollen@google.com> Fix namespace for picture

Change-Id: Id21ebcf2ba4befb4af15cd1d493428a64599afc1
ndroid/graphics/Picture.cpp
c802c8cda234129c1ce3c7a939bd68a1d5813ce6 18-Jun-2014 Raph Levien <raph@google.com> Merge "Implement drawTextOnPath with Minikin"
9d2b5e1930bfc4b1da1c865843c247c708ea1565 16-Jun-2014 Raph Levien <raph@google.com> Implement drawTextOnPath with Minikin

This patch contains an implementation of drawTextOnPath for both
software and hardware Canvas using Minikin for text layout. One of the
steps for switching all remaining text operations to Minikin so the old
TextLayout and Skia fallback fonts mechanisms can be deleted.

Bug: 11750374 Resolve TODO items for Minikin
Change-Id: I06bfe74a101fa1dcdfc38f530f7194d71e522a85
ndroid/graphics/Canvas.cpp
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid_view_GLES20Canvas.cpp
bc8bd76bc707cede75638ca299feb4a8d8698f3b 18-Jun-2014 Derek Sollenberger <djsollen@google.com> Merge "Refactor android.graphics.Picture JNI bindings."
50b9fcfae1ec7e3388ec8a31611cb7bc2c3221e6 18-Jun-2014 Andy McFadden <fadden@android.com> Merge "Add two new display info fields"
7e31bb6c76b85258871b178e16e41fa4dff3a527 18-Jun-2014 Colin Cross <ccross@android.com> am 0ead2a00: am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"

* commit '0ead2a00f4eebb36c2c1206e156fbf1543ee0dd6':
Fix reading memory usage for 64-bit processes
cd589baba922f6b359ed910c3fbc711242c91531 17-Jun-2014 Jim Miller <jaggies@google.com> Merge "First pass at FingerprintService integration with HAL. Move FingerprintService to framework services directory Fix merge conflicts."
a7596147b43940cad3f76c53ed154ef088b9269b 07-Jun-2014 Jim Miller <jaggies@google.com> First pass at FingerprintService integration with HAL.
Move FingerprintService to framework services directory
Fix merge conflicts.

Tested: scanning, enrolling, removing.

Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
ndroidRuntime.cpp
ndroid_server_FingerprintManager.cpp
24609581330bc350f797179e3c1a59789c645ec2 13-Jun-2014 Antonio Calabrese <acalabrese@google.com> Added primitive parameters to various functions requiring rectangles.

Change-Id: I5a2678fa989f0ff34404b8236787a8153b05f113

bug:14322352
ndroid/graphics/Canvas.cpp
ndroid/graphics/Path.cpp
4b0959d8db20c08ab1fed37f397b303af229162b 12-Jun-2014 Derek Sollenberger <djsollen@google.com> Refactor android.graphics.Picture JNI bindings.

This is the first CL in a series of CLs to refactor the Graphics JNI bindings.

bug: 15672762
Change-Id: I1455fa1330c7426407c06eeaad81ad37a57373b1
ndroid.mk
ndroid/graphics/AndroidPicture.cpp
ndroid/graphics/AndroidPicture.h
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Picture.cpp
ndroid/graphics/Picture.h
ndroid_graphics_Picture.cpp
e8b1aeb51e1e5da64f1d4fd40f2ee1e815886fe5 13-Jun-2014 Andy McFadden <fadden@android.com> Add two new display info fields

This adds SurfaceFlinger's app VSYNC offset and buffer deadline
values to DisplayInfo. The values will be available to apps
through queries on a Display object (currently hidden).

Bug 14612039

Change-Id: I48760f58a9d74d99651b02a9d595f420410f2bb5
ndroid_view_SurfaceControl.cpp
a7aa1b0aa566b2ff310cb89fbc9437de4819f583 12-Jun-2014 Anish Athalye <aathalye@google.com> Implement Paint.breakText() using Minikin

Change-Id: I36cee2d840ce1bd24a9a06f0c680880396b7398a
ndroid/graphics/Paint.cpp
466cd7a2a65b1204c07ff5eaeebb7decc86a1fff 17-Jun-2014 Raph Levien <raph@google.com> Merge "Clean up dirFlags / bidiFlags confusion"
051910b9f998030dacb8a0722588cc715813fde1 16-Jun-2014 Raph Levien <raph@google.com> Clean up dirFlags / bidiFlags confusion

The dirFlags and bidiFlags enums are distinct, and have different
meanings. The former is a determined direction for a run of text, while
the latter is a request for the bidi algorithm. They have been used
interchangeably, and this has caused some problems, notably running the
bidi algorithm needlessly when the direction for a run is already
determined.

This patch cleans up the confusion, by always naming each occurrence
explicitly "boolean isRtl" or "int bidiFlags" (the previous code often
just used "int flags", which added to the confusion), and converts
between the meanings when a function takes an isRtl argument but passes
it to another function expecting bidiFlags.

Fixes b/15089607 Clean up bidi flag mess

Change-Id: I410b6604376e853dd12c255e7f5a9d2b9a310dd9
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid_view_GLES20Canvas.cpp
289476b65b8129729936f75a3549eb99257df482 16-Jun-2014 Colin Cross <ccross@android.com> am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote"

* commit 'a803542aad4a58fe2446b8bf9cc4a4f59942d084':
clean up native com.android.internal.os.Zygote
18cd9f57621b47889bdf81b2b04413569a999ef4 13-Jun-2014 Colin Cross <ccross@android.com> clean up native com.android.internal.os.Zygote

This is never compiled for the host any more, so remove all the
unnecesarry ifdefs.

Change-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e
om_android_internal_os_Zygote.cpp
cb634bda7b0130015509b0e4d236d10b20b2340d 16-Jun-2014 Colin Cross <ccross@android.com> Merge "clean up native com.android.internal.os.Zygote"
5f20e1ae8df262ac777944f00b685f0cf2fe4458 14-Jun-2014 Nick Kralevich <nnk@google.com> am 23315095: am 748f4b8d: Merge "update mLastSlash for gdbserver"

* commit '23315095f1d1f647311ad0fcf05ddb152ad9452d':
update mLastSlash for gdbserver
195b23ef712c51dc8d2f3a1f1943a27054dc4e74 14-Jun-2014 Nick Kralevich <nnk@google.com> update mLastSlash for gdbserver

the gdbserver special case wasn't updating mLastSlash. Fix it.

Change-Id: I63d64bb5f543bd2df6183649cf727e830731e144
om_android_internal_content_NativeLibraryHelper.cpp
cdd1fd7a8f88e6d99e773b2fb867dbf1d6c64eb9 11-Jun-2014 Calin Juravle <calin@google.com> am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"

* commit 'b0492d6943fc590c2569dd2fc393db54a73986d3':
Shrink profiler.start-immediately to fit in the maximum property size
5fc4e487420b7730c9eaf2623ff1efd2633daba7 11-Jun-2014 Calin Juravle <calin@google.com> am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"

* commit 'b0f59cdcb4d2205faa3811277163bbf215b68dfc':
Improved profile.start-immediately comment
022fa3b057d860adf52eef09ebb03456f8fd0dd6 17-Jun-2014 Colin Cross <ccross@android.com> am 289476b6: am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote"

* commit '289476b65b8129729936f75a3549eb99257df482':
clean up native com.android.internal.os.Zygote
6e3a1c2bb27efeb717921a30c309066636a11b50 14-Jun-2014 Nick Kralevich <nnk@google.com> am 5f20e1ae: am 23315095: am 748f4b8d: Merge "update mLastSlash for gdbserver"

* commit '5f20e1ae8df262ac777944f00b685f0cf2fe4458':
update mLastSlash for gdbserver
564dae50b519cc7faab149662f3e2d6c94e59851 12-Jun-2014 Andy McFadden <fadden@android.com> Merge "Delete a local ref in getSurface"
5ad3ab8a1639eb7feebca9cba2be634bde9dd362 12-Jun-2014 Andy McFadden <fadden@android.com> Delete a local ref in getSurface

ANativeWindow_fromSurface() provides a native-only call path to
android_view_Surface_getSurface(), so we need to clean up the
local reference.

Bug 14087233

Change-Id: I92aa5aa492c47a0642fdcb28c717ad7f874e1ad9
ndroid_view_Surface.cpp
cf6edd2b22473648fe4589aa256d4e851d33d1db 12-Jun-2014 Florin Malita <fmalita@google.com> Merge "Pass full matrix + clip save flags to the native SkCanvas."
84ecb7e1aad92598cc675bf4dfb8516b70daa5e1 12-Jun-2014 Leon Scroggins <scroggo@google.com> Merge "remove call to (deprecated) SetDeviceConfig"
2216f9c2e57164bc9ac229081c8610fcedfe8df0 11-Jun-2014 Mike Reed <reed@google.com> remove call to (deprecated) SetDeviceConfig

this was ignored by all callers, in that they always specify a preferred config (8888).

This removal will allow skia to remove the api and its global.

Change-Id: Ic0a4c673ddd60d0078f75e0e482aba4c9b9cf682
ndroidRuntime.cpp
17a8bfc38a565ae96f43d36b223779be840bb50c 03-Jun-2014 Leon Scroggins III <scroggo@google.com> In Bitmap.reconfigure, update the pixelref's info.

This fixes CTS tests which are crashing on an SkASSERT due to a
mismatch of SkImageInfo between the SkPixelRef and SkBitmap.

Also directly call ref() and unref() instead of SkSafeRef/SkSafeUnref,
since we would already crash if the SkPixelRef in question was NULL.

Also if the user attempts to reconfigure to 4444, use 8888 instead.

Change-Id: I473ef225c6cd1c92d67ae103c53c6cff0dad92de
ndroid/graphics/Bitmap.cpp
b59508fce51b23f0201f4dcba7e4f18bab4f9d1a 23-Apr-2014 Robert Phillips <robertphillips@google.com> Changes to framework for ToT Skia.

Consists of 3 cherry-pick from changes by robertphillips@google.com
in master-skia:

-----------------------------------------------------------------------

New AndroidPicture wrapper class

Address code review comments & use new SkPictureRecorder::partialReplay
entry point

Addressing code review issues

Switch MakePartialCopy to makePartialCopy

Conflicts:
core/jni/android/graphics/Picture.cpp

Ie530ab15b3d549f0ecfb0ecc131f9144a7b72a91

Remove AndroidPicture from GraphicsJNI and split into .h and .cpp

-----------------------------------------------------------------------

Fix lingering legacy picture recording behavior
Address code review issues

Iaf870c2c400dbe70dc32d6d445574904f5ea718f

-----------------------------------------------------------------------

Update Android to new SkCanvas::drawPicture interface

As of Skia 9b14f26d (Alter SkCanvas::drawPicture (devirtualize,
take const SkPicture, take pointer) -
https://codereview.chromium.org/313613004) SkCanvas::drawPicture
has an alternate signature. The old entry point is deprecated.

I63395da61ecc3b58bfd2bc094752081f4b2f7535

-----------------------------------------------------------------------

Change-Id: I041133aeb5639abd853370e512acf93870f82aea
ndroid.mk
ndroid/graphics/AndroidPicture.cpp
ndroid/graphics/AndroidPicture.h
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Picture.cpp
ndroid/graphics/pdf/PdfDocument.cpp
5052e78949f4117c8c0c343571506d2272c8fb46 12-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioManager: add ability to allocate a new session ID"
9c9777da6839a22cd6cdeadbc48f02e1ef1f4f2b 11-Jun-2014 Calin Juravle <calin@google.com> am cdd1fd7a: am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"

* commit 'cdd1fd7a8f88e6d99e773b2fb867dbf1d6c64eb9':
Shrink profiler.start-immediately to fit in the maximum property size
a48a6fd1f2a359e8cb3fb4ca59a008370a950be6 11-Jun-2014 Calin Juravle <calin@google.com> am 5fc4e487: am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"

* commit '5fc4e487420b7730c9eaf2623ff1efd2633daba7':
Improved profile.start-immediately comment
994cd28e723ecb6bf8ecab9809d9700e93a4b441 11-Jun-2014 Calin Juravle <calin@google.com> Shrink profiler.start-immediately to fit in the maximum property size

Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf
ndroidRuntime.cpp
816f71b7e0dc263362e9fc8d251c8d1944bff17c 13-Jun-2014 John Reck <jreck@google.com> Merge "Move LayerType to RenderNode"
25fbb3fa1138675379102a44405852555cefccbd 12-Jun-2014 John Reck <jreck@google.com> Move LayerType to RenderNode

Change-Id: Icb79a5015cb0362b1f3a66d09007450730135a97
ndroid_view_HardwareLayer.cpp
ndroid_view_RenderNode.cpp
a447d29c65fb811cd184775a3476101a1cede929 12-Jun-2014 John Reck <jreck@google.com> Fix DA bugs

* Now aware of transform of DrawDisplayListOp
* Supports projection

Bug: 15539677
Bug: 15506680

Change-Id: Ic16f482cd48c3add12e49eca529281be12b93491
ndroid_view_RenderNode.cpp
221748039c74215192e9e538a5d05f601b441242 13-Jun-2014 Aravind Akella <aakella@google.com> Merge "Add java APIs for Sensor reportingMode."
98908aa0c97d9685045a168ca39ec1ee7988dabe 12-Jun-2014 Jeff Brown <jeffbrown@google.com> Merge "Add call to set power mode for display"
e830c37a4a499c439083afc56c64fa178ea5889d 12-Jun-2014 John Reck <jreck@google.com> Merge "Fix DA bugs"
b85056018b5be05c19c7b1cce1ccee35759ad1b4 05-Jun-2014 Florin Malita <fmalita@google.com> Pass full matrix + clip save flags to the native SkCanvas.

With granular state flags being deprecated, always pass full
save flags to the native canvas.

Legacy behavior is emulated in NativeCanvasWrapper, with a focus
on minimizing the overhead when there are no side effects to be
persisted.

Change-Id: Ifdad2ff9bb3a1f9736c6c41afc9ec6c07f62320e
ndroid/graphics/Canvas.cpp
8a21f5dd79e93aa4e4b08ab4f33b9255d7c06961 06-Jun-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioManager: add ability to allocate a new session ID

Expose method to allocate a new session ID.
Make the generic error code public.

Change-Id: Iec93548292845e3a1b1a97be9bbe54e9fcf06f2d
ndroid_media_AudioSystem.cpp
cc8f7ae682f3ce1ed82a7850433d4502245bdcb4 10-Jun-2014 Raph Levien <raph@google.com> Merge "Support fake italics"
a7be5dd0063207d203c77554ad4b1f6f1d659c65 10-Jun-2014 Raph Levien <raph@google.com> Merge "Support for fake bold in Minikin builds"
0627ec08dcc2e87c17e9b85f045dfb27dc4884b3 07-Jun-2014 Raph Levien <raph@google.com> Support fake italics

This patch adds fake italics, using essentially the same mechanism as
the fake bold implementation. Also combines fake bold/italic settings
with ones explicitly set in the paint.

Change-Id: Ia7eb3ddc8a6192d191711ba723ffd0d1d9d93f2e
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
1fc0fa87d42ce9268ece76b85b9edc834593e53a 07-Jun-2014 Raph Levien <raph@google.com> Support for fake bold in Minikin builds

Part of the fix for bug 15436379 Fake bold doesn't fully work (Minikin)

This patch queries the Minikin layout for when fake bold is needed,
and applies that to both shaping and drawing paint.

Also simplifies refcounting (the lifetime of all MinikinFont objects
is subsumed by the enclosing FontCollection).

Note: the fake bold flag set by the user is ignored in this patch.

Fake italics would be possible using the same mechanism, but it's
slightly more complicated (fake and user-set textSkewX values would need
to be combined, and the latter restored after drawing).

Change-Id: Ica2c4604846cbb37e5a783778b18d8993c9d4563
ndroid/graphics/Canvas.cpp
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinSkia.h
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid_view_GLES20Canvas.cpp
cdb4a446de27789911d0ccb58fdede548abd3687 10-Jun-2014 Leon Scroggins III <scroggo@google.com> Merge "Fix a memory leak with empty screenshot."
e3f9800f38da3cd1d83889132952eb4ab2e8c278 10-Jun-2014 Leon Scroggins III <scroggo@google.com> Fix a memory leak with empty screenshot.

Use an autodeleter to delete the ScreenshotClient when it's not
needed.

Discovered while investigating BUG:15454296, but it does not fix
the problem.

Change-Id: I00ea81de15ddc2507d904a6c20af3c410f573dce
ndroid_view_SurfaceControl.cpp
3f967910d99254f166dea7e1439b6d5441f046d8 10-Jun-2014 Calin Juravle <calin@google.com> Improved profile.start-immediately comment

Change-Id: I41bda6a1cd99cb0a8230961e0462a41cb552887e
ndroidRuntime.cpp
27900358f2f5b89e8b01516b28a916d16c99ba9b 04-Jun-2014 Aravind Akella <aakella@google.com> Add java APIs for Sensor reportingMode.

Change-Id: Iba6bb11f990d9966b86bf02d70ced7312f3e64a8
ndroid_hardware_SensorManager.cpp
66e29d08c7a8bf5c2822505f8368eece481187ce 09-Jun-2014 Calin Juravle <calin@google.com> am ee20e16d: am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."

* commit 'ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d':
Fixed comments related to profile properties.
ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d 09-Jun-2014 Calin Juravle <calin@google.com> am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."

* commit '337f97bedc09354ea9a8a506aefccc39dd4248e8':
Fixed comments related to profile properties.
de99f08f658c13ae8e0cd46f7bebc78311585bf2 06-Jun-2014 Calin Juravle <calin@google.com> Fixed comments related to profile properties.

Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
ndroidRuntime.cpp
71f75f1e7be4107c9ffbcb37d816c053d9675367 06-Jun-2014 Raph Levien <raph@google.com> Merge "Fix getFontMetrics problems"
817ef4ae79bd39b5e55fc6ca4e3b8e47e114579f 06-Jun-2014 Raph Levien <raph@google.com> Fix getFontMetrics problems

Fixes a number of individual problems. In Minikin builds, gets base font
from TypefaceImpl rather than using whatever random font was in the
paint. Respects elegant metrics in ascent and descent methods as well as
getFontMetrics. Sets fixed ascent and descent values to 1900, -500,
which matches the Roboto font.

Part of the fix for bug 15467288 "Inconsistent line heights on
Minikin builds"

Change-Id: I12915f4a62de28932469c7279241eecf7320c47b
ndroid/graphics/Paint.cpp
743922e9dfe295d4cc837eee1646272aa88da135 06-Jun-2014 John Reck <jreck@google.com> Merge changes Ie0773f85,Ie5e75505

* changes:
Even FASTER damage calculations!
Have all the setters return changed
53be7b79fb174a4b063753f7c8e5388317224087 06-Jun-2014 Florin Malita <fmalita@google.com> Merge "Implement SkCanvasGlue::clipRegion() using clipPath()."
c09722dc554a27b472c6f6264f9479d6d0639a28 06-Jun-2014 Calin Juravle <calin@google.com> am c88a5ac3: am d1d46d9d: am bbf849b1: Merge "Add missing profiler options."

* commit 'c88a5ac3ff0e3b3759c58279204bb8f6b8901669':
Add missing profiler options.
c88a5ac3ff0e3b3759c58279204bb8f6b8901669 06-Jun-2014 Calin Juravle <calin@google.com> am d1d46d9d: am bbf849b1: Merge "Add missing profiler options."

* commit 'd1d46d9d5564a27dae45c2f2a62e6769402b556c':
Add missing profiler options.
9828d067fb877d8c78b5b5f2f7c0a08649e50f59 02-Jun-2014 Calin Juravle <calin@google.com> Add missing profiler options.

Bug: 12877748

Change-Id: I311b8fb7e15d512e65631bc2a52c443a271d3d3f
ndroidRuntime.cpp
5edb85c17dd7f2cb94ad0bd63816ef01efc71cc2 05-Jun-2014 Eric Laurent <elaurent@google.com> Merge "add sound trigger JNI"
1dc14ba388cc37908c73d75ec31547c9c6f59d4e 05-Jun-2014 Florin Malita <fmalita@google.com> Implement SkCanvasGlue::clipRegion() using clipPath().

(Canvas clipRegion() public API is scheduled for deprecation)

The SkCanvas clip stack does not support clipRegion() ops. Implementing
these in terms of clipPath() makes persisting clips for SaveFlags
emulation purposes a whole lot simpler.

Change-Id: I41d1eb9e292ce370fba224338f9071d5e4068621
ndroid/graphics/Canvas.cpp
240047694338830521594688de194a1cde2d4537 05-Jun-2014 Raph Levien <raph@google.com> am e0ebf19c: Merge "Support for context in Minikin shaping" into lmp-preview-dev

* commit 'e0ebf19cbfa60ba3eb0891d5e8416b70b212bc36':
Support for context in Minikin shaping
4c25e5a1f9bb24e84d50d97266388408fa878ebd 05-Jun-2014 Raph Levien <raph@google.com> am 79fbad97: Merge "Support for scaleX and skewX in Minikin" into lmp-preview-dev

* commit '79fbad97705d191f80d7af7e494ca4a5fed3a783':
Support for scaleX and skewX in Minikin
0ead890d1c875457e4ca9f9fc0cccd262010cc38 05-Jun-2014 Raph Levien <raph@google.com> Merge "Support for context in Minikin shaping" into lmp-preview-dev
30d3c97f297ed484938992bc669bd0e6b7713d9a 05-Jun-2014 Raph Levien <raph@google.com> Merge "Support for scaleX and skewX in Minikin" into lmp-preview-dev
6bfd7e7df3a9f9ea2f9e57a3552eed7f518be711 04-Jun-2014 Raph Levien <raph@google.com> Support for context in Minikin shaping

This patch uses the Minikin's new doLayout API that supports context,
and has some simple refactoring (pass css as string rather than setting
on the Layout object) to use this api.

Change-Id: I899474f81d377f3106e95ee3eb8d0fcc44c23ac2
ndroid/graphics/Canvas.cpp
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
ndroid_view_GLES20Canvas.cpp
e95b5850ac2e56330abf68362451e7614b3dfe16 31-May-2014 Raph Levien <raph@google.com> Support for scaleX and skewX in Minikin

Passes textScaleX and textSkewX parameters, as well as paint flags from
the paint to Minikin, to support nontrivial scale and stretch of text.
Passing paint flags should minimize kerning artifacts arising from
mismatch of glyph rendering in layout and drawing.

Also, replaces unsafe snprintf to a fixed size buffer with a safe
version, which still avoids an allocation per layout operation.

This is part of the fix for bug 15186705 "Usability of the suggestion
strip in recent OTA's is severely reduced"

Change-Id: I79788383135836f4c21fb84405f36382627bf959
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinSkia.h
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/TypefaceImpl.cpp
60b62bc5c11c0bfcdf84ca8f5b2053e5747f86bc 19-Apr-2014 Eric Laurent <elaurent@google.com> add sound trigger JNI

Add JNI for sound trigger hardware native service.

Change-Id: Idd0ee42c7af5fe20e7d8295994211de3a517bd13
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_SoundTrigger.cpp
c55929a2a5686fe456b19cd54a73b8bde2a4332b 25-May-2014 Prashant Malani <pmalani@google.com> Add call to set power mode for display

The blank/unblank interface is being replaced by a generic
setPowerMode() call. This will allow the support of low power modes in
displays where such functionality is available. Currently three modes
are defined:

- POWER_MODE_OFF
- POWER_MODE_DOZE
- POWER_MODE_NORMAL

POWER_MODE_OFF would be analogous to blanking the screen,
POWER_MODE_NORMAL akin to unblanking it, and POWER_MODE_DOZE would
trigger an entry into the display's low power mode.

We also tie the JNI call to set power mode to the call from services which
actually invokes it.

The generic setPowerMode() call can be expanded to potentially include
other display power states.

Bug: 13472578
Change-Id: I74677506d3ee2ccc50ba70c5102d96b31fe7b837
Signed-off-by: Prashant Malani <pmalani@google.com>
ndroid_view_SurfaceControl.cpp
8608bbb2077d8db81e29711ad14dcad073480b8c 05-Jun-2014 Raph Levien <raph@google.com> am 626b82f6: Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev

* commit '626b82f63e4d7ea97187bec313b5cb687bb501b7':
Query style from asset-created font (Minikin)
8224ad4f70a66316a77e9aafbdfe495aba8a8680 05-Jun-2014 Raph Levien <raph@google.com> Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev
9e80b82d9683e0487f52450ac3fa9bef2179412a 04-Jun-2014 Eric Laurent <elaurent@google.com> am b1873bdd: Merge "AudioSystem JNI: fix audio gain channel count" into lmp-preview-dev

* commit 'b1873bdd565509097b6fe711773dc023589f9a11':
AudioSystem JNI: fix audio gain channel count
f8423bae17dfb2a73a4f4adb40aaced76d42f0a0 04-Jun-2014 Raph Levien <raph@google.com> am 8fad12dc: Merge "Fix incorrect getStringBounds (Minikin)" into lmp-preview-dev

* commit '8fad12dc66f47af2fd394f44858802d10cf110f1':
Fix incorrect getStringBounds (Minikin)
1633caef58ebd0bc3b0c5da15dde2fb425b77c43 04-Jun-2014 Raph Levien <raph@google.com> Query style from asset-created font (Minikin)

This patch sets fStyle on the TypefaceImpl based on querying the font,
which is important in the Typeface.createFromAsset path. This fixes both
the style returned from getStyle() and also selects fallback fonts to
best match the style of the main font.

Fixes bug 15429916: "Typeface.getStyle always returning 0 in some L
devices".

Change-Id: I1992ba1e65e7f488d331e175f5f12843f67c2faa
ndroid/graphics/TypefaceImpl.cpp
88db5c37ada554ca6cd543f07a6af10bd1e18794 04-Jun-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem JNI: fix audio gain channel count" into lmp-preview-dev
e4267ea4f20740c37c01bfb6aefcf61fddc4566a 04-Jun-2014 John Reck <jreck@google.com> Even FASTER damage calculations!

* Now with more native!
* Less matrix math thanks to bulk-property-update support!
* Zero JNI on the View.damageInParent() path!
* Fully aware of RT-driven animators!
* Likely full of new and exciting bugs!
* But it also fixes at least 1 existing invalidate bug!

Change-Id: Ie0773f85a60850ff2668370c58defef2e8aa079f
ndroid_view_HardwareLayer.cpp
ndroid_view_RenderNode.cpp
ndroid_view_ThreadedRenderer.cpp
c5dc0370086a7f1c9a2d0d34321580648a0836ea 04-Jun-2014 Raph Levien <raph@google.com> am aef648f4: Merge "Better Minikin integration" into lmp-preview-dev

* commit 'aef648f405a6f2ed2e523e69cd6f1da884f4b9dd':
Better Minikin integration
ccee3b158a83afb3df7cf9ea33690f5c56cf6244 04-Jun-2014 Ruben Brunk <rubenbrunk@google.com> am c354b069: Merge "DNG: Write out additional fields." into lmp-preview-dev

* commit 'c354b06955508816af29daefdac5ef9ea9b89fbb':
DNG: Write out additional fields.
79c7de77a7da9cbcb9428ab6203987feb35a427f 23-May-2014 John Reck <jreck@google.com> Have all the setters return changed

Change-Id: Ie5e755058a7094bb0c2fce60ec3cef47c23823ce
ndroid_view_RenderNode.cpp
0078c7cc59082d32799b9097a81a0341fe98619d 04-Jun-2014 Eric Laurent <elaurent@google.com> AudioSystem JNI: fix audio gain channel count

Use audio utility function instead of popcount
to get channel count from channel mask

Bug: 14815883.
Change-Id: Ia9a898c9f7f03d22caeefb418be1e33f65f7b7bb
ndroid_media_AudioSystem.cpp
676f92e9a77a547b80a3a22bb3d4e4d0d2aa0bed 04-Jun-2014 Florin Malita <fmalita@google.com> Merge "Canvas JNI cleanup."
95d49149cc7fff87a18449fa661454c1b5ddbd30 03-Jun-2014 Florin Malita <fmalita@google.com> Canvas JNI cleanup.

As pointed out in a previous patch review, some native Canvas methods do not
receive a native canvas handle and instead have to use GraphicsJNI to query
the object mNativeCanvasWrapper field.

To avoid the extra JNI call, this change adds the missing Java wrapper
methods and ensures that all native calls are passed efficient native
handles.

Also, some native methods are consolidated: save, saveAll -> save,
clipRect* -> clipRect.

Change-Id: I2eae4a633f6a463d9fbae2ca632661acc8b5cfc3
ndroid/graphics/Canvas.cpp
a578ab00c41e5ac6cc4b69ff4ba61d2c94c5e47c 04-Jun-2014 Leon Scroggins III <scroggo@google.com> Merge "Ignore inPurgeable and inInputShareable."
854363e3d2fb2a9e41d8719f4a2f0f8b89440a46 04-Jun-2014 Raph Levien <raph@google.com> Fix incorrect getStringBounds (Minikin)

This patch wires up getStringBounds to do the layout with Minikin to get
accurate bounds, and with the correct typeface. It fixes bug 15416575
"getStringBounds gives wrong result in Minikin".

Change-Id: I5c020bc372acb1d785a33c3c296239c151bd8c87
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
38bd7b9c4dc8af0d37e4a353e69a5bb130edec07 04-Jun-2014 Raph Levien <raph@google.com> Merge "Better Minikin integration" into lmp-preview-dev
f2114d5646194100242206b267ddd6e7194b7da9 02-Jun-2014 Raph Levien <raph@google.com> Better Minikin integration

This patch improves the Minikin integration in a number of ways,
including:

Software rendering does text decorations and handles alignment
correctly. This fixes bug 15139067 "Centered text isn't working".

Paint implements getTextPath. This fixes bug 15143354 "Text rendering in
Maps Navigation wrong typeface?"

Also a bit of refactoring, since there was duplicated code for iterating
font runs that's now a static method in MinikinUtils.

Change-Id: I4cfdb2c0559982376348325a757d95235fab1768
ndroid/graphics/Canvas.cpp
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid_view_GLES20Canvas.cpp
3f6680ad4880de4a94296733fdd4533ea55862d5 04-Jun-2014 Ruben Brunk <rubenbrunk@google.com> Merge "DNG: Write out additional fields." into lmp-preview-dev
b8df8e07d6fc530c82d21ca3199411e2e60975b1 03-Jun-2014 Ruben Brunk <rubenbrunk@google.com> DNG: Write out additional fields.

Bug: 15112503

Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
ndroid_hardware_camera2_DngCreator.cpp
0aa39dc2dcfca20f4d9cbeb1699d48a4808f2c70 03-Jun-2014 Leon Scroggins III <scroggo@google.com> Ignore inPurgeable and inInputShareable.

These are discouraged anyway, due to the fact that using them may
result in decoding on the UI thread. Now that they are ignored, the
images will still be decoded; they just will never have their
memory purged, meaning there could be a RAM penalty. This is
acceptable, since apps are encouraged to instead use inBitmap to
manage bitmap memory.

This incidentally fixes BUG:15390468 by converting purgeable index8
(e.g. gif) images to non purgeable.

Change-Id: Ieaf3ab25d28d93fb94bdaea1eb3bd762f163b09a
ndroidRuntime.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
690d45157d01088778e4da398c31575be5aa35ce 03-Jun-2014 Raph Levien <raph@google.com> am faa91203: Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev

* commit 'faa912037ca4895eb99155a4a53354435ee413c2':
Support fallbacks for custom typefaces (Minikin)
1044046aa9dca4e46656cf2b06230b348e41d8d9 03-Jun-2014 Raph Levien <raph@google.com> am 8e3605e4: Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev

* commit '8e3605e4de5a109792acca22c37976ac52ee571e':
Check for NULL on TypefaceImpl unref
7e3a7fc35f1972819e9e8dfabb8c8efb3667dc67 03-Jun-2014 John Reck <jreck@google.com> Merge "Remove GLRenderer"
c32a244e907719e03d0fae42b20401dcd2c595fc 03-Jun-2014 Narayan Kamath <narayan@google.com> am dd2e9d33: am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."

* commit 'dd2e9d3386d2d74f99f79bcad951ff5cdefa6fab':
Scan for renderscript files before deciding ABIs.
dd2e9d3386d2d74f99f79bcad951ff5cdefa6fab 03-Jun-2014 Narayan Kamath <narayan@google.com> am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."

* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
Scan for renderscript files before deciding ABIs.
d47e38b6342fea93b007319431634a4bcfee452c 16-May-2014 Narayan Kamath <narayan@google.com> Scan for renderscript files before deciding ABIs.

The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a
om_android_internal_content_NativeLibraryHelper.cpp
84a4c887a07c1c2939443f4e0587d7f1ac109e4b 30-May-2014 John Reck <jreck@google.com> Remove GLRenderer

Change-Id: I180286417c1a354fc7eb1eadb1884ac6add0795c
ndroid.mk
ndroidRuntime.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GLRenderer.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_ThreadedRenderer.cpp
596f0b1a03c1d733697f89757bcf3c80b9900c78 03-Jun-2014 Raph Levien <raph@google.com> Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev
44e3da3c289758dd27a6dc8a588ec40364c0746b 02-Jun-2014 Raph Levien <raph@google.com> Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev
a0cba0fde3e39723052a50e1f09e3b254da6c175 02-Jun-2014 Raph Levien <raph@google.com> Check for NULL on TypefaceImpl unref

It's possible for a TypefaceImpl to contain a null pointer, which was
causing crashes on unref. This patch just checks for NULL.

Fixes bug 15104801 "Aviate Launcher crashes on startup - Hammerhead L
AAV49B"

Change-Id: Idf9f176c54bf81ff3daacc0b33e95aa9d8bbe57f
ndroid/graphics/TypefaceImpl.cpp
776512d4b6a7c1b1b7893cde5bec1f3d65c0ea94 02-Jun-2014 John Reck <jreck@google.com> am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev

* commit 'feccbdc4d0bee3eb4c395bd93ba51cbc6616527a':
Add setStartValue to RNA
c6b3264e16f1d2b72e7f9508559981ce9970157c 02-Jun-2014 John Reck <jreck@google.com> Add setStartValue to RNA

Bug: 15198607
Should be good-enough for Ripples to use for pseudo-chaining
support.

Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63
ndroid_view_RenderNodeAnimator.cpp
d573794d83a049fe59e289944f0cd77406dd776a 02-Jun-2014 Raph Levien <raph@google.com> Support fallbacks for custom typefaces (Minikin)

This patch adds the fallback font list to custom typefaces created from
files and assets, as well as those created by name. This is a fix for
the deskclock half of bug 15139067 "Centered text isn't working".

Change-Id: I0cc60951953dfb73817a98ddfee5713f0387ee90
ndroid/graphics/FontFamily.cpp
ndroid/graphics/MinikinSkia.h
9ec2eabe5ae9b17064412833ae11b113da453b75 02-Jun-2014 Florin Malita <fmalita@google.com> Merge "Add a native Canvas wrapper."
3ed851bd07867fe41c5c9c2a9421da0b92ae1c6e 31-May-2014 Eric Laurent <elaurent@google.com> am f2e19a36: Merge "AudioManager: add audio port gain control" into lmp-preview-dev

* commit 'f2e19a36973331bbc09284993f772bf6981c10da':
AudioManager: add audio port gain control
086995c6dae73f2fa30e647c90ca6247c7982ea5 31-May-2014 Eric Laurent <elaurent@google.com> am b4499f84: Merge "audio routing update listener" into lmp-preview-dev

* commit 'b4499f84605faf06479cbb793e945d0af50fdead':
audio routing update listener
ec2f4b0aece1583f3e3f5c449ca107d6f7e915e1 31-May-2014 Eric Laurent <elaurent@google.com> am 47615317: Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-dev

* commit '476153173b5a1b6b1fb5fc41af8b87d7e1ec36b3':
AudioSystem: added JNI for routing extensions
54b5e5bdf621449a1806ff2971b95df273069c44 31-May-2014 Eric Laurent <elaurent@google.com> Merge "AudioManager: add audio port gain control" into lmp-preview-dev
8725859ee3a9fb7dd09641c2b13baa4f7a16ca99 31-May-2014 Eric Laurent <elaurent@google.com> Merge "audio routing update listener" into lmp-preview-dev
a89eb2d8e550b511285ab3b4fb7dec1ed4ca5028 31-May-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-dev
3a24199a0fe9479802ff6096d82cb3745efa1f1f 20-May-2014 Eric Laurent <elaurent@google.com> AudioManager: add audio port gain control

Implement AudioManager.setAudioPortGain() API.

Bug: 14815883.

Change-Id: Ib54bd1fd1392c474f4767a00228b0a617c51ec5e
ndroid_media_AudioSystem.cpp
700e73471d85348b52ecf213c36bb24b93997ec7 03-May-2014 Eric Laurent <elaurent@google.com> audio routing update listener

Implement audio port and audio patch
callback infrastructure for clients to receive
notifications when audio routing changes occur via the
OnAudioPortUpdateListener interface.

Bug: 14815883.

Change-Id: I32cbba64eca7369871aec235ff100de1f0c2d344
ndroid_media_AudioSystem.cpp
b69681c894c663e84f2826d9b0c832ceb9b45047 20-May-2014 Eric Laurent <elaurent@google.com> AudioSystem: added JNI for routing extensions

Bug: 14815883.

Change-Id: Ia0c0d14a8e3051a4bc0ce502b6e979135b170c97
ndroid_media_AudioFormat.h
ndroid_media_AudioSystem.cpp
c6b6154ac1eb4e839f363115aef3649c967bcfdd 30-May-2014 John Reck <jreck@google.com> am ea5af639: Merge "Re-jigger layers" into lmp-preview-dev

* commit 'ea5af63965bf323580aa1e2854efb2f8cc3dc396':
Re-jigger layers
ae22109fa65d9ea37d9812880b3cd18285e5dc3b 30-May-2014 Mike Reed <reed@google.com> Merge "switch to non-deprecated SkBlurStyle type"
686534db8d84ce8d838ba90b4fafe3c48ce66e95 30-May-2014 Mike Reed <reed@google.com> switch to non-deprecated SkBlurStyle type

Will allow skia to remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE

Change-Id: I0039dd7e0e807080d2b4f9e648df93123dd09e8d
ndroid/graphics/MaskFilter.cpp
5c3d927e17e98e8fd4a9f3c86f7f4def0bcfa816 08-May-2014 Florin Malita <fmalita@google.com> Add a native Canvas wrapper.

Instead of storing a direct SkCanvas reference, Canvas now tracks
an opaque native wrapper class. The native wrapper can be used to
store additional info for emulating deprecated Skia features
(at this point it only stores a canvas).

Some notes:

* all native handle -> SkCanvas conversions are routed through a
handful of native utility methods.
* safeCanvasSwap() refactored as a lower level setNativeBitmp() - which
is what clients need.
* removed unused get_thread_msec() (Canvas.cpp)

Change-Id: I715a5a6f1e1621c1cfc1e510ae4f2ea15cf11114
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Picture.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
ca8eb243d1268e8f89ecd02063960667aca3374b 30-May-2014 John Reck <jreck@google.com> Merge "Re-jigger layers" into lmp-preview-dev
d72e0a339b54af0c4e731513bbad120dff694723 30-May-2014 John Reck <jreck@google.com> Re-jigger layers

Bug: 15185239
Bug: 15238382

Make DeferredLayerUpdater ref counted so that
HardwareLayer:finalizer() works non-crashily on
leaked layers
Give DeferredLayerUpdater the ability to have a layer destroyer
set so that leaked layers can still be recycled on the
RenderThread
Order layer updates based off of pushLayerUpdate() calls to fix
issue with nested layers

Change-Id: I4449cee607f7e5126e02fed7464cf48038e3dfdf
ndroid_view_HardwareLayer.cpp
ndroid_view_ThreadedRenderer.cpp
b2367cbf396f564cb6c66c0aaa51710ffa7bc052 30-May-2014 Derek Sollenberger <djsollen@google.com> Merge "Update HWUI matrix API"
b637ccffd856ba911c1527077cec3abff39035f5 30-May-2014 Viorel Suman <viorel.suman@intel.com> Fixed VM memory leak in AudioSystem JNI interface

The function android_media_AudioSystem_error_callback from AudioSystem
JNI interface is using FindClass function but does not delete the
reference created by VM in this function.
By doing this call, VM will add a local reference in IndirectRefTable
and it's the caller's job to delete this reference.
By not doing this, everytime this callback is called, a new reference is
added and never deleted.
The effect is crashing the VM running system_server:

E/dalvikvm( 3071): JNI ERROR (app bug): local reference table overflow (max=512)
W/dalvikvm( 3071): JNI local reference table (0x732da288) dump:
W/dalvikvm( 3071): Last 10 entries (of 512):
W/dalvikvm( 3071): 511: 0x42a90008 java.lang.Class<android.os.Parcel>
W/dalvikvm( 3071): 510: 0x4381fd90 android.view.KeyEvent
W/dalvikvm( 3071): 509: 0x439b9808 android.view.KeyEvent
W/dalvikvm( 3071): 508: 0x42d2fe18 java.lang.Class<com.android.server.input.InputManagerService>
W/dalvikvm( 3071): 507: 0x42ad4298 java.lang.Class<android.media.AudioSystem>
W/dalvikvm( 3071): 506: 0x42ad4298 java.lang.Class<android.media.AudioSystem>
W/dalvikvm( 3071): 505: 0x42ad4298 java.lang.Class<android.media.AudioSystem>
W/dalvikvm( 3071): 504: 0x42ad4298 java.lang.Class<android.media.AudioSystem>
W/dalvikvm( 3071): 503: 0x42ad4298 java.lang.Class<android.media.AudioSystem>
W/dalvikvm( 3071): 502: 0x42ad4298 java.lang.Class<android.media.AudioSystem>
W/dalvikvm( 3071): Summary:
W/dalvikvm( 3071): 510 of java.lang.Class (3 unique instances)
W/dalvikvm( 3071): 2 of android.view.KeyEvent (2 unique instances)
E/dalvikvm( 3071): Failed adding to JNI local ref table (has 512 entries)
...
E/dalvikvm( 3071): VM aborting

In this case, PID 3071 is system server.

Change-Id: I0c113eb72256984854d59a3ccef11a8d23f96e79
Signed-off-by: Robert Chiras <robert.chiras@intel.com>
ndroid_media_AudioSystem.cpp
ca672f27581e5a0263d53b7b98551312d54f6efa 30-May-2014 Raph Levien <raph@google.com> am 953fe800: Merge "Language and variant selection for Minikin" into lmp-preview-dev

* commit '953fe800caf1771217ff1e828d6aa93fbc16729c':
Language and variant selection for Minikin
2070252f988e4daac08acf88ea6865138d899f75 30-May-2014 Raph Levien <raph@google.com> Merge "Language and variant selection for Minikin" into lmp-preview-dev
2cfc0e543f69750b4ccc9d5f52b384e525cf9e77 30-May-2014 John Reck <jreck@google.com> am 894bb170: Merge "Enable debug stuffs" into lmp-preview-dev

* commit '894bb1701ae15b87af1e3bfe865fe191081cc806':
Enable debug stuffs
aee470c0232afdac4256d13020fa0cf04f30395c 30-May-2014 John Reck <jreck@google.com> Merge "Enable debug stuffs" into lmp-preview-dev
fe5e7b7346a54537b980796ceeca66bfdbd05561 24-May-2014 John Reck <jreck@google.com> Enable debug stuffs

Bug: 14596762
* dumpsys gfxinfo implemented
* profile GPU visual_bars implemented

Change-Id: Icb948a9d5af5989b5615504d0d76ade64b93ef5b
ndroid_view_RenderNode.cpp
ndroid_view_ThreadedRenderer.cpp
f9e3d311275c37fe5f2562993687a1627780a6d0 28-May-2014 Raph Levien <raph@google.com> Language and variant selection for Minikin

This is the frameworks/base side of what's needed to support language
selection (especially Han unification, but also compact/elegant
selection for scripts that require more vertical space).

This is part of the fix for bug 15179652 "Japanese font isn't shown on
LMP".

Change-Id: I8f0f3aa9a1915659f8d0b590cf1c56529356049a
ndroid/graphics/FontFamily.cpp
ndroid/graphics/MinikinUtils.cpp
139088228faa7f3c446af7387e017933998a5570 10-Dec-2013 Derek Sollenberger <djsollen@google.com> Update HWUI matrix API

1. more closely mirror Skia API by using const ref instead of ptrs
2. store SkMatrix in the drawOp instead of the linear allocation heap

Change-Id: I4b9f6f76b9f7d19325e29303d27b793679fd4823
ndroid_view_GLES20Canvas.cpp
2d6f265d00db883616989788595ead4f3af902a0 20-May-2014 Paul Jensen <pauljensen@google.com> Implement bind-to-network functionality of android.net.Network.

This is implemented by calling through to netd_client.
Included are functions to bind-to-network-for-process strictly for DNS to
facilitate startUsingNetworkFeature() reimplementation.

bug: 13885501

Change-Id: Ib22c7d02ea81d251bdfeeb0f64a47ce32eefcb1b
(cherry picked from commit dbf76f898f1f57eb74722358087c926d2f529bda)
ndroid.mk
ndroid_net_NetUtils.cpp
77b170cedca2828d8c40ca33b820f5911a558326 29-May-2014 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aosp

Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
452c592191a147ae1175db775bc3e7e8e0311855 29-May-2014 Brian Carlstrom <bdc@google.com> am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit '197565e0e800be3c731e679914f40afa1aab98fd':
Move to dalvik.vm.lib.2 to force default to libart
5bc93866b089faa2feddf7b113afe915401d992f 28-May-2014 Brian Carlstrom <bdc@google.com> Move to dalvik.vm.lib.2 to force default to libart

Bug: 14298175

(cherry-picked from commit 2ef5abb8d534f016582d6023054cbe69d8114b6b)

Change-Id: Icd91982c09076e87092906106cbff4a81589e8de
ndroidRuntime.cpp
245b8f054b8125ef3a98b4bc2c9bbcf992390a2b 28-May-2014 Brian Carlstrom <bdc@google.com> am a2260c26: Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev

* commit 'a2260c26fc2499e1338a25f6f787a8d48ae48ddf':
Move to dalvik.vm.lib.2 to force default to libart
3c1ff826e0abdffdd76129bf974abb96444dade8 28-May-2014 Brian Carlstrom <bdc@google.com> Move to dalvik.vm.lib.2 to force default to libart

Bug: 14298175
Change-Id: I8afa91bddfb6fec6b61c39286a16594eb947830e
ndroidRuntime.cpp
00f535845bebe4fba1de77ebd0119c7c23197a4f 28-May-2014 Dan Stoza <stoza@google.com> Merge "SurfaceFlinger: Add sourceCrop to screenshot"
81d29b5f0c8018f3cb49d2598322aa652a4417f2 28-May-2014 John Reck <jreck@google.com> am 2d196d9f: Merge "Implement FlushCaches TODO" into lmp-preview-dev

* commit '2d196d9f9d4978fd0df80815e15012518be5ff18':
Implement FlushCaches TODO
45d01929291eba56e1bce582192941446b86bf5a 28-May-2014 John Reck <jreck@google.com> Merge "Implement FlushCaches TODO" into lmp-preview-dev
8f8c08516456944ae7ab15fea641ffb316268381 27-May-2014 Leon Scroggins III <scroggo@google.com> Merge "Remove call to deprecated SkBitmap::asImageInfo."
28408c23958bb14d296574853d8a576177a36a5b 27-May-2014 Leon Scroggins III <scroggo@google.com> Remove call to deprecated SkBitmap::asImageInfo.

Instead, call SkBitmap::info().

Change-Id: Ib6e56c6e103afa5748405574043860449c33c467
ndroid/graphics/BitmapFactory.cpp
1a68f24ab724957a249047f1e62365b8ef525649 27-May-2014 Aravind Akella <aakella@google.com> Merge "Adding wakeup sensors, maxDelay to java SDK."
ef0b88181e30252d07901976a81524fc8bb03066 27-May-2014 Etienne Le Grand <etn@google.com> am 7326defe: am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev

* commit '7326defe2de7ace86236bf0c5353fe0687c3f99c':
Add confidence to the heart rate monitor definition and clarify onAccuracyChange
7326defe2de7ace86236bf0c5353fe0687c3f99c 27-May-2014 Etienne Le Grand <etn@google.com> am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev

* commit 'd7439d8c59e4c5a82ad94a5080436cc94f72e0be':
Add confidence to the heart rate monitor definition and clarify onAccuracyChange
5f6aa983d620eb123cd11943235daa68f725ef46 22-May-2014 Leon Scroggins III <scroggo@google.com> Fix FILTER_BITMAP_FLAG regression in DrawFilter.

Skia removed the corresponding kFilterBitmapFlag, replacing it with a
separate function: setFilterLevel. If the flag is set, turn it into a
call to setFilterLevel.

Corresponds to changes in I2736f3f68683651574d79a169ff0ab563e0a469e to
fix Paint.setFlags().

BUG:15112859
Change-Id: I269cbd7a624e5dde5688305e1ba97075ba73f4fd
ndroid/graphics/DrawFilter.cpp
af80510e85b301c8d8ba1e28e7edc7a0c9156a1a 16-May-2014 Etienne Le Grand <etn@google.com> Add confidence to the heart rate monitor definition and clarify onAccuracyChange

Change-Id: I686d07dcd603bf3c3be3c1471de8be3b4e240855
ndroid_hardware_SensorManager.cpp
2f8b91449efafa5fb0057cd0150233681c65c9e3 12-May-2014 Aravind Akella <aakella@google.com> Adding wakeup sensors, maxDelay to java SDK.

Change-Id: I6da09b146e2b1c90efea7faf40a0503a89542cb0
ndroid_hardware_SensorManager.cpp
94ecb5506a8834b5e13ad9834762c972126102d0 24-May-2014 Ruben Brunk <rubenbrunk@google.com> am a7c97c55: Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev

* commit 'a7c97c552a280ed3a2ff3535a5085f8601f45820':
camera2: Move DngCreator to hardware/camera2.
0bfa56e76630647b7b277141d717ab434295ac5c 24-May-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev
cd3a8245489fa36c528b075efe99a147cf4f6785 24-May-2014 Chris Craik <ccraik@google.com> Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-preview-dev
e1628b7c6fc3822fa83cf02028ce8ad67abb0afe 24-May-2014 John Reck <jreck@google.com> Implement FlushCaches TODO

Change-Id: Id05429e98ffe0858275b32c41fb215c1d8d930b2
ndroid_view_ThreadedRenderer.cpp
d04d303e5d8521403514cf960a694e566df19536 23-May-2014 John Reck <jreck@google.com> resolved conflicts for merge of 1f6c973b to master

Change-Id: I0d0a72f1d737fa80ac4c258c1f9fc52ef85724bd
4967c183082ee45e2637e3280de542f791fb03bd 23-May-2014 John Reck <jreck@google.com> Merge "Bag of scheduling tweaks" into lmp-preview-dev
e48fb064ac78279cdd0c048759c54ccb8e3ad9bd 23-May-2014 Igor Murashkin <iam@google.com> am 31771fd6: Merge "camera2: Refactor CameraMetadata.Key out into 3 key classes" into lmp-preview-dev

* commit '31771fd63b8d08207012c4877a08679fa9b9d539':
camera2: Refactor CameraMetadata.Key out into 3 key classes
a5dda645da738da7b4ae15e28fa7d93d3b04b94f 23-May-2014 John Reck <jreck@google.com> Bag of scheduling tweaks

Bug: 15118640

* Prevent over-stuffing the queue by dropping frames
* Prevent double-drawing in one pulse by RT by deferring
vsync registration until post-draw so that it catches
the next vsync pulse instead of the current one
* Bias vsync race condition towards the UI thread
* Fix queueDelay to actually work

Change-Id: Ibf584258bd93ebcbba058bd976dc8b307f1c6155
ndroid_view_ThreadedRenderer.cpp
d6d65154e55612b489aae95b60f3145f3b81f3b4 20-May-2014 Igor Murashkin <iam@google.com> camera2: Refactor CameraMetadata.Key out into 3 key classes

Before:
* CameraMetadata.Key<T>

After:
* CameraCharacteristics.Key<T>
* CaptureResult.Key<T>
* CaptureRequest.Key<T>

CameraMetadata#get has been removed (each metadata subclass has
its own #get now) due to java generic limitations (in particular
a type bound <T1<T2> extends Key<T2>> is an illegal bound).

CameraMetadataNative gets a new #dumpToLog function to dump the native
metadata to logcat.

Bug: 15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
ndroid_hardware_camera2_CameraMetadata.cpp
9890e341bf9d565309cd7db5e6c4194c66c0a1d8 23-May-2014 Dan Stoza <stoza@google.com> SurfaceFlinger: Add sourceCrop to screenshot

Adds a sourceCrop Rect parameter to screenshot commands, which allows
clients to capture only a portion of the screen instead of the whole
screen.

Bug: 15137922
Change-Id: I629447573cd34ffb96334cde7ba02490b9ea06d8
ndroid_view_SurfaceControl.cpp
0fa2bd699ab5539c0ce6b79eb6b4b681734b8bb5 05-May-2014 Leon Scroggins III <scroggo@google.com> DO NOT MERGE Inspect SkShader to determine hw shader.

cherry-pick of Iaa7189178bda1c55f96da044d2a9fa602ba36034

Instead of duplicating internal info about SkShader, inspect the
SkShader installed on the SkPaint.

core/java/android/view/GLES20Canvas.java:
Remove setupModifiers, nResetModifiers, and nSetupShader.

core/jni/android/graphics/Shader.cpp:
Remove calls to create/destroy the (previously) attached SkiaShader.

core/jni/android_view_GLES20Canvas.cpp:
Remove native code for setupShader and resetModifiers.

graphics/java/android/graphics/BitmapShader.java:
graphics/java/android/graphics/ComposeShader.java:
graphics/java/android/graphics/LinearGradient.java:
graphics/java/android/graphics/RadialGradient.java:
graphics/java/android/graphics/Shader.java:
graphics/java/android/graphics/SweepGradient.java:
Remove code keeping track of native SkiaShader.

libs/hwui/Caches.h:
Include Extensions.h.

libs/hwui/DeferredDisplayList.cpp:
Compare shaders on the paint, instead of on DrawModifiers.

libs/hwui/DisplayList.cpp:
libs/hwui/DisplayList.h:
Remove vector of SkiaShaders.

libs/hwui/DisplayListOp.h:
Access the SkShader on mPaint.
Remove SetupShaderOp and ResetShaderOp.

libs/hwui/DisplayListRenderer.cpp:
libs/hwui/DisplayListRenderer.h:
Remove resetShader, setupShader, refShader, and mShaderMap.

libs/hwui/FontRenderer.cpp:
Pass SkShader to setupDrawShader and setupDrawShaderUniforms.

libs/hwui/OpenGLRenderer.cpp:
libs/hwui/OpenGLRenderer.h:
Add LayerShader, a class inheriting from SkShader, to mimic the
behavior of SkiaLayerShader. Unlike SkiaLayerShader, it can be set on
the SkPaint so it can be inspected later.
Set a LayerShader instead of a SkiaLayerShader.
setupDrawShader and setupDrawShaderUniforms now inspect an SkShader
passed in.
Inspect SkShader instead of mDrawModifiers.mShader.
Remove resetShader and setupShader.
setupDrawColorUniforms now takes a boolean indicating whether there is
a shader.
Add an inline function for accessing the SkShader on an SkPaint.
In setupDrawBlending(Layer*, bool), do not check the shader (which will
never be set), but do check whether the color filter may change the
alpha (newly fixed behavior).
In setupDrawBlending(SkPaint, ...), check the SkShader and whether the
color filter affects alpha (the latter is new behavior).

libs/hwui/Renderer.h:
Remove pure virtual functions setupShader and resetShader.

libs/hwui/ResourceCache.cpp:
libs/hwui/ResourceCache.h:
Remove functions for refing/unrefing shaders.

libs/hwui/SkiaShader.cpp:
libs/hwui/SkiaShader.h:
Much of this code was redundant and has been removed.
Convert structs into class with nothing but static functions for
calling describe/setupProgram.

libs/hwui/TextureCache.cpp:
libs/hwui/TextureCache.h:
Use the SkPixelRef as the key to the bitmap Lru cache, since shader
inspection will provide a different SkBitmap pointer (though it will
hold the correct SkPixelRef with the correct generation ID).

tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java:
tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java:
Update manual test to have more shaders: radial, sweep, compose,
invalid compose.

BUG:10650594
Change-Id: I2e7182b3fc28268e7ca82fac6780540b6b45365c
ndroid/graphics/Shader.cpp
ndroid_view_GLES20Canvas.cpp
4e8437387ac67a992211dd5717fb4acf0b7d7004 23-May-2014 Michael Wright <michaelwr@google.com> Merge "Pack PointerCoords with BitSet."
d490aa426090fc358873821b47ef27ead0c97409 23-May-2014 Chris Craik <ccraik@google.com> Merge "Inspect SkShader to determine hw shader."
b6079005ed0631c3972ff427f56e12523ec214a7 22-May-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Move DngCreator to hardware/camera2.

Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_camera2_DngCreator.cpp
d1ad5e62fda248c6d185cde3cb6d9f01a223066c 05-May-2014 Leon Scroggins III <scroggo@google.com> Inspect SkShader to determine hw shader.

Instead of duplicating internal info about SkShader, inspect the
SkShader installed on the SkPaint.

core/java/android/view/GLES20Canvas.java:
Remove setupModifiers, nResetModifiers, and nSetupShader.

core/jni/android/graphics/Shader.cpp:
Remove calls to create/destroy the (previously) attached SkiaShader.

core/jni/android_view_GLES20Canvas.cpp:
Remove native code for setupShader and resetModifiers.

graphics/java/android/graphics/BitmapShader.java:
graphics/java/android/graphics/ComposeShader.java:
graphics/java/android/graphics/LinearGradient.java:
graphics/java/android/graphics/RadialGradient.java:
graphics/java/android/graphics/Shader.java:
graphics/java/android/graphics/SweepGradient.java:
Remove code keeping track of native SkiaShader.

libs/hwui/Caches.h:
Include Extensions.h.

libs/hwui/DeferredDisplayList.cpp:
Compare shaders on the paint, instead of on DrawModifiers.

libs/hwui/DisplayList.cpp:
libs/hwui/DisplayList.h:
Remove vector of SkiaShaders.

libs/hwui/DisplayListOp.h:
Access the SkShader on mPaint.
Remove SetupShaderOp and ResetShaderOp.

libs/hwui/DisplayListRenderer.cpp:
libs/hwui/DisplayListRenderer.h:
Remove resetShader, setupShader, refShader, and mShaderMap.

libs/hwui/FontRenderer.cpp:
Pass SkShader to setupDrawShader and setupDrawShaderUniforms.

libs/hwui/OpenGLRenderer.cpp:
libs/hwui/OpenGLRenderer.h:
Add LayerShader, a class inheriting from SkShader, to mimic the
behavior of SkiaLayerShader. Unlike SkiaLayerShader, it can be set on
the SkPaint so it can be inspected later.
Set a LayerShader instead of a SkiaLayerShader.
setupDrawShader and setupDrawShaderUniforms now inspect an SkShader
passed in.
Inspect SkShader instead of mDrawModifiers.mShader.
Remove resetShader and setupShader.
setupDrawColorUniforms now takes a boolean indicating whether there is
a shader.
Add an inline function for accessing the SkShader on an SkPaint.
In setupDrawBlending(Layer*, bool), do not check the shader (which will
never be set), but do check whether the color filter may change the
alpha (newly fixed behavior).
In setupDrawBlending(SkPaint, ...), check the SkShader and whether the
color filter affects alpha (the latter is new behavior).

libs/hwui/Renderer.h:
Remove pure virtual functions setupShader and resetShader.

libs/hwui/ResourceCache.cpp:
libs/hwui/ResourceCache.h:
Remove functions for refing/unrefing shaders.

libs/hwui/SkiaShader.cpp:
libs/hwui/SkiaShader.h:
Much of this code was redundant and has been removed.
Convert structs into class with nothing but static functions for
calling describe/setupProgram.

libs/hwui/TextureCache.cpp:
libs/hwui/TextureCache.h:
Use the SkPixelRef as the key to the bitmap Lru cache, since shader
inspection will provide a different SkBitmap pointer (though it will
hold the correct SkPixelRef with the correct generation ID).

tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java:
tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java:
Update manual test to have more shaders: radial, sweep, compose,
invalid compose.

BUG:10650594

Change-Id: Iaa7189178bda1c55f96da044d2a9fa602ba36034
ndroid/graphics/Shader.cpp
ndroid_view_GLES20Canvas.cpp
985086276f90cccd9f37008056645e4c9acb888a 22-May-2014 Paul Jensen <pauljensen@google.com> Merge "Implement bind-to-network functionality of android.net.Network."
94520c74608bfcd61ff987410a8018d87b75d734 22-May-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Add HAL1 compatibility shim skeleton."
3876495129cce3ed8ac6f247189b075dc9baec8f 20-May-2014 Paul Jensen <pauljensen@google.com> Implement bind-to-network functionality of android.net.Network.

This is implemented by calling through to netd_client.
Included are functions to bind-to-network-for-process strictly for DNS to
facilitate startUsingNetworkFeature() reimplementation.

Change-Id: Ib22c7d02ea81d251bdfeeb0f64a47ce32eefcb1b
ndroid.mk
ndroid_net_NetUtils.cpp
9626f8203a8c222b8960a49cdc66d540fdb688b0 20-May-2014 Jesse Hall <jessehall@google.com> opengl: Fix #include style in generated JNI code

Bug: 15028495
Change-Id: Iad98380264c349fddf3b88df0c3a997d94c84fc8
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
ndroid_opengl_GLES30.cpp
ndroid_opengl_GLES31.cpp
ndroid_opengl_GLES31Ext.cpp
7ab63acdd0a257272512d0bcf5e06036fa0b9fdf 20-May-2014 Jesse Hall <jessehall@google.com> opengl: Add GLES31 and GLES31Ext classes

Bug: 15028495
Change-Id: Ie967c1938060edb42864dd48efa668ae7bf5cd76
ndroid.mk
ndroidRuntime.cpp
ndroid_opengl_GLES31.cpp
ndroid_opengl_GLES31Ext.cpp
b8fe2fcd71e438b5ea6a85b1e2024ca9dc62b9d1 22-May-2014 Chris Craik <ccraik@google.com> Merge "Define light position (using new lighting spec) in Java"
feb50af361e4305a25758966b6b5df2738c00259 10-May-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Add HAL1 compatibility shim skeleton.

This adds basic support for running the Camera2 API on a device running
a camera HAL version lower than CAMERA_MODULE_API_VERSION_2_0.

This CL includes support for:
- N-way preview output streams
- N-way jpeg output streams
- CameraDevice emulation at the binder interface
- Basic camera metadata querying in the CameraManager

Bug: 15117269
Bug: 15116722

Change-Id: I8322955034c91f34bb348d4b28c2b774dbef38f6
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_camera2_CameraMetadata.cpp
ndroid_hardware_camera2_legacy_LegacyCameraDevice.cpp
304bbd287c7a18f66f18daaed0d0aae78199bdd9 22-May-2014 Mathieu Chartier <mathieuc@google.com> Temporary fix for buffer overrun issue.

Allocating the bitmap using getSafeSize() causes problems since
getSafeSize64() < getSize() if there is a stride. Since everywhere
else uses getSize() it results in a lot of possible buffer overruns.
The fix reverts to using getSize instead of getSafeSize64.

Bug: 15089814
Change-Id: Ia471cf9715672d57bb7eb61bf735064aeb405ffe
ndroid/graphics/Graphics.cpp
797b95b26bbb7557678af78b9a2a61830158920f 21-May-2014 Chris Craik <ccraik@google.com> Define light position (using new lighting spec) in Java

Also updates the relative shadow strengths.

Change-Id: I6cac7275d38df98aea9f0dda463cd7207102986a
ndroid_view_ThreadedRenderer.cpp
519c77b71051b1503a33a6af8c22a014735488c4 21-May-2014 Svetoslav Ganov <svetoslavganov@google.com> Switching to the final PDF rendering library

Change-Id: Id92674ce762af894a5c4b0df0f8e9a711131bccc
ndroid.mk
a5291466eaca727de04a10eea7d1666bd3ba5adf 21-May-2014 Ed Heyl <edheyl@google.com> Fix the build: Revert "Switching to the final PDF rendering library"

This reverts commit e7a8f476ea3873941ace96751fa2d633c95b7c10.

Change-Id: I457e45b0a536bbde721a3355ed860b2363e36467
ndroid.mk
89ff50cea877e52b71f0310c2c4cbc84fe8c70e8 21-May-2014 Svetoslav <svetoslavganov@google.com> Switching to the final PDF rendering library

Change-Id: I5bad4fc620378f3ca6b070bbaeee631f526b66c7
ndroid.mk
cbf1486324ef22d90461f75830b89d57a8893d49 20-May-2014 Michael Wright <michaelwr@google.com> Pack PointerCoords with BitSet.

The converstion from Java PointerCoords to native and then back again
was inconsistent. Using a BitSet for all of these operations keeps it
in sync.

Bug: 15000382
Change-Id: Id3a4558dae3ba3df7c4a9b3cb9d5580b957db8d5
ndroid_view_MotionEvent.cpp
304ebe60b215d11b534afb550f46150205d1632a 20-May-2014 Mike Lockwood <lockwood@google.com> Merge "USB: Fix race condition in acquiring global reference in UsbRequest JNI code"
b2a4658a630a99b0e0ff44bc54aa5b02557a571b 20-May-2014 Mike Lockwood <lockwood@google.com> USB: Fix race condition in acquiring global reference in UsbRequest JNI code

Fixes bug https://code.google.com/p/android/issues/detail?id=59467

Change-Id: I8365e1be4eb0f1f2da49b658af677b590a80e382
ndroid_hardware_UsbRequest.cpp
49f0db34811bc374eb6af0a6ba233325ff6f14cc 20-May-2014 Victoria Lease <violets@google.com> fix argument order in call to SkBlurDrawLooper constructor

This fixes all sorts of badness.

Bug: 15074512
Change-Id: I5e96983c58d19e0dc2d8fa61d1efa9dcff076ca1
ndroid/graphics/Paint.cpp
f967a5486a78db244624fde4c105aa5e6fa914b9 29-Apr-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Plumb DngCreator to native library.

Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
ndroid.mk
ndroid_hardware_camera2_CameraMetadata.cpp
c5baa188068bac4c71ffdca62f09134a59f87454 17-May-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem: native to JAVA status translation"
bc11a696f6856624de532a6830d5db9dbbe2384c 16-May-2014 Eric Laurent <elaurent@google.com> AudioSystem: native to JAVA status translation

Regroup status code translation from native to JAVA in AudioSystem.
The same codes will be used by AudioTrack, AudioRecord, AudioManager
and defined in a single place in AudioSystem.

Change-Id: I7d3f39f30e3bb8e53f33f4408bcb0672df8af42b
ndroid_media_AudioErrors.h
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ad2f8e334f3ef22d3e412b0660a2e1f996f94116 16-May-2014 Alan Viverette <alanv@google.com> Update ripple behavior, use render thread animation

Change-Id: Ib6bc1e08b05d29606f452961963d58b8fc866746
ndroid_view_RenderNodeAnimator.cpp
e517ce45635899f7d864db900fd3caa6f362115b 16-May-2014 Raph Levien <raph@google.com> Merge "Get rid of dirFlags log spam"
b98de0dcd63a7b7987257a879a669c467a396a95 16-May-2014 Raph Levien <raph@google.com> Get rid of dirFlags log spam

I was logging the BiDi flags for debugging, did not mean to commit this.

Change-Id: I0a89c68fe17562f2ed38843efacbaa310dca24fa
ndroid/graphics/TextLayoutCache.cpp
c40c0c9d9cbf57ca731570ece2c26e80a898e948 16-May-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioTrack JNI cleanup"
c9ee304c91b5572f0c1cd95e9bd1e4a84e28587d 16-May-2014 Chris Craik <ccraik@google.com> Merge "Round rect outline clipping"
deeda3d337aed1eee218b89a7aba5992ced371f0 06-May-2014 Chris Craik <ccraik@google.com> Round rect outline clipping

Change-Id: Iee9cf4f719f6f1917507b69189ad114fa365917b
ndroid_view_RenderNode.cpp
0a3103e755218c1ee48c7d078892eb6b42cc2081 15-May-2014 Dianne Hackborn <hackbod@google.com> Merge "Battery stats more wake history, power save mode."
cbefd8dd2befcb768f911a63becc427ec4c13250 14-May-2014 Dianne Hackborn <hackbod@google.com> Battery stats more wake history, power save mode.

Add new option for battery stats to record the full wake
lock history, and recording the current power save mode.

Also add in some additional error constants when generating
Binder error exceptions.

And fix issue #14974572: Avoid repeating wakeup_reason at
the beginning of history

Change-Id: I7c1a2ab9569de216634f63d8ad69f1294ef1d235
ndroid_util_Binder.cpp
dbef65f1a170c8abd819a609aeb30797b2407c9a 15-May-2014 Svetoslav <svetoslavganov@google.com> Merge "Adding APIs to render PDF documents."
a3d5d3ca1140304e26c41cc29b029dc9c5330b1b 15-May-2014 John Reck <jreck@google.com> Merge "Animator start value..."
d93ef9186189c2b521381eb05634298eabe822f8 15-May-2014 Raph Levien <raph@google.com> Remove SkFloatToScalar in GLES20Canvas (Minikin)

A recent Skia change removed the SkFloatToScalar macro, but it was being
used in the Minikin case for the GSES20Canvas (enabled only on
USE_MINIKIN builds). This patch removes it.

Change-Id: Ib64fd347f5db94fa6f3b3f79957d55a38f0328c9
ndroid_view_GLES20Canvas.cpp
ff941dcd815021bb20d6504eb486acb1e50592c3 15-May-2014 John Reck <jreck@google.com> Animator start value...

Change-Id: Ifd35ed95a28c625086d7fa97764fe63ab4a997f1
ndroid_view_RenderNode.cpp
ndroid_view_RenderNodeAnimator.cpp
ndroid_view_ThreadedRenderer.cpp
4c9355c35a0f62805739823a62ad41ca1cbc6502 07-May-2014 Mike Reed <reed@google.com> Frameworks changes to support latest Skia (r14729)

Required for a merge in external/skia
(I88b4d5cc81c357a8e223bd7860b1029590265200).

Includes two cherry-picks:

I456df543e1925b280f785c7b3bb81370157f9b09:
replace SkRasterizer* with NativeRasterizer* in JNI

I98adb200e023369d3ee75f21927fa98f23095a77:
Fix Paint.getFlags,setFlags wrt FILTER_BITMAP_FLAG

In Paint.setFlags(), turn FILTER_BITMAP_FLAG into a call to
SkPaint::setFilterLevel().

In Paint.getFlags(), read SkPaint::getFilterLevel() to determine
whether to include FILTER_BITMAP_FLAG in the result.

Fixes CTS tests with ToT Skia.

Change-Id: I2736f3f68683651574d79a169ff0ab563e0a469e
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Rasterizer.cpp
1044a8211d86d4306ee7b075eb2bca9a43f3a492 15-May-2014 Raph Levien <raph@google.com> Merge "BiDi support for Minikin"
9e2b288ba89ad78ba601eef4843831b382a17bd5 15-May-2014 Raph Levien <raph@google.com> Merge "Proper refcounting for Minikin objects"
018646adac62f137fe6b2ad04182cc623a7037e0 15-May-2014 Raph Levien <raph@google.com> Merge "Parsing of XML font configuration files for Minikin"
2836c4722a156ec78d7f4101b394885a354f5dd6 15-May-2014 Raph Levien <raph@google.com> Merge "Start of Minikin integration"
96f266ee5ddb372eb3f5ac1200730d9403848907 15-May-2014 Chris Craik <ccraik@google.com> Merge "Remove Path based outline clipping"
2defed988f74c98d5af8d02551ebf7262490cc5b 15-May-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioTrack JNI cleanup

Remove unused query of AudioFlinger sample rate and frame count.
Remove redundant stream type check, it's already done in Java.

Change-Id: I2565f8df7488f5f994f6f72c746dadbcaeb43966
ndroid_media_AudioTrack.cpp
2bcad176757386d906157bb898167fbcebe9f55e 15-May-2014 Chris Craik <ccraik@google.com> Remove Path based outline clipping

Change-Id: Ic5ccd98a7517b46e768e53d6b0c8fdcda305fb2c
ndroid_view_RenderNode.cpp
ddfe0c77b459ff4f5fe7ad1e2d930814c9a611a5 15-May-2014 Mathieu Chartier <mathieuc@google.com> am 760f0994: am c0f18b9d: am c4c77d63: Merge "Add property for background GC type"

* commit '760f0994db69b77d06814194beecaca1de330855':
Add property for background GC type
760f0994db69b77d06814194beecaca1de330855 15-May-2014 Mathieu Chartier <mathieuc@google.com> am c0f18b9d: am c4c77d63: Merge "Add property for background GC type"

* commit 'c0f18b9d0cce0c140b1274055faabff732f1e27c':
Add property for background GC type
c0f18b9d0cce0c140b1274055faabff732f1e27c 15-May-2014 Mathieu Chartier <mathieuc@google.com> am c4c77d63: Merge "Add property for background GC type"

* commit 'c4c77d63d889baca2abbdce6326077f0911b279e':
Add property for background GC type
c01936a686ff75c872629b219898021e8ae49afa 15-May-2014 Mathieu Chartier <mathieuc@google.com> Add property for background GC type

To disable background compaction do:
adb shell setprop dalvik.vm.backgroundgctype CMS

To enable:
adb shell setprop dalvik.vm.backgroundgctype SS

Change-Id: I1d87b95fceaedac4df5ce6e718d7c14b35d524cc
ndroidRuntime.cpp
2961769ea94f69c191a2dd785b2504666c7292d0 25-Apr-2014 Svetoslav <svetoslavganov@google.com> Adding APIs to render PDF documents.

We need to render PDF documents for two main use cases. First,
for print preview. Second, for resterizing the PDF document by
a print service before passing it to a printer which does not
natively support PDF (most consumer ones).

Adding PDF rendering APIs improves guarantees for print quality
as the same library is used for preview and rasterization. Also
print vendors do not have to license third-party rendering engines.
Last but not least as the platform uses PDF as its main print
format it should also be able to natively render it.

Change-Id: I57004a435db147663cafea40cf3296465aba7f99
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/pdf/PdfRenderer.cpp
3c40a046cf0ea7b6af01ec93e5276eccb3234bfe 23-Apr-2014 Igor Murashkin <iam@google.com> camera2: Update native<->managed camera metadata marshalers

* Improve existing marshalers:
- each managed/native type combination can be queried marshal support
- marshalers can recursively call other marshalers for nested types
- support marshaling/unmarshaling generic classes by using super type tokens

* Add new marshalers for:
- ColorSpaceTransform
- MeteringRectangle
- Parcelable
- Range<T>
- ReprocessFormatsMap
- RggbChannelVector
- SizeF
- StreamConfiguration
- StreamConfigurationDuration

Batteries included; so are unit tests.

Bug: 14628001
Change-Id: I38d3e646ccfb3953898cd6f750c33e4097328482
ndroid_hardware_camera2_CameraMetadata.cpp
66f0be65a1046f54ddce0498b242c1fa0776b1ea 13-May-2014 John Reck <jreck@google.com> Wire up texture atlas

Bug: 14590563

Change-Id: I2dffbc089dc801f5fb2d1c8fd38e1c71d160e110
ndroid_view_ThreadedRenderer.cpp
c8ac775659fd252ce2cc9a61837c170ff70f0a1a 13-May-2014 John Reck <jreck@google.com> More native interpolators

Gotta collect 'em all

Change-Id: I3ccc2b5c842b27b906c8a0470fbedc2bf285bc38
om_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp
9d9ee3d666c63938311839002ec974673998c6d0 13-May-2014 Raph Levien <raph@google.com> BiDi support for Minikin

This patch plumbs the bidiFlags for the various text drawing and
measurement functions down to Minikin, so that the latter can do layout
in a BiDi-aware manner. With the corresponding changes to Minikin, it
is sufficient to correctly display RTL text in TextViews.

Change-Id: Ie904f297373b9ad418050a474506605c7c127b0f
ndroid/graphics/Canvas.cpp
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid_view_GLES20Canvas.cpp
315c329544d7c593d1072b071cbb92d9afe74021 10-May-2014 John Reck <jreck@google.com> Add TimeInterpolator support to RNA

Bug: 14678626

Change-Id: I6554e7fcd42c49fac3618ca792083bb68e358f55
ndroid.mk
ndroidRuntime.cpp
ndroid_view_RenderNodeAnimator.cpp
om_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp
15cf4757dc0099301662f8a26da561434cc07cfa 06-May-2014 Raph Levien <raph@google.com> Proper refcounting for Minikin objects

This patch introduces proper lifecycle maintenance (based on reference
counting) for Minkin objects, particularly FontFamily and
FontCollection. The patch depends on the corresponding Ref and Unref
methods being available in Minikin.

Change-Id: I91935e953d5a522e1adc496f2ce3a598be35de2b
ndroid/graphics/FontFamily.cpp
ndroid/graphics/TypefaceImpl.cpp
9a5b61ccc83303ceeec2059f58c1977af9faa9e3 30-Apr-2014 Raph Levien <raph@google.com> Parsing of XML font configuration files for Minikin

This patch improves Minikin-based font handling, to deal with error
conditions (missing fonts and so on), and also moves the parsing of
fallback_fonts.xml and system_fonts.xml into Java code.

Change-Id: Ib0debdbd56ad3b0196be6d2a35668d711c98f1e5
ndroid/graphics/FontFamily.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/TypefaceImpl.h
1a73f732f91e97c9c66b808c245ddda36a10e987 31-Jan-2014 Raph Levien <raph@google.com> Start of Minikin integration

This is the current state of the Minikin integration. All changes are
hidden behind USE_MINIKIN #ifdef, so it should be safe to apply. To
play with the Minikin branch, set this in your BoardConfig.mk .

This change also merges in 64-bit changes that were happenening in
parallel.

Change-Id: Idd94553bcbe324c5875d0ff06495c966c3e95b7f
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/FontFamily.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinSkia.h
ndroid/graphics/MinikinUtils.cpp
ndroid/graphics/MinikinUtils.h
ndroid/graphics/Paint.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/TypefaceImpl.h
ndroid_view_GLES20Canvas.cpp
c42bfb95c6b7166b7916057af9df6e20d8c4c8ef 10-May-2014 John Reck <jreck@google.com> Merge "Refactor VirtualLightRefBase & JNI"
9fa4071c4768c63902c6a74a4b480b51a8b95d43 10-May-2014 John Reck <jreck@google.com> Refactor VirtualLightRefBase & JNI

Change-Id: I8e244e7109e59d5be96871b23bb9b1201c7f9eaa
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/CanvasProperty.cpp
ndroid_view_RenderNodeAnimator.cpp
om_android_internal_util_VirtualRefBasePtr.cpp
32054b0b3edb350a5444c47753b2982312dd7ffd 09-May-2014 Chris Craik <ccraik@google.com> Fix Bitmap.cpp line endings

Change-Id: Icc0b067437fffaa599c92841518ad0d526112f59
ndroid/graphics/Bitmap.cpp
54955e33c8612a737a76177408f3e7c8482cfcf4 01-May-2014 Glenn Kasten <gkasten@google.com> Add hidden support for ENCODING_PCM_FLOAT to AudioTrack

Change-Id: I15e6d6ab34846366e7f5cbf948fd3cb327e72632
ndroid_media_AudioTrack.cpp
29894c6176fdacdc933ffad742c0aeb350993787 08-May-2014 Ying Wang <wangying@google.com> am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
Remove unused LOCAL_LDLIBS.
5b554f010358d8f47e31d92a42aa3edc4a71ec47 08-May-2014 Derek Sollenberger <djsollen@google.com> Merge "Avoid caching shadow properties in Java & HWUI."
db55bb0622e9fbe4b858d59409f516de01c1f1fd 08-May-2014 Ying Wang <wangying@google.com> am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

* commit '4463cbc61d0947eccb67a52f60661a92d0cad508':
Remove unused LOCAL_LDLIBS.
4463cbc61d0947eccb67a52f60661a92d0cad508 08-May-2014 Ying Wang <wangying@google.com> am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
Remove unused LOCAL_LDLIBS.
531fecca1c55d2f60977a57f5eb546d4d202fb97 08-May-2014 Florin Malita <fmalita@google.com> Merge "Encapsulate Canvas.mNativeCanvas"
b38e3fdf5a2704913fe2c09e1778774760901a51 08-May-2014 Ying Wang <wangying@google.com> Remove unused LOCAL_LDLIBS.

Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
ndroid.mk
ef27453cf71e331e4076df5e5c665b06d5c3e050 07-May-2014 John Reck <jreck@google.com> Merge "Cleanup attachFunctor"
832b151465ed81c43e59891d5eebe62128b21fbb 07-May-2014 John Reck <jreck@google.com> Cleanup attachFunctor

Bug: 13961296

Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
ndroid_view_GLES20Canvas.cpp
b6d9211d31d29221501a8f2a33e6ba0fe18d6ef5 07-May-2014 John Reck <jreck@google.com> Merge "Implement TODO(romainguy)"
63a06673253914510bbeebd500655008682dade1 07-May-2014 John Reck <jreck@google.com> Implement TODO(romainguy)

Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
ndroid_view_ThreadedRenderer.cpp
c29a0a4664a4b9871fadd668b632469a0db240b9 31-Mar-2014 Derek Sollenberger <djsollen@google.com> Avoid caching shadow properties in Java & HWUI.

bug: 10650594
Change-Id: I6f57df002710bb0567ed7e53fc0bfe96cfd504b8
ndroid/graphics/Paint.cpp
ndroid_view_GLES20Canvas.cpp
08fa40c5cb5229b7969b2a5146855a337870f45a 30-Apr-2014 Jim Miller <jaggies@google.com> First pass at adding FingerprintManagerService

This adds a new service for monitoring and enrolling fingerprints
to the platform.

Fixed documentation links.

Change-Id: I66013be5e09be9c5f9746c46aacf32d3e26c3b73
ndroid.mk
ndroid_server_FingerprintManager.cpp
c677675e9c465dc1de21ecf2e0421835c7eb55b4 07-May-2014 Florin Malita <fmalita@google.com> Encapsulate Canvas.mNativeCanvas

Currently, the native canvas is accessed/manipulated from several
unrelated classes.

In order to facilitate SaveFlags emulation, this CL encapsulates
the field and refactors its external users.

Two main changes:

* new getNativeCanvas() getter for use in Java-level clients.
* JNI canvas swappers (GraphicsBuffers, Surface, TextureView &
AssetAtlasService) are refactored based on the exising/equivalent
safeCanvasSwap() Canvas method.

Change-Id: I966bd4898f0838fb3699e226d3d3d51e0224ea97
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
6c8e788e37dea5db682e2ad405f8e1b23990765e 07-May-2014 Jeff Brown <jeffbrown@google.com> Merge "Fix crash due to texture view callback threading invariants."
313f59887b1439fa2f39dbf3578407c52fcbf60d 01-May-2014 Glenn Kasten <gkasten@google.com> Add AudioFormat.ENCODING_PCM_FLOAT

Change-Id: I030d2c74224ac8573a4d30d980ae94fa4e280aeb
ndroid_media_AudioFormat.h
c7282e57cd01f1576baac04356bf99bee34e4c18 07-May-2014 Jeff Brown <jeffbrown@google.com> Fix crash due to texture view callback threading invariants.

Allow the client of a SurfaceTexture to specify the Handler to
which the update callback should be directed to avoid unnecessary
scheduling ping-pong between threads.

Fixed an invalid assumption in TextureView that it is attached
to the main looper which could result in a crash under certain
circumstances. In normal app processes, it is true that TextureViews
must be created on the main looper since hardware rendering is
currently only supported on the main looper. However, in the
system server, UI components run a different thread. Although
hardware rendering is normally disabled in the system server,
it may be enabled for certain developer features.

Bug: 14445309
Change-Id: I5ae17ad018b9ef05ba87ec2f972c7c82e2bca70a
ndroid/graphics/SurfaceTexture.cpp
9bd01ef0c6ba09ca626f49bd162ce9aede41b027 06-May-2014 Dan Stoza <stoza@google.com> Merge "Enable changing display configuration"
00101052b5bf99a29acea3525864ed64b709c16c 03-May-2014 Dan Stoza <stoza@google.com> Enable changing display configuration

This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: Ie4363bc8353d95428f1114ea48e5b1c8976e1730
ndroid_view_SurfaceControl.cpp
e4280baaa709c74d86cf6a389a4674ca665f5af6 06-May-2014 John Reck <jreck@google.com> Implement loadSystemProperties

Bug: 14087580

Change-Id: I7153f38c70b554a78c56a0e794da929fc401ee7a
ndroid_view_ThreadedRenderer.cpp
f9be77940e365036fecd8cc0e491e8545c34e79b 03-May-2014 John Reck <jreck@google.com> Make RenderNodeAnimator and WebView play nice

Change-Id: Ifaefcf510b2d377663fc86f60608d6ec9be8329a
ndroid_view_ThreadedRenderer.cpp
5d039c458c67e8c08334e597a6a8781eda6aab13 05-May-2014 John Reck <jreck@google.com> Merge "TIME LORD!"
18f16e6fba74eda173e1e7c869e6e2e2acc073ff 03-May-2014 John Reck <jreck@google.com> TIME LORD!

Bug: 14444180

Change-Id: I68bec3807c4d1c88d5af1aec2fe6907d60b5f2f3
ndroid_view_ThreadedRenderer.cpp
32ef3ae085288597fb86ab97e42ced1da9691362 22-Feb-2014 Ruben Brunk <rubenbrunk@google.com> camera3: Update CameraMetadata vendor tag handling.

Bug: 12134423
Change-Id: I19380fb5acc3e23a6181d8f858c13457993480fc
ndroid_hardware_camera2_CameraMetadata.cpp
9dfcbb840380744a051bdc4921af3127f30a2af1 03-May-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""
31efe22b400ab1235ed8d8f5c8481810b9e47f37 03-May-2014 Ruben Brunk <rubenbrunk@google.com> Revert "camera3: Update CameraMetadata vendor tag handling."

This reverts commit e03a7eab1d08c821a516f1c07d29a77797acab68.

Change-Id: I1682b5b0904974f488d3e51c3dbaa8f9f02ac71d
ndroid_hardware_camera2_CameraMetadata.cpp
5295745026f669ada0da1484ecc5abb5e4706ff7 03-May-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera3: Update CameraMetadata vendor tag handling."
52244fff29042926e21fa897ef5ab11148e35299 02-May-2014 John Reck <jreck@google.com> Add CanvasProperty for drawCircle

Change-Id: Icbcc030f5033d2094e567d7c519b9d672f2aac1c
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/CanvasProperty.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_RenderNodeAnimator.cpp
ndroid_view_RenderNodeAnimator.h
ndroid_view_ThreadedRenderer.cpp
27e12e72926a552bb5f7d9dc57e9ad562fe4f3b0 02-May-2014 Eric Laurent <elaurent@google.com> Merge "fix AudioTrack and AudioRecord JNI"
c9722bd8af9933950a4909cef6ce16aa48b0fbe6 01-May-2014 Narayan Kamath <narayan@google.com> am 6c2e8062: am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."

* commit '6c2e806200dc1a422aa681bfd78aae1eb8f1d508':
Fix broken logging in Zygote.cpp.
6c2e806200dc1a422aa681bfd78aae1eb8f1d508 01-May-2014 Narayan Kamath <narayan@google.com> am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."

* commit '703442238200c2f1a35b51e7aadc693322feb69d':
Fix broken logging in Zygote.cpp.
703442238200c2f1a35b51e7aadc693322feb69d 01-May-2014 Narayan Kamath <narayan@google.com> am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."

* commit 'fbb0ab02bed5c49159acb3dba6848a154e524169':
Fix broken logging in Zygote.cpp.
160992da04cab56a92cd425adc249c52b040f93d 14-Apr-2014 Narayan Kamath <narayan@google.com> Fix broken logging in Zygote.cpp.

- Differentiate between clean exits and signals.
- Change the logic for the waitpid warning. We should log it
only if the *first* call to waitpid returned ECHILD.

Change-Id: I6bc50e4ffd100fb7f3f526d6b4056bed10b8045f
om_android_internal_os_Zygote.cpp
abea8fa2374568b9c5d15602e867d1901c9a15f1 01-May-2014 John Reck <jreck@google.com> Merge "Add missing ifdefs"
496b8770c19c573299e4be525e877acc977a2dad 01-May-2014 John Reck <jreck@google.com> Add missing ifdefs

Change-Id: I1c7c66cf81a31b56e6ae65d34b7936f9e8beec29
ndroid_view_RenderNodeAnimator.cpp
ndroid_view_RenderNodeAnimator.h
fae7bedcf0a782ed7085d34b7a6d913169614aa6 01-May-2014 Elliott Hughes <enh@google.com> am f84493ec: am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"

* commit 'f84493ec95bfce41106673645a3e56b185e54df5':
Fix for native leaks in YuvToJpegEncoder.cpp
3d4c64191a181aac0922abbd56f4046d6b7ec31c 30-Apr-2014 Eric Laurent <elaurent@google.com> fix AudioTrack and AudioRecord JNI

AudioTrack and AudioRecord JNI should not cast
jshortArray to jbyteArray. This appeared to work with Dalvik
but causes data corruption with ART.

Change-Id: Ib30b71e0d4007c4b574bc409963ddc5975ad4f78
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
f84493ec95bfce41106673645a3e56b185e54df5 30-Apr-2014 Elliott Hughes <enh@google.com> am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"

* commit '91ff3c18dbb61ed0087f741dd2bdf911ecf42fef':
Fix for native leaks in YuvToJpegEncoder.cpp
91ff3c18dbb61ed0087f741dd2bdf911ecf42fef 30-Apr-2014 Elliott Hughes <enh@google.com> am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"

* commit '7d3f9e9730b100de4c0e643e13bf59bf54ef7819':
Fix for native leaks in YuvToJpegEncoder.cpp
7d3f9e9730b100de4c0e643e13bf59bf54ef7819 30-Apr-2014 Elliott Hughes <enh@google.com> Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
e03a7eab1d08c821a516f1c07d29a77797acab68 22-Feb-2014 Ruben Brunk <rubenbrunk@google.com> camera3: Update CameraMetadata vendor tag handling.

Bug: 12134423
Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
ndroid_hardware_camera2_CameraMetadata.cpp
293513a59d36cd96a3e474dde5981380d372d8c9 30-Apr-2014 Bill Yi <byi@google.com> Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
15c32f2699f03ba2065e663b3beb2c8d328f42ef 30-Apr-2014 Michael Wright <michaelwr@google.com> Merge "Move key attribute information into KeyEvent."
e45b1fd03b524d2b57cc6c222d89076a31a08bea 15-Apr-2014 John Reck <jreck@google.com> RenderThread animator support

Change-Id: Icf29098edfdaf7ed550bbe9d49e9eaefb4167084
ndroid.mk
ndroidRuntime.cpp
ndroid_view_RenderNode.cpp
ndroid_view_RenderNodeAnimator.cpp
ndroid_view_RenderNodeAnimator.h
ndroid_view_ThreadedRenderer.cpp
337d9d2edc262141f9b8f684e53aae5e47f0ae13 23-Apr-2014 Michael Wright <michaelwr@google.com> Move key attribute information into KeyEvent.

This consolidates all of the information that was in the native
KeyEvent and the KeyLayout files into the managed KeyEvent class.

It also moves the definition for all of the key names to the native
side, rather than having them in both places.

Change-Id: I172e3b554e7eb52c79ae2ec406ef4332e8b25ffa
ndroid_view_KeyEvent.cpp
ndroid_view_MotionEvent.cpp
cc39e16cb98855f35079941b5e7e6eac2b7bc388 26-Apr-2014 Chris Craik <ccraik@google.com> Add elevation, Z properties to View

Change-Id: I3dd3b683a66e248a0fdf2ca69d1e962615b0daf9
ndroid_view_RenderNode.cpp
6689c9700da7d391a0e0e90adfe9fa34a88fc3ea 26-Apr-2014 Chris Craik <ccraik@google.com> Merge "Support Oval GradientDrawable outlines, and ShapeDrawable"
7979388d4f7d5d9dbfcf7e1cc4709f8088c034ae 25-Apr-2014 Chris Craik <ccraik@google.com> Support Oval GradientDrawable outlines, and ShapeDrawable

Change-Id: Ifc9e55757d3325cb28a1a812ec696512d4a18b39
ndroid/graphics/Path.cpp
24a4ce35661f59054d9bbc9c3326639d003526fb 25-Apr-2014 Allen Hair <allenhair@google.com> Merge "Fix nativeGetAnimationFrameStats to use the correct times."
7bdcc0b189c617a0eff497d2a4cc260ee960d8eb 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am fc02fcc8: am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues"

* commit 'fc02fcc8a4ad181c44ca41a99cc86e1d23844d0c':
jni: android_util_Process 64 bit issues
fc02fcc8a4ad181c44ca41a99cc86e1d23844d0c 25-Apr-2014 Mark Salyzyn <salyzyn@google.com> am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues"

* commit 'eacaa353e83942d3c59d0db594df0fb6179e0eea':
jni: android_util_Process 64 bit issues
06916dcb05eeee8c809bb18d170a3f73b5ee1427 24-Apr-2014 Chris Craik <ccraik@google.com> Merge "Add floats-only drawRoundRect to Canvas"
4d1c1538e2422d0a5b19ad1cd2fb353ed6279a88 24-Apr-2014 Chris Craik <ccraik@google.com> Add floats-only drawRoundRect to Canvas

Change-Id: Ib0033a2d2486a808a44984ec4adf7fef76d9ea17
ndroid/graphics/Canvas.cpp
c6a410164e1fd728cf7873493baacca7bc29548d 24-Apr-2014 Mark Salyzyn <salyzyn@google.com> jni: android_util_Process 64 bit issues

- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing

Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
ndroid_util_Process.cpp
ac5eda366fafce6ec9fd89b14e31f4aaaf08f762 24-Apr-2014 Allen Hair <allenhair@google.com> Fix nativeGetAnimationFrameStats to use the correct times.

Changed the method to use actualPresentTimesNano instead of
desiredPresentTimesNano when initializing WindowAnimationFrameStats. The
WindowAnimationFrameStats.init(..) method expects the actual
presentation times, not the posted times.

Additionally, the desiredPresentTimesNano values are all invalid
(INT64_MAX) when working with window animation frames.

Change-Id: I5e5ce888dac859179ef06e4bbd8bfbd959521dd2
ndroid_view_SurfaceControl.cpp
3f3823308a412b5cd4a9726d51bf017d379e752d 24-Apr-2014 Aravind Akella <aakella@google.com> Merge "Bug fix for wakeup sensors."
35187bd5c1e40ea52a672c525411d05cbcdd6482 12-Feb-2014 Aravind Akella <aakella@google.com> Bug fix for wakeup sensors.

SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a
timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now.
Bug: 9774884

Change-Id: I6cab0147c63f57a494a61f4dfe2a64a27dfe1b4e
ndroid_hardware_SensorManager.cpp
3f085429fd47ebd32ac2463b3eae2a5a6c17be25 16-Apr-2014 Chris Craik <ccraik@google.com> Clip TouchFeedbackDrawable effect to receiver Outline

Projected RenderNodes are now wrapped with a ClipRect or masked
SaveLayer, so that they are clipped to the outline of the projection
receiver surface.

Change-Id: I1d4afc1bb5d638d650bc0b1dac51a498f216773e
ndroid_view_GLES20Canvas.cpp
d36022901e39c49c976f863d1cad696514c6f193 18-Apr-2014 Michael Kolb <kolby@google.com> am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp

* commit '7d755a6f572dfcbe644bf3d92240cc45f8bf7dcc':
jni: binder ptrdiff_t compile issues
c5aa56872da5a06741cb0e596813c2f0a6d7a05f 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues"

* commit '7423510c5a6a103a77efc36f064ed716f8810b97':
jni: binder ptrdiff_t compile issues
5b6da1aee884d32d8140e27c5b5b4d16ea4a37c8 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> jni: binder ptrdiff_t compile issues

Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
ndroid_util_Binder.cpp
8a61140034a2007d6d3b8ca7a7d87f6d87866dd7 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am dc500d2d: am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"

* commit 'dc500d2d567b37c620308bc8f0b0928eba4a2f5b':
jni: binder 64-bit compile issues
dc500d2d567b37c620308bc8f0b0928eba4a2f5b 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"

* commit '4037847c0251a15ea88012a8405d0688c8b1ac53':
jni: binder 64-bit compile issues
cfd91e7852bac3f9775cf3d05eedaade070cfecd 18-Apr-2014 Mark Salyzyn <salyzyn@google.com> jni: binder 64-bit compile issues

Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
ndroid_util_Binder.cpp
0613657426aecb7ed6141c133f100baf24166ae0 17-Apr-2014 Raph Levien <raph@google.com> Merge changes Ia693f512,If3b7d41f

* changes:
Enable elegant text metrics in Quantum theme
Add elegantTextHeight text appearance attribute
53c0077256afebb0312f01ef4f60a7445da1f5d9 14-Apr-2014 Raph Levien <raph@google.com> Add elegantTextHeight text appearance attribute

This patch adds an elegantTextHeight text appearance attribute and
plumbs it through to the paint. This attribute selects the elegant
variant of fonts (when appropriate, which is typically Arabic and indic
scripts), and also specifies larger vertical metrics, to avoid clipping.

The intent is for this to be the default for quantum themes, but this
patch doesn't change any default behavior, just adds the attribute.

The larger vertical metrics are applied to top and bottom, but should
not affect line spacing in the common case. Also, with the setting,
metrics are no longer dependent on the font, so setting a custom font
will preserve layout and spacing.

Change-Id: If3b7d41f141deff50ca078f479ca90c2aa07829a
ndroid/graphics/Paint.cpp
7085d138b21bbce7c9c989c719b35769267b422e 17-Apr-2014 Leon Scroggins <scroggo@google.com> Merge "Call SkShader::isOpaque() to determine opaqueness."
5932b0d8fc313f9e4f2c8e5c431ac0e270f9f259 17-Apr-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Call SkShader::isOpaque() to determine opaqueness.

It is invalid to call SkShader::getFlags() before calling
SkShader::setContext() - it will always return 0. Instead, call
SkShader::isOpaque().

Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
ndroid/graphics/Shader.cpp
c731435649ef42a454a7e2e22fa2e303a242f8f9 17-Apr-2014 John Reck <jreck@google.com> Merge "Add missing resume() call"
6f07a0dc875a9eac67312085a8e0133b9e2f4771 17-Apr-2014 John Reck <jreck@google.com> Add missing resume() call

Bug: 14087850

Change-Id: Ic555ca6027e617c7ed6e7e66b5cf713c36ed1c6c
ndroid_view_GLES20Canvas.cpp
2f894fec5b22948558b22753cc472d4559bea942 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"

* commit '24dbfdaa701a729e3b231db63787e0d636b7cc3b':
frameworks: 64 bit compile issues
24dbfdaa701a729e3b231db63787e0d636b7cc3b 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"

* commit '936e87e12dd1335c6f773705fd0a7edb32bc4385':
frameworks: 64 bit compile issues
2760778d7020c31f6b7c28383b0db6e0bef99754 09-Apr-2014 Mark Salyzyn <salyzyn@google.com> jni: liblog reading error API incorrect

- return value contains -errno on error.

(cherry pick from commit b519aeca47a7b798926c00ce5c8cf730e26e75fd)

Bug: 13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
ndroid_util_EventLog.cpp
853940331ff2be48ed3e63f459845e5e43d0a131 16-Apr-2014 Mark Salyzyn <salyzyn@google.com> frameworks: 64 bit compile issues

ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues)

Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
ndroid_database_CursorWindow.cpp
ndroid_net_TrafficStats.cpp
ndroid_os_Debug.cpp
e8a866d4a41daa43e394505e12503b32c2d929e4 14-Apr-2014 John Reck <jreck@google.com> Merge "Fix issue with bitmap uploading"
860d155f866cc15a725e7ce03763280987f24901 12-Apr-2014 John Reck <jreck@google.com> Fix issue with bitmap uploading

Bug: 13912749

Change-Id: Ic23fa1d280118dc93dc2716a4a24cc0bbbdca595
ndroid_view_GLRenderer.cpp
ndroid_view_HardwareLayer.cpp
fae904d63947fe1687d1d44be29234cc3d538f24 14-Apr-2014 John Reck <jreck@google.com> Fence on destruction

Bug: 14052927
destroyCanvasAndSurface() needs a fence as when it returns the
underlying BufferQueue is going to be released from under
the render thread.

Change-Id: I0147a1d5ec5adf0239c761ef22f65cd8c8a137df
ndroid_view_ThreadedRenderer.cpp
c70f3db80ad522bdb5938b5944b3d9c7d7758f12 11-Apr-2014 John Reck <jreck@google.com> Merge "Simplify matrix calculations"
f7483e3af0513a1baa8341d403df2e0c0896a9ff 11-Apr-2014 John Reck <jreck@google.com> Simplify matrix calculations

Bug: 13913604

Change-Id: I2c0f85a34e1e520050a5a6131306d6b7c352d827
ndroid_view_RenderNode.cpp
d951ab230d80631731ef12b5d76c678c30165d6a 11-Apr-2014 Aravind Akella <aakella@google.com> am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev

* commit '8ebd66c259602f6b0be26fdfd3fe2f55538f6424':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
8ebd66c259602f6b0be26fdfd3fe2f55538f6424 11-Apr-2014 Aravind Akella <aakella@google.com> am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev

* commit 'cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314 11-Apr-2014 Aravind Akella <aakella@google.com> Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
cd9a7bb3ba742606f93dcbd549d6d6eeb1cb5247 08-Apr-2014 Aravind Akella <aakella@google.com> Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor

This reverts commit 819239e5bec90ee3c861ac45fffac4a832a183a1.

Change-Id: I4bbb222e5c9dc65aed03aa28fd9e0f00fe335819
ndroid_hardware_SensorManager.cpp
822bbb382fa6b6c8d1b45770e27c2c2732a7afb7 11-Apr-2014 John Reck <jreck@google.com> Merge "Make attachFunctor blocking"
d3d8dafc2f61fb118c060720b52684c59303f3db 11-Apr-2014 John Reck <jreck@google.com> Make attachFunctor blocking

Bug: 13930200

Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
ndroid_view_ThreadedRenderer.cpp
6be2f95202237b7284542e692273d13a5bd26913 10-Apr-2014 Svetoslav <svetoslavganov@google.com> Merge "Adding render stats APIs to UiAutomation (framework)."
d11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4 10-Apr-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 286a247e to master

Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
286a247e4c8fcecb59636f668678d24e33142744 10-Apr-2014 Narayan Kamath <narayan@google.com> am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."

* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
Re-implement native library search and copies.
80413c9fe10acf36eaecd139198c7fc17e8af2e6 10-Apr-2014 Narayan Kamath <narayan@google.com> Merge "Re-implement native library search and copies."
f4198b713e43c0c0f9adac74203cf24c2a49b802 10-Apr-2014 John Reck <jreck@google.com> Merge hasFunctors & pushStaging into prepareTree

Bug: 13902607
Fixes synchronous mode for WebView in HardwareLayers

Change-Id: I90de1e26dcfd9b75cc2f03bac72705fc23237b68
ndroid_view_GLRenderer.cpp
ndroid_view_HardwareLayer.cpp
8e1f918738abf70a4dc86dbb12b386a9deea37f8 10-Apr-2014 John Reck <jreck@google.com> Merge "Switch DisplayListData to a staging model"
8de65a8e05285df52a1e6f0c1d5616dd233298a7 10-Apr-2014 John Reck <jreck@google.com> Switch DisplayListData to a staging model

Bug: 13912977

Change-Id: I5b2f664e797be22a58300964f57ceb4fab60528c
ndroid_view_GLRenderer.cpp
ndroid_view_RenderNode.cpp
ndroid_view_ThreadedRenderer.cpp
a040977de8b3ec791bf3b7e0115630e8c27fd8ca 09-Apr-2014 John Reck <jreck@google.com> Merge "Fix ThreadedRenderer.setEnabled()"
f7d9c1dc84671d4e99657ef071d275700d85bb11 09-Apr-2014 John Reck <jreck@google.com> Fix ThreadedRenderer.setEnabled()

Bug: 13914116
Fixes lifecycle issues around setEnabled where ThreadedRenderer
was reporting as being enabled before it had a Surface. This is
incorrect.

Also fix some EGL lifecycle issues

Change-Id: I12ebb279707f9b533a570b61d68735d858b560bf
ndroid_view_ThreadedRenderer.cpp
1b1c021858daca0e77c106503798c2c47cb372b4 09-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 280fe930: am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect"

* commit '280fe930a432d9e2ead8c4b58ce76a0ee45742e7':
jni: liblog reading error API incorrect
1378aba7aeeb7f6dd6cc2503968ba7b0e58d9333 28-Feb-2014 Ramin Zaghi <ramin.zaghi@arm.com> Re-implement native library search and copies.

We now use a two step approach :

- First we look through the list of shared libraries in an
APK, and choose an ABI based on the (priority) list of ABIs
a given device supports.
- Then we look through the list of shared libraries and copy
all shared libraries that match the ABI we've selected.

This fixes a long-standing bug where we would sometimes copy
a mixture of different ABIs to the device, and also allows us
to clearly pick an ABI to run an app with.

The code in NativeLibraryHelper has been refactored so that all
file name validation & matching logic is done in a single place
(NativeLibrariesIterator). This allows us to avoid a lot of
redundant logic and straightens out a few corner cases (for eg.
where the abi determination & copying logic do not agree on
what files to skip).

bug: https://code.google.com/p/android/issues/detail?id=65053
bug: 13647418

Change-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef
Co-Authored-By: Zhenghua Wang <zhenghua.wang0923@gmail.com>
Co-Authored-By: Ramin Zaghi <ramin.zaghi@arm.com>
Co-Authored-By: Narayan Kamath <narayan@google.com>
om_android_internal_content_NativeLibraryHelper.cpp
280fe930a432d9e2ead8c4b58ce76a0ee45742e7 09-Apr-2014 Mark Salyzyn <salyzyn@google.com> am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect"

* commit '7a67c927e622bb176b21455b8ed56c76b8e0f602':
jni: liblog reading error API incorrect
ecdf9b199ac9659c37c34c0b23084199acea80bf 09-Apr-2014 Mark Salyzyn <salyzyn@google.com> Merge "jni: liblog reading error API incorrect"
8ee0b48d607fd6afc5e75f56bdadce19272c60ff 09-Apr-2014 Narayan Kamath <narayan@google.com> am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."

* commit '97175deb446cdaca7f3910b71940cb443bda3cc4':
Clean up argc / argv processing for runtime args.
97175deb446cdaca7f3910b71940cb443bda3cc4 09-Apr-2014 Narayan Kamath <narayan@google.com> am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."

* commit '3856a219fa414ee53c5ef3a0c35dae35e2ca80b1':
Clean up argc / argv processing for runtime args.
22ec1eefa4dc8e12f7da8e8750d4770144941526 07-Apr-2014 Narayan Kamath <narayan@google.com> Clean up argc / argv processing for runtime args.

- Make copies of argc, argv before argv is potentially
overwritten with the process name.
- Allow multiple command line arguments to be passed to
ZygoteInit (this is required for some of the 64 bit
zygote work).
- Add an explanatory comment about how these argments
are processed.

Change-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0
ndroidRuntime.cpp
b519aeca47a7b798926c00ce5c8cf730e26e75fd 09-Apr-2014 Mark Salyzyn <salyzyn@google.com> jni: liblog reading error API incorrect

- return value contains -errno on error.

Bug: 13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
ndroid_util_EventLog.cpp
bd6c5577ab0790415b99d24f41b7b3cdd823449d 08-Apr-2014 Adam Hampson <ahampson@google.com> Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev
560d1d9cb24498643cea26c35a1a2481b70a9e68 08-Apr-2014 Leon Scroggins III <scroggo@google.com> Merge "Remove SkFloatToScalar."
85189c5dafb08f051c7024f42ceedcbcf5dbbc7c 08-Apr-2014 John Reck <jreck@google.com> Merge "Fence on draws that are reported"
1376d600d8e0eefdbc0aa11d398cf7517fc77129 13-Mar-2014 Svetoslav <svetoslavganov@google.com> Adding render stats APIs to UiAutomation (framework).

bug:12927198

Change-Id: Iae21481c75ae58dcdab3731bf5f1e2844e29d434
ndroid_view_SurfaceControl.cpp
28ad7b52e038ef0cdd89f753d9839444a434b299 08-Apr-2014 John Reck <jreck@google.com> Fence on draws that are reported

Change-Id: Ib2ec16cbda40f40df1710bdc868869ea8301f17e
ndroid_view_ThreadedRenderer.cpp
c74221594d51c9b30a365ba0c621f00f70bd1a60 14-Feb-2014 Narayan Kamath <narayan@google.com> DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.

This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.

(cherry picked from commit b3802a8e2360aaa0a88faa625e15c31b56eaf125)

Bug: 13763685
Bug: 13763900

Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
ndroidRuntime.cpp
96c637e9414600a67c71014274e7757161dcc709 08-Apr-2014 John Reck <jreck@google.com> Merge "Refcount RenderNode"
2e0103eb340822f9d580c1aa8492bae8394b8243 04-Apr-2014 Leon Scroggins III <scroggo@google.com> Remove SkFloatToScalar.

Now that SkScalar is always float (it may someday be double, but
float to double is trivial), remove callers of SkFloatToScalar,
which is deprecated in Skia.

BUG:13694396

Change-Id: I524a9bb6f7702bc810bac55fb9d2cd5361a01cf7
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/Interpolator.cpp
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/PathMeasure.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/TextLayout.cpp
087bc0c14bdccf7c258dce0cdef46a69a839b427 05-Apr-2014 John Reck <jreck@google.com> Refcount RenderNode

Change-Id: I7a86db8acc2b78ef33d987a43a119f5933d7d752
ndroid_view_RenderNode.cpp
acf395fd9441bce9fbe68c1b7efbf824570284bc 05-Apr-2014 Etienne Le Grand <etn@google.com> am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"

* commit '819239e5bec90ee3c861ac45fffac4a832a183a1':
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
fa1d2417d296e28a48a8c4a5cfb932172edbdd65 05-Apr-2014 Etienne Le Grand <etn@google.com> Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"

This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
(cherry picked from commit 819239e5bec90ee3c861ac45fffac4a832a183a1)
ndroid_hardware_SensorManager.cpp
819239e5bec90ee3c861ac45fffac4a832a183a1 05-Apr-2014 Etienne Le Grand <etn@google.com> Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"

This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
ndroid_hardware_SensorManager.cpp
ded264733036bb566c54da5b771d63f57213c84e 05-Apr-2014 Etienne Le Grand <etn@google.com> am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor

* commit 'bdfe384106de364ea2effac6ab80108556d11649':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
bdfe384106de364ea2effac6ab80108556d11649 05-Apr-2014 Etienne Le Grand <etn@google.com> am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor

* commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
fd53d8352a4617941b0a0449390aa562a01ea1d3 25-Mar-2014 Etienne Le Grand <etn@google.com> Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor

Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
ndroid_hardware_SensorManager.cpp
5a7468f59824aca2bf28502d5dc79ab3b92e3797 06-Feb-2014 Narayan Kamath <narayan@google.com> DO NOT MERGE Fix several bad function definitions.

We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271

(cherry picked from 047b938f7188c21c07669108c5c68b2358f6b158)

Change-Id: I6ce506131780d7cdeb05df9a7b8322f5494eeab2
ndroid/graphics/Canvas.cpp
ndroid_view_GLES20Canvas.cpp
cc11f15f76a62ded3e403cb2bc818c6aa5bf261c 31-Mar-2014 Leon Scroggins <scroggo@google.com> Update to call new Skia APIs.

I816129d49c0118453222916f3c818eccac33663d merges a new version of
Skia that updates various APIs. Call the new ones.

SkBitmap::copyTo now takes an SkColorType instead of an
SkBitmap::Config, so do the conversion with
SkBitmapConfigToColorType or use the enum when it makes sense.

Call SkImageDecoder::decodeSubset instead of (deprecated)
SkImageDecoder::decodeRegion.

Override SkCanvas::ClipVisitor::clipRRect in ClipCopier.

In Canvas::clip calls, call SkCanvas::isClipEmpty(), which was
previously called inside the clip call, to determine the return value.

For various SkPaint effects, call the new factories (as the constructors
have been made protected).

Implement SkJavaOutputStream::bytesWritten(), overriding a new pure
virtual function on SkWStream.

Update Matrix calls to always return true (since SkMatrix calls no
longer return a value).

Depends on I816129d49c0118453222916f3c818eccac33663d (skia).

Change-Id: I5cdcea827ebff587df0bbddc0965e3e0fbf48002
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/Xfermode.cpp
ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a 03-Apr-2014 Chris Craik <ccraik@google.com> Merge "Move most TransformationInfo properties to RenderNode"
c6f6ba3265d2b07649277682fd3ca0f9ce4d011a 03-Apr-2014 Narayan Kamath <narayan@google.com> am 71ae2bd4: am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"

* commit '71ae2bd42be21de6d25d1f8c52e3973c172462df':
Remove ProcessState::mArgc,mArgV,mArgLen
71ae2bd42be21de6d25d1f8c52e3973c172462df 03-Apr-2014 Narayan Kamath <narayan@google.com> am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"

* commit 'f87b3a25b928f145558f6f60183944f513878b63':
Remove ProcessState::mArgc,mArgV,mArgLen
a23fcd7be8e40078a913b1a99222cdd89229e67b 28-Mar-2014 Narayan Kamath <narayan@google.com> Remove ProcessState::mArgc,mArgV,mArgLen

These look like historical oddities, and weren't really being
used for anything useful.

Process:setArgV0 was being called by android.util.Process, but
that functionality can be moved directly into the implementation
of that class.

bug: 13647418

Change-Id: I216c8f8a4c065f0cf3a61f19f9e32decd26f93f6
ndroidRuntime.cpp
ndroid_util_Process.cpp
49e6c73913e9bee58ea5e3984be151ee8e033163 31-Mar-2014 Chris Craik <ccraik@google.com> Move most TransformationInfo properties to RenderNode

This change dedupes the various properties that were represented both
in TransformationInfo, and RenderProperties on the native side.

RenderNode (and its associated properties) are now permanently
attached to a View in SW or HW. The native copy of these properties
are their sole representation.

Alpha to come in a later CL.

Also fixed issue with copying RenderNode's transform, and added
support of deleting RenderNodes in software rendering.

Change-Id: Ideb6e7f32b780e87aa1c32637c368356b3eee3a1
ndroid_view_RenderNode.cpp
b69bb445585a083b8e4ff8a13a1a1a63e9c22a6a 02-Apr-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 71ab4f4f to master

Change-Id: I888c231f7579523e12fbd68f820f0775019e51e0
71ab4f4f48a9b8b485d80adf18d568ef6265b1e8 02-Apr-2014 Narayan Kamath <narayan@google.com> am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."

* commit 'ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
Move zygote startup logic to the frameworks.
973b4663b0b5ee62006522bf4742af076096e548 31-Mar-2014 Narayan Kamath <narayan@google.com> Move zygote startup logic to the frameworks.

The Zygote class is now in com.android.internal.os. It is
responsible for the vast majority of work before and after
the call to fork(). It calls back into the Runtime via
the new dalvik.system.ZygoteHooks class to allow the Runtime
to perform pre fork cleanup and post fork initialization.

The native code in Zygote.cpp is a direct and straightforward
port of the existing code in art. Most differences are
superficial, for example :
- We use C style logging (ALOGE) instead of stream based
logging.
- We call env->FatalError() instead of using LOG(FATAL)

Change-Id: Ia101fb2af12d23894fe57e4134d2bc6d142e5059
ndroid.mk
ndroidRuntime.cpp
om_android_internal_os_Zygote.cpp
5c2f20394edfb2c89d88d51772717b8f61a50f60 01-Apr-2014 Glenn Kasten <gkasten@google.com> Merge "Don't ignore return value of setAuxEffectSendLevel()"
3009f0b911e39d3b26c69bd7667d6444eacb9d11 29-Mar-2014 Glenn Kasten <gkasten@google.com> Don't ignore return value of setAuxEffectSendLevel()

Change-Id: I1383c913304430146e6f40d89df623dd0d582e50
ndroid_media_AudioTrack.cpp
170e0c4bf02fd236e5f992010aabdbc90b7587db 01-Apr-2014 Glenn Kasten <gkasten@google.com> Merge "Use memcpy_to_i16_from_u8 from audioutils instead of C loop"
b9b07b8c48dca71c0aa6adf77baabcea0285215e 01-Apr-2014 Glenn Kasten <gkasten@google.com> Merge "AudioTrack and AudioRecord JNI cleanup"
d1f7354dd814ce117f1fa63934151ca0b929ab6e 31-Mar-2014 Glenn Kasten <gkasten@google.com> Fix build from multiple declaration

Change-Id: Id2dd703aedef0423605407ab7a14ef7b48c2fcdb
ndroid_media_AudioTrack.cpp
1dd51abaae27af8e12ee06b9651fd6e4334963a5 31-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Use set() return value instead of separate call to initCheck()"
47bbaea4c3f5dee97f2e1c56c6cc9957efa17eaf 31-Mar-2014 Glenn Kasten <gkasten@google.com> Merge "Include more information in AudioTrack JNI error logs"
8e150fef2bb0d3e672b7ecba2caa35ee37a8c27d 31-Mar-2014 John Reck <jreck@google.com> Merge "Add invokeFunctor"
8f81d0832bd2eea2e479f38160961fbcf35bd591 28-Nov-2012 Glenn Kasten <gkasten@google.com> Include more information in AudioTrack JNI error logs

Change-Id: I0e57060dd46cce4ec8217bb7d122bd010c974717
ndroid_media_AudioTrack.cpp
0d1f634f4b5e1bb37aa51777efb6a68619488d01 29-Mar-2014 John Reck <jreck@google.com> Add invokeFunctor

Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
ndroid_view_GLRenderer.cpp
ndroid_view_ThreadedRenderer.cpp
37967d46f40c8c52c88ff8c011972a1489d465ec 28-Nov-2012 Glenn Kasten <gkasten@google.com> Use memcpy_to_i16_from_u8 from audioutils instead of C loop

This function may be optimized in the future,
and it will make it easier to search for audio sample
format-specific code when we need add support for more formats.

Change-Id: Iad0585c35ddd2d12857164ed1effcce75f77920c
ndroid.mk
ndroid_media_AudioTrack.cpp
c5d142428ad68dd8aa4ffb80719667b13ad5049f 29-Mar-2014 Glenn Kasten <gkasten@google.com> Use set() return value instead of separate call to initCheck()

Change-Id: I6874ca00512d30824ecec10b8dc289993b985c7b
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
5b8fd44365f03601aaba41879ac18e70ce814a0f 14-Nov-2013 Glenn Kasten <gkasten@google.com> AudioTrack and AudioRecord JNI cleanup

Rename nbChannels to our conventional channelCount,
which should make code searches easier.

Change-Id: I3c2791db302558a15bc8be198b6f3d482e0e0055
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
2fbf25b50f8534c78f3b9063d35a0b5970ff8f1e 28-Mar-2014 Glenn Kasten <gkasten@google.com> Fix warnings

Change-Id: Ie00f6c58a944e2db0539f1119d2983a483b6f10c
ndroid_hardware_Camera.cpp
ndroid_media_AudioRecord.cpp
4a857b1d471a51ed5dc0ad27fb2ab62ab78822e0 27-Mar-2014 Leon Scroggins <scroggo@google.com> Merge "Update framework to use M34 version of Skia."
ecd072161ec57ba8dfb26659511c0f6605601560 27-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 22d07464 to master

Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d
46cb9bdbf56b27cbf2ab878b41d21e30896a4fea 06-Mar-2014 Leon Scroggins <scroggo@google.com> Update framework to use M34 version of Skia.

These changes are needed due to changes in the Skia API.

Depends on https://googleplex-android-review.git.corp.google.com/#/c/439626/1
(Ic3cf846b74d6f10ec30c477b50fd774cc30ad52c)

BitmapFactory.cpp:
Use SkColorType instead of SkBitmap::Config, where possible.
Call SkBitmap::info() instead of deprecated SkBitmap::asImageInfo().
Remove calls to deprecated SkBitmap::getSize64().

Canvas.cpp:
ColorFilter.cpp:
Matrix.cpp
Remove the deprecated SK_SCALAR_IS_FIXED path. Leave in an else case for
SK_SCALAR_IS_FLOAT, to allow for eventual SK_SCALAR_IS_DOUBLE path.

Graphics.cpp:
Like in BitmapFactory.cpp, use new methods for determining the size of
pixels.

Paint.cpp:
Use more precise SkScalar_ToInt versions of macros.

TextLayoutCache.cpp:
Fix bug in macro definition for HB_SurrogateToUcs4.
Use the new name for SkCreateTypefaceForScriptNG.

android_view_SurfaceControl.cpp:
Replace ScreenshotPixelRef with a Skia pixel ref.

This is a merge from master-skia branch:
https://googleplex-android-review.git.corp.google.com/#/c/430554/
(Ie11503bcefd3883c466279fde5ce147c8a72b452)

Change-Id: Idf15746f93dabeb7862ac02cc6bd925f0dcc68ba
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid_view_SurfaceControl.cpp
22d074643ed0d010ebfdb0fca685d65eb2632e58 27-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp

Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
f5df700e6ce056ebfa322314d970e52d6facc35a 25-Mar-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make frameworks/base code more portable

Changes in this patch include

[x] Use %zu for size_t, %zd for ssize_t

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

Change-Id: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ndroid/graphics/TextLayoutCache.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_nio_utils.cpp
ndroid_os_Debug.cpp
ndroid_server_NetworkManagementSocketTagger.cpp
ndroid_text_AndroidBidi.cpp
ndroid_text_AndroidCharacter.cpp
ndroid_text_format_Time.cpp
ndroid_util_Log.cpp
62828dfca2b009d42a414b60117d7f34034841f8 26-Mar-2014 Chris Craik <ccraik@google.com> Merge "Add private circular reveal API on View/RenderNode"
8c271ca63b62061fd22cfee78fd6a574b44476fd 25-Mar-2014 Chris Craik <ccraik@google.com> Add private circular reveal API on View/RenderNode

Change-Id: I139c8e12b354083149a665f6768f3f6931a8dd15
ndroid_view_RenderNode.cpp
de898ff42912bd7ca1bfb099cd439562496765a4 30-Jan-2014 Adam Lesinski <adamlesinski@google.com> Shared library resource support

Shared libraries can now export resources for applications
to use.

Exporting resources works the same way the framework exports
resources, by defining the public symbols in res/values/public.xml.

Building a shared library requires aapt to be invoked with the
--shared-lib option. Shared libraries will be assigned a package
ID of 0x00 at build-time. At runtime, all loaded shared libraries
will be assigned a new package ID.

Currently, shared libraries should not import other shared libraries,
as those dependencies will not be loaded at runtime.

At runtime, reflection is used to update the package ID of resource
symbols in the shared library's R class file. The package name of
the R class file is assumed to be the same as the shared library's
package name declared in its manifest. This will be customizable in
a future commit.

See /tests/SharedLibrary/ for examples of a shared library and its
client.

Bug:12724178
Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
ndroid_util_AssetManager.cpp
ndroid_util_XmlBlock.cpp
bcad68ad80e5a44e5dc6988eddb8acabdc01a737 25-Mar-2014 John Reck <jreck@google.com> Merge "Move where updateProperties is called"
163b865564fdb4d491c54ee04efb17af80a18689 25-Mar-2014 Narayan Kamath <narayan@google.com> am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."

* commit 'ea96d791c7eca3eb5d003b8559b89a573f81dac9':
Fix scaleNinePatch.
ab9efda69fb0a604fa83f08cb33ce634ca056ef4 25-Mar-2014 Narayan Kamath <narayan@google.com> am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."

* commit 'ea96d791c7eca3eb5d003b8559b89a573f81dac9':
Fix scaleNinePatch.
bfb07a03777af424e99bca1dac4c903aaf44e99d 25-Mar-2014 John Reck <jreck@google.com> Move where updateProperties is called

Change-Id: I27da448996019094c44487ce28c5689d098d6535
ndroid_view_GLRenderer.cpp
9bbbee116e5d480c56676686b96e86e2ef7d83ca 25-Mar-2014 Alan Viverette <alanv@google.com> Merge "Implement APIs for obtaining, caching themed Drawables"
52b999f0721b53e9c6e18a4bd664e89aeb65b2d5 25-Mar-2014 Alan Viverette <alanv@google.com> Implement APIs for obtaining, caching themed Drawables

When Drawables are inflated during preload (or otherwise without a theme)
they cache their themeable attributes in their constant state as an array
keyed on attribute index. Drawables inflated with a theme will simply
resolve theme attributes as part of normal inflation, and they will not
cache any themeable attributes.

Drawables obtained from Resources are pulled from theme-specific cache
when possible. If an unthemed Drawable exists in the preload cache, a
new constant state will be obtained for the Drawable and the theme will
be applied by resolving the cached themeable attributes and overwriting
their respective constant state properties. If no cached version exists,
a new Drawable is inflated against the desired theme.

Constant states from themed drawables may be cached if the applied theme
is "pure" and was loaded from a style resource without any subsequent
modifications.

This CL does not handle applying themes to several Drawable types, but it
fully supports BitmapDrawable, GradientDrawable, NinePatchDrawable,
ColorDrawable, and TouchFeedbackDrawable.

BUG: 12611005
Change-Id: I4e794fbb62f7a371715f4ebdf946ee5f9a5ad1c9
ndroid_util_AssetManager.cpp
d0a0b2a3140bfb1819a116413ce9d81886697a07 21-Mar-2014 John Reck <jreck@google.com> Add stagingProperties

Change-Id: Ic7de551f8843fd70a77f738e33028e25c020bb3c
ndroid_view_RenderNode.cpp
b68d38e81fd779011e478dcf9911fbe77f71f20e 29-Jan-2014 Chong Zhang <chz@google.com> DO NOT MERGE change Surface constructor arg to 64bit

Bug: 12799017
Bug: 12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
(cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1)
ndroid_view_Surface.cpp
b49f446c98096c4790a11d9b5bc83a4e585278c9 20-Mar-2014 Chris Craik <ccraik@google.com> Rework Outline API, remove isolatedZVolume remnants

Change-Id: I30c2fe832dcb98fa6329b1a595b3d3aafbdcad6b
ndroid_view_RenderNode.cpp
02eb6bfd66d0afc4b1d81824558e136649a5a4df 11-Mar-2014 Narayan Kamath <narayan@google.com> Fix scaleNinePatch.

Use yDivs for yDivs, and not xDivs.

bug: 13394494

(cherry picked from commit 42a51ae8812bccde7ff370cc2688f7955e489ad4)

Change-Id: Ia0a7d701a170945216ab247a483e7f972b6fe17e
ndroid/graphics/BitmapFactory.cpp
e10dd634e169ae628455a3dc49638ffde3583a80 21-Mar-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioTrack write from ByteBuffer updates position"
5d21f679c58dbb13c8c931ffec6e06b6b8cd454f 21-Mar-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioTrack write from ByteBuffer updates position

Remove offset parameter.
Update buffer position when data is successfully written.

Bug 7919023

Change-Id: I1701532ef0a91e2ccecfc38b24de29bc4f64d035
ndroid_media_AudioTrack.cpp
1e0ae4fa4b23edd5e3015d23845f2aa9050a0435 20-Mar-2014 Victoria Lease <violets@google.com> am ca58036d: am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit 'ca58036dd8018bec81fc5ab9d0376cd35b363125':
malloc some advances
3486659584176d81dc6dfa5ad1cd63f1d15306b4 20-Mar-2014 Victoria Lease <violets@google.com> am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit 'cfd46dc4847d5ef1ed14484717cf857ae5f67cae':
malloc some advances
ba111e04ac0f4e1caac31aeadc9958e2509755c9 20-Mar-2014 Narayan Kamath <narayan@google.com> am e28f061f: am 76ae4b80: am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."

* commit 'e28f061fa43e36f2f319322bc074964440a20f50':
Don't register methods when there's nothing to register.
76ae4b804e620082f3dc7eefac7f22e57a818ef1 20-Mar-2014 Narayan Kamath <narayan@google.com> am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."

* commit 'c850102d5c4b1fad47c221911c7be5567cebe8b1':
Don't register methods when there's nothing to register.
a2275b986972a017e5f06b7d96d10b8cf07ae212 20-Mar-2014 Narayan Kamath <narayan@google.com> am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."

* commit 'c850102d5c4b1fad47c221911c7be5567cebe8b1':
Don't register methods when there's nothing to register.
c5dc251e2219cc3e96c3c91a3c3ff4a120e21912 20-Mar-2014 John Reck <jreck@google.com> Merge "Move RenderNode to own file"
113e0824d6bddf4376240681f9cf6a2deded9498 18-Mar-2014 John Reck <jreck@google.com> Move RenderNode to own file

Change-Id: I9380d161fd3ddd7b569c262dd8e7aa0c96151b1e
ndroid_view_GLES20Canvas.cpp
ndroid_view_GLRenderer.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_RenderNode.cpp
ca58036dd8018bec81fc5ab9d0376cd35b363125 19-Mar-2014 Victoria Lease <violets@google.com> am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit 'cfd46dc4847d5ef1ed14484717cf857ae5f67cae':
malloc some advances
610d401cb580ee233c008acf8fc076047a0ffdb4 19-Mar-2014 Victoria Lease <violets@google.com> am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit 'e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10':
malloc some advances
e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10 19-Mar-2014 Victoria Lease <violets@google.com> am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit '55371beb024ae402831898f8788e4293f52dd832':
malloc some advances
754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2 19-Mar-2014 Victoria Lease <violets@google.com> am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit 'c8868db2a025a97e439f8a9adde565c9c83f2204':
malloc some advances
c8868db2a025a97e439f8a9adde565c9c83f2204 19-Mar-2014 Victoria Lease <violets@google.com> am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit '737d3e5da366124d164555009fa5ee4552143cc8':
malloc some advances
737d3e5da366124d164555009fa5ee4552143cc8 19-Mar-2014 Victoria Lease <violets@google.com> am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit '6b96ecca90555e04da8a4477d6dc6de83e7b9ee1':
malloc some advances
3191212259b1629cf8174416adf01522b88501ad 19-Mar-2014 Victoria Lease <violets@google.com> am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
malloc some advances
6eb2810318262ff36014c52384ed3cdea19bd34e 19-Mar-2014 Victoria Lease <violets@google.com> am 183f97b7: am 1c12f9e7: malloc some advances

* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
malloc some advances
183f97b72faf7a0f45ad66e1b3fd9a4343cc7482 19-Mar-2014 Victoria Lease <violets@google.com> am 1c12f9e7: malloc some advances

* commit '1c12f9e76298c757423155ad812890d27effafe8':
malloc some advances
f83c73ec2fa7ceecd625cb05900ead294db18c99 19-Mar-2014 Narayan Kamath <narayan@google.com> Don't register methods when there's nothing to register.

Change-Id: I6d0233f79bb90089426d702b4076ec5750e82475
ndroid_content_res_Configuration.cpp
72191f3dc186e7dbe36096fdadad6845c735f8a8 18-Mar-2014 Dan Stoza <stoza@google.com> Merge "Remove deprecated BufferQueue constructor"
1c12f9e76298c757423155ad812890d27effafe8 18-Mar-2014 Victoria Lease <violets@google.com> malloc some advances

Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
ndroid/graphics/Paint.cpp
5b3dad0804a54b71ace9920f9f5edab53041af15 18-Mar-2014 Narayan Kamath <narayan@google.com> am 6cf9aa2e: am b4b431b0: am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."

* commit '6cf9aa2e5cb0e65ecda9617304af19c827404e1a':
Pass int32_t for JNI calls to java Input/Output streams.
b4b431b0d2f6d57afe80c4119e5f41e4fb72e7d9 18-Mar-2014 Narayan Kamath <narayan@google.com> am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."

* commit 'd2133079c085cb0879facc8ee72678524d22571a':
Pass int32_t for JNI calls to java Input/Output streams.
ddcaf0d1786bfed32b9ea6d583701a91a7d5893a 18-Mar-2014 Narayan Kamath <narayan@google.com> am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams."

* commit 'd2133079c085cb0879facc8ee72678524d22571a':
Pass int32_t for JNI calls to java Input/Output streams.
37b9308034ba5f74fa0343adb5ddcb8911187139 18-Mar-2014 Victoria Lease <violets@google.com> Merge "malloc some advances"
3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa 18-Mar-2014 Victoria Lease <violets@google.com> malloc some advances

Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
ndroid/graphics/Paint.cpp
033a68ca109729aeff348b4e1a5daecc4f6b209b 17-Mar-2014 Igor Murashkin <iam@google.com> Merge "camera2: Don't log vendor tag errors when camera HAL too old"
5614cbe64493308dc5330eac5d5ba17202013dc4 17-Mar-2014 Igor Murashkin <iam@google.com> camera2: Don't log vendor tag errors when camera HAL too old

Change-Id: Id7fe9464d7599a566cea976cddc62ad101cf4a10
ndroid_hardware_camera2_CameraMetadata.cpp
34f67f26e355925aa1e00a20bc11e09b8dc32988 17-Mar-2014 Chris Craik <ccraik@google.com> Remove castsShadow and globalCamera APIs

Change-Id: I5c1c375f45946609b1635d952c5adf55e23bdd60
ndroid_view_RenderNode.cpp
0a6b0031f07f678e0ac1a24a6f2aa8bdf40c717f 17-Mar-2014 John Reck <jreck@google.com> Merge "Rename DisplayList->RenderNode"
f666ad7046c0b1b255835f75aeb7d1391067df93 15-Mar-2014 John Reck <jreck@google.com> Rename DisplayList->RenderNode

Change-Id: Idcca6f26ba6282594789962f5edb3ed53a290fef
ndroid.mk
ndroidRuntime.cpp
ndroid_view_DisplayList.cpp
ndroid_view_RenderNode.cpp
f096ed68e1ee5810f436ca820c1eada4b1a182a5 17-Mar-2014 Leon Scroggins III <scroggo@google.com> am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516

* commit '2fd045c092b08772be81a6d58bbb95e5e608403f':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
96978ee290ea0ef666c49ffa8733a8c74304c9f1 17-Mar-2014 Leon Scroggins III <scroggo@google.com> am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE

* commit 'f8d8777dddf91c741981b4f795f2fb2b1d81c1b6':
Update framework to use M33 Skia. DO NOT MERGE
2fd045c092b08772be81a6d58bbb95e5e608403f 14-Jan-2014 Leon Scroggins III <scroggo@google.com> DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

-------------------------------------------------------------------------

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
The old behavior would have continued to modify the
file descriptor's offset each time a new decode was
required. The copy ensures that the file descriptor
remains unchanged.
3. Buffer the file stream.
Prior to this change, if the image was not a PNG,
the stream would be rewound to the beginning of the
file, even if the file descriptor was passed in with
an offset. Thanks to the buffer, the stream is only
rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
ndroid/graphics/BitmapFactory.cpp
f8d8777dddf91c741981b4f795f2fb2b1d81c1b6 03-Dec-2013 Leon Scroggins III <scroggo@google.com> Update framework to use M33 Skia. DO NOT MERGE

(These CLs are already in master.)

Bug: 13246311

This cherry-picks 7 CLs:

-----------------------------------------------------------------------

Remove calls to deprecated SkBitmap::setIsOpaque()

setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a

-----------------------------------------------------------------------

Merge AssetStream with AssetStreamAdaptor.

Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.

The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
the length (read(NULL, 0)) is no longer implemented, since it is
no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
so some implementation is necessary.

cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56

-----------------------------------------------------------------------

Deprecate Android-specific SkPaint functions.

The following functions were problematic:
const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
const void* findImage(const SkGlyph&, const SkMatrix*);

Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.

Bug: 11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08

-----------------------------------------------------------------------

pass SkGlyphCache into updateGlyphCache()

Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.

Bug: 11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89

-----------------------------------------------------------------------

Updates to the Skia API needed to merge the WebView m33 version of Skia.

cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3

Bugfix for screenshots (recent apps) due to incorrect rowBytes computation

bug: 12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714

-----------------------------------------------------------------------

Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.

cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5

-----------------------------------------------------------------------

Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33

Conflicts:
core/jni/android/graphics/Bitmap.cpp
core/jni/android/graphics/Graphics.cpp
core/jni/android/graphics/Typeface.cpp
graphics/java/android/graphics/Bitmap.java
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
ndroid/opengl/util.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
2bb39d7a43fdb28ecdafd65ea4b89dc05c1ad7be 05-Mar-2014 Ashok Bhat <ashok.bhat@arm.com> Pass int32_t for JNI calls to java Input/Output streams.

Passing size_t is problematic on 64 bit platforms where
it's 8 bytes in size. Conversion to int32_t is safe because
the size argument is always clamped to fCapacity, which is
4 bytes wide.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Change-Id: I58558561a4f56451485f1a5fc6cdeda677247071
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
e2d3f28e85e59f50bbab548d3c449de0b91be3ba 15-Mar-2014 John Reck <jreck@google.com> Merge "Revert "Rename DisplayList->RenderNode""
31f9458908691dd892c6ee8c5b240e4db634d8ee 15-Mar-2014 John Reck <jreck@google.com> Revert "Rename DisplayList->RenderNode"

Missed some test(s), reverting to fix build

This reverts commit ef09d8cf946443e7f4ac4541f843368ac4338c59.

Change-Id: Ifee6c694e5f4b962d03dee200ccbf8dc9662e666
ndroid.mk
ndroidRuntime.cpp
ndroid_view_DisplayList.cpp
ndroid_view_RenderNode.cpp
759067f39a635b4c821fc17b56253bcd056ada47 15-Mar-2014 John Reck <jreck@google.com> Merge "Rename DisplayList->RenderNode"
ef09d8cf946443e7f4ac4541f843368ac4338c59 15-Mar-2014 John Reck <jreck@google.com> Rename DisplayList->RenderNode

Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad
ndroid.mk
ndroidRuntime.cpp
ndroid_view_DisplayList.cpp
ndroid_view_RenderNode.cpp
dbcd5b70ca7e8d4b6c9c91ecb9445d078d39fd8e 14-Mar-2014 Dave Allison <dallison@google.com> am 273fe6a3: am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"

* commit '273fe6a327de8051ac075855ceb7b33a9422c7a7':
Move options buffers to top scope
0d70d336b4224d3f316d6fb43ebf876fe96de88f 14-Mar-2014 Dave Allison <dallison@google.com> am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"

* commit '788fb96d7f1cfe27cf8dd56a053258964427286f':
Move options buffers to top scope
4a02e0716d43bd2bf9b96a8b1dae181f9c35dcbf 14-Mar-2014 Dave Allison <dallison@google.com> am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"

* commit '788fb96d7f1cfe27cf8dd56a053258964427286f':
Move options buffers to top scope
07a1e2323b1e6765f220a045bd05783dd99b2914 14-Mar-2014 Dave Allison <dallison@google.com> Move options buffers to top scope

It is important that the char buffers for options do
not go out of scope as the mOptions.add() does not copy
the buffer. This moves all the buffers to the top
level scope of the function to prevent accidental
overwriting when they go out of scope.

Bug: 13448497
Change-Id: I5a97ddd32ff34f237915927906e1e1f833ff036e
ndroidRuntime.cpp
dba764426b1657b84a2fb88690be7be34498bd09 13-Mar-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera3: Pass vendor tags through binder."
85c4388de1fea3d45783f07895c2b113c4cc1ba5 22-Feb-2014 Ruben Brunk <rubenbrunk@google.com> camera3: Pass vendor tags through binder.

Bug: 12134423

Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
ndroid_hardware_camera2_CameraMetadata.cpp
acccf836166353110aa80f65fdd2fef27c237aa6 13-Mar-2014 Narayan Kamath <narayan@google.com> am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

* commit 'b071a07da89a8736fa4fd757f9a6c6e990d0e858':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
acb6f07623b7df3d4179f70ae03ade574616ffa6 13-Mar-2014 John Reck <jreck@google.com> Split out RenderProperties

Change-Id: Ia9888b4fb2c849d95a8c395cafef2e2294a23aae
ndroid_view_DisplayList.cpp
0dc146be5a6cd0c33910d5b18885df46873a93cb 12-Mar-2014 Dan Stoza <stoza@google.com> Remove deprecated BufferQueue constructor

Bug: 13415624
Change-Id: Ib9788bca98fca22e0e4d81756d4aa3b29d5d5af2
ndroid/graphics/SurfaceTexture.cpp
33896588e8f62815d3ea2bfcea59332070acf988 12-Mar-2014 John Reck <jreck@google.com> No-op isolatedZVolumen property

Change-Id: I7aa474d65a3d12efd4ffb731e07ee42f4d348183
ndroid_view_DisplayList.cpp
e18264b079481a244b30e3f71012c53bbd861f92 12-Mar-2014 John Reck <jreck@google.com> Rename DisplayList->RenderNode

Change-Id: Id42e23c9a1a6eb6eaeafef707ced7fa6887b03d0
ndroid_view_DisplayList.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GLRenderer.cpp
ndroid_view_HardwareLayer.cpp
ndroid_view_ThreadedRenderer.cpp
a77df79c17faefaa64b2ae9bd869a250a26e1255 11-Mar-2014 Brian Carlstrom <bdc@google.com> am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"

* commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
Only pass -Xprofile-* options to ART
a742ca4017c93c18c421af20651494624469ed78 11-Mar-2014 Narayan Kamath <narayan@google.com> am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."

* commit 'bbf826659e8e5d0be683b2459207c495303d53b6':
LP64: Make 9 patches architecture agnostic.
2fddd6cd2ec9de6f4a8cbad4738ccc25d475756a 11-Mar-2014 Dave Allison <dallison@google.com> am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."

* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
ART profiler usage.
2d0bd7d36b7343ebf16b94c4e250a1e7f460c0e3 11-Mar-2014 Brian Carlstrom <bdc@google.com> am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"

* commit '485e3b459491267ae1390e1df5ff8f7d4695f819':
Add dex2oat-flags plumbing to AndroidRuntime
2d895e6344f7999e98f05652f7679f2d96374b78 11-Mar-2014 Narayan Kamath <narayan@google.com> am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"

* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
Various format string fixes for 64bit
30420d58e2e10a31bd4408c84aee103831436998 11-Mar-2014 Narayan Kamath <narayan@google.com> am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"

* commit '2525acf5a9855d748c008268bb26d6f6d5045d84':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
7ca2b8958578dfd1a382b8f9e44e45ffb0de5d58 11-Mar-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioTrack write method with data in ByteBuffer"
42a51ae8812bccde7ff370cc2688f7955e489ad4 11-Mar-2014 Narayan Kamath <narayan@google.com> Fix scaleNinePatch.

Use yDivs for yDivs, and not xDivs.

bug: 13394494
Change-Id: I4ca5fe33cf61922a894f071927ef08b2d7db7dd0
ndroid/graphics/BitmapFactory.cpp
549046038e6daf3c8ae71b5f2ab9e297a97d5a1b 11-Mar-2014 Narayan Kamath <narayan@google.com> am 4645c5ba: am a8706527: am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

* commit '4645c5ba33e6b8c2623f8e3c86d4ed584f9708a9':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
a870652789cc2b06b921fe66aa1bf48d4fc3e97c 11-Mar-2014 Narayan Kamath <narayan@google.com> am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."

* commit 'b071a07da89a8736fa4fd757f9a6c6e990d0e858':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
b3802a8e2360aaa0a88faa625e15c31b56eaf125 11-Mar-2014 Narayan Kamath <narayan@google.com> Remove java.io.tmpdir assignment in AndroidRuntime (again).

This was brought back by a bad merge conflict resolution
in change 0efbd9a463c848118c7685f4bfc8765a82caa761.

Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
ndroidRuntime.cpp
7ca0452fa62b9c15bd45b0fd52aef97442555a6e 07-Feb-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioTrack write method with data in ByteBuffer

New write method with data in ByteBuffer. Allows blocking and
non-blocking write.
If the ByteBuffer is not direct, the implementation uses the
existing implementation with a byte array.

Bug 7919023

Change-Id: I6935e3e05783d7d7672614b194941a87abbb50cf
ndroid_media_AudioTrack.cpp
3ba975e75d1e09142dd6258fb9886d526f5cda69 11-Mar-2014 Narayan Kamath <narayan@google.com> am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"

* commit '7fe5978bf7c4b473d8f6db5a12cfdcd110511331':
Use reinterpret_cast when an integer is cast to a pointer
5bf28c1ec82afce6cb4ba690091f5072776c18a3 11-Mar-2014 Narayan Kamath <narayan@google.com> am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"

* commit 'a88abfb3a5dccdad6210b294843fa2e21a27d378':
Use long for pointers in opengl/EGL classes
5468a5c1179f5d27d2a6c52dfd1fc69ad233bfe9 10-Mar-2014 Greg Hackmann <ghackmann@google.com> am 9e413bf4: am bbfc08b3: Merge changes I6d4fdada,Ia34899a4

* commit '9e413bf4e562d98b6efeb157369f152edd5f0261':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
02c7f9582b78c6150da7470ce68bbdcdb7635d56 10-Mar-2014 Brian Carlstrom <bdc@google.com> am 7b7d111b: am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"

* commit '7b7d111ba21c7c5ad161207a75f72948c427b1b0':
Only pass -Xprofile-* options to ART
9e73672362e2ed98ccfcc15695645daa42a61524 10-Mar-2014 Brian Carlstrom <bdc@google.com> am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"

* commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
Only pass -Xprofile-* options to ART
98ba7bd5d1942edd7c2881cc6fd0e777ae8baa2e 10-Mar-2014 Brian Carlstrom <bdc@google.com> Only pass -Xprofile-* options to ART

Bug: 13391896
Change-Id: I5d6a3b900c9b20f02e1d4ccb73f712e9260c7dfd
ndroidRuntime.cpp
be34f2f3b340196426bdf558b28951359a4d84fa 10-Mar-2014 John Reck <jreck@google.com> DisplayList lifecycle changes

Bug: 13360343
Change DisplayList to be more forgiving with weaker lifecycle
requirements. Is more self-managed with a strong reference
to the renderer it needs

Also fix naming mismatch

Change-Id: I5c89453a72a52954f6f959f0846199705dbb6476
ndroid_view_GLRenderer.cpp
ndroid_view_ThreadedRenderer.cpp
b5c4e7fd3866bbe30d7ea4d7bc463da5a70970e2 10-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 92860a74 to master

Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
8272c84cb531a4f148f0b0a31d8359d381137378 10-Mar-2014 Narayan Kamath <narayan@google.com> am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."

* commit 'bbf826659e8e5d0be683b2459207c495303d53b6':
LP64: Make 9 patches architecture agnostic.
6381dd4ff212a95be30d2b445d40ff419ab076b4 03-Mar-2014 Narayan Kamath <narayan@google.com> LP64: Make 9 patches architecture agnostic.

The Res_png_9patch struct had several pointer members
whose size differed between 32 and 64 bit platforms.

These members have been replaced by uint32_t offsets
to serialized data. The serialized form for 9patches
places a Res_png_9patch object at the beginning of
serialized data, followed by int32_t arrays of xDivs,
yDivs and colors.

Note that these offsets are not strictly required,
since they can be computed from the values of numXDivs,
numYDivs & numColors, however they are called in tight
loops so having them computed once is a beneficial.

This change also removed the unused patch_equals function
from aapt's Image.cpp.

Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/NinePatchPeeker.h
2d3ddc2ba9f86d795e437ea90dccb59cf1ebfd11 08-Mar-2014 Dave Allison <dallison@google.com> am 199670c4: am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."

* commit '199670c46a9950bd2e06af43ea082427b542060a':
ART profiler usage.
324aa693b82656809b97e307676adbbce37c3d95 08-Mar-2014 Dave Allison <dallison@google.com> am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."

* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
ART profiler usage.
6c18e8adf29f059c5b5d3c73c4aa24cce86251cf 08-Mar-2014 Narayan Kamath <narayan@google.com> am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"

* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
Remove unused JNITest class
0efbd9a463c848118c7685f4bfc8765a82caa761 30-Jan-2014 Dave Allison <dallison@google.com> ART profiler usage.

This is a change to add args to some of the profiler related
functions, including installd commands.

Also read properties and set command line options for the runtime
profiling parameters.

Changed calls to isDexOptNeeded() to isDexOptNeededInternal(). This
needs additional arguments passed for profiles.

Bug: 12877748
Change-Id: I1a426c9309d760bac0cf92daa298defee62287c1

Conflicts:
core/jni/AndroidRuntime.cpp
ndroidRuntime.cpp
b2235d5db74e26d6f3695eac672096d2cf430ade 07-Mar-2014 Narayan Kamath <narayan@google.com> am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."

* commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2':
Fix several bad function definitions.
cde786835676f14c4d24cc4769a2de7ead853c5c 07-Mar-2014 Narayan Kamath <narayan@google.com> am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"

* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
AArch64: Make AssetAtlasService 64-bit compatible
ae69111e23fc24491f112a74d2392b117b83e8df 07-Mar-2014 Narayan Kamath <narayan@google.com> am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."

* commit '96ddea413dcf266d996877d3fc2d81738c5316c8':
Remove java.io.tmpdir assignment in AndroidRuntime.
d556b429092b59b433bc14d42ecee97a2cd19922 07-Mar-2014 Narayan Kamath <narayan@google.com> am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"

* commit '3bec0fbb349a969934828ee726956877a3a21dee':
AArch64: Use long for pointers in SurfaceSession class
5eea60a0ef9dd6bea7a4554ac67b52d333e3ef46 07-Mar-2014 Leon Scroggins III <scroggo@google.com> am 74ca3fd3: am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev

* commit '74ca3fd34dac9674f61313594e2863ffecd79c7a':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
42ae4cf2ce5ba02c2211813452badc07eab33735 07-Mar-2014 Leon Scroggins III <scroggo@google.com> Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into klp-dev-plus-aosp
bc57651fb510d7b1a2811235f96e711b6be12a12 07-Mar-2014 Leon Scroggins III <scroggo@google.com> Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev
278250dafb5ebb0f9b66c46b32e7dd1251cdb6ff 14-Jan-2014 Leon Scroggins III <scroggo@google.com> DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

-------------------------------------------------------------------------

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
The old behavior would have continued to modify the
file descriptor's offset each time a new decode was
required. The copy ensures that the file descriptor
remains unchanged.
3. Buffer the file stream.
Prior to this change, if the image was not a PNG,
the stream would be rewound to the beginning of the
file, even if the file descriptor was passed in with
an offset. Thanks to the buffer, the stream is only
rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
ndroid/graphics/BitmapFactory.cpp
e648c19bf33ce78b3f67b7ffd95c92fd6996c418 07-Mar-2014 Leon Scroggins III <scroggo@google.com> resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp

Change-Id: If2855ff4f7a1e7645c69af378955868f44187376
092759f6b438dc599b71a5d0557718cf4f5a2427 11-Dec-2013 Takahiro Aizawa <takahiro.aizawa@sonymobile.com> EGL14.eglCreateWindowSurface should set producerControlledByApp

Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

Bug 13226025
(cherry-pick from AOSP Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0)

Change-Id: I853484c38f065d71b365bb48b2a794ca4787e70a
ndroid_opengl_EGL14.cpp
b7d0cfa0d8d10ec613bcd6f5072729571d3a9588 06-Mar-2014 Chris Craik <ccraik@google.com> Merge "Add Path.isConvex, and force View outlines to be convex"
5e49b497ae2019586937aae0e8159292363728b5 03-Dec-2013 Leon Scroggins III <scroggo@google.com> Update framework to use M33 Skia. DO NOT MERGE

(These CLs are already in master.)

Bug: 13246311

This cherry-picks 7 CLs:

-----------------------------------------------------------------------

Remove calls to deprecated SkBitmap::setIsOpaque()

setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a

-----------------------------------------------------------------------

Merge AssetStream with AssetStreamAdaptor.

Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.

The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
the length (read(NULL, 0)) is no longer implemented, since it is
no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
so some implementation is necessary.

cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56

-----------------------------------------------------------------------

Deprecate Android-specific SkPaint functions.

The following functions were problematic:
const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
const void* findImage(const SkGlyph&, const SkMatrix*);

Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.

Bug: 11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08

-----------------------------------------------------------------------

pass SkGlyphCache into updateGlyphCache()

Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.

Bug: 11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89

-----------------------------------------------------------------------

Updates to the Skia API needed to merge the WebView m33 version of Skia.

cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3

Bugfix for screenshots (recent apps) due to incorrect rowBytes computation

bug: 12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714

-----------------------------------------------------------------------

Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.

cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5

-----------------------------------------------------------------------

Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
ndroid/opengl/util.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
aa1d023bb9a9be36106423b567291b3f2174860f 05-Mar-2014 Brian Carlstrom <bdc@google.com> am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"

* commit '674fd6c442cd3886b3ab12be1d36c5d05ef48cdb':
Add dex2oat-flags plumbing to AndroidRuntime
a258b4a9e8a519c3b181848c9b8fb2f0e2142d8f 05-Mar-2014 Brian Carlstrom <bdc@google.com> am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"

* commit '485e3b459491267ae1390e1df5ff8f7d4695f819':
Add dex2oat-flags plumbing to AndroidRuntime
24ba99c235c328824ec8bcc1bf0382972f5b1616 05-Mar-2014 John Reck <jreck@google.com> Merge "DisplayList overhaul"
44fd8d24f761f82d21e9b00932648a1b6bf91449 26-Feb-2014 John Reck <jreck@google.com> DisplayList overhaul

Change-Id: I53418d580c98f706e971545cff81b9921c12cc5f
ndroid_view_DisplayList.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GLRenderer.cpp
ndroid_view_ThreadedRenderer.cpp
3beff1e023193b485c67a3003a7f363f105d96d4 01-Mar-2014 Brian Carlstrom <bdc@google.com> Add dex2oat-flags plumbing to AndroidRuntime

Change-Id: Idaa7e5351e146d76e1972cbe4d93af69f0b999a6
ndroidRuntime.cpp
b5066245365e932775ca6087cd74e53efa364642 07-Aug-2013 Michael Chock <mchock@nvidia.com> Avoid restrictive locking around EGL calls

Do not use critical section variants of JNI array mapping operations
when making EGL calls. They impose unnecessary restrictions on the
EGL implementation that can lead to intermittent crashes. Using the
non-critical variants makes no detectable performance difference.

Change-Id: I4ef643f1a7fcdc5995538ff9d543f43f33c8e412
om_google_android_gles_jni_EGLImpl.cpp
5be83edd15e11420287cc0af93a95d5a6dfae68f 04-Mar-2014 Chris Craik <ccraik@google.com> Add Path.isConvex, and force View outlines to be convex

Change-Id: Idf3f1ee44240d77f7a7ddd0da898da8aa5d41864
ndroid/graphics/Path.cpp
adbd2ba1bcc222ce47e24d0db180bb85eefae371 28-Feb-2014 Chris Craik <ccraik@google.com> Call correct MaskFilter factory method

Change-Id: Ibc30361427cc484443579930f729145ef19c6916
ndroid/graphics/MaskFilter.cpp
67862524056ee2e73a94395139bb8bd0ec1ef38a 28-Feb-2014 Chris Craik <ccraik@google.com> Fix use of Skia deprecated methods

Change-Id: Ib89c20fc94bcce29b7490d6f55c73492735befda
ndroid.mk
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Shader.cpp
1489b09b643902e30364a435f27c8a56cb4eda58 28-Feb-2014 Glenn Kasten <gkasten@google.com> Merge "AudioTrack constructor/set parameter frameCount is size_t"
e0d10cd92369d56e593e8592084024d1cd1655db 28-Feb-2014 Narayan Kamath <narayan@google.com> am d8ccf8b7: am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"

* commit 'd8ccf8b789461e1706d10df44d109849fa974fc5':
Various format string fixes for 64bit
be094d89db01387f773786435e110bbe166f3c65 28-Feb-2014 Narayan Kamath <narayan@google.com> am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"

* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
Various format string fixes for 64bit
eee2c72f96cd4e6228c50c8b461b4dd84a9f4538 28-Feb-2014 Narayan Kamath <narayan@google.com> Merge "Various format string fixes for 64bit"
fc9276340897289b8f848fc722152d6fc0f891ed 28-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge "Fix includes so that they no longer rely on the global Skia includes directories."
3118ca9b098259a9bb3b42571152dbd87a34fd70 28-Feb-2014 Glenn Kasten <gkasten@google.com> AudioTrack constructor/set parameter frameCount is size_t

Change-Id: Ie92ab0433531b3852747a81d2bfce9625644a2ae
ndroid_media_AudioTrack.cpp
eece0dda56ae29fff6e9003df97594f6ac50b6e2 27-Feb-2014 Derek Sollenberger <djsollen@google.com> Fix includes so that they no longer rely on the global Skia includes directories.

bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
ndroid/graphics/Path.cpp
ndroid/opengl/util.cpp
4915fb22c71a56a629116751b2d7783a9c6fde4c 27-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge "Cleanup unnecessary includes for libskia."
7531aa22355cf03f51def61ba67f1636bf85f408 13-Jan-2014 Mike Lockwood <lockwood@google.com> Add support for USB devices with multiple configurations and alternate interfaces

Added UsbConfiguration class, as well as accessors to UsbDevice to get configuration list
Added methods to UsbDeviceConnection to select configurations and alternate interfaces.

Also added accessors for USB descriptor name strings and fixed some memory leaks in the JNI code.

Bug: 12425052
Change-Id: Idb990f4d5c054a8cb997eb3f440f6da9f83bce05
ndroid_hardware_UsbDeviceConnection.cpp
950fe8f8d4d654e645fa7205ca275b5a03feb214 27-Feb-2014 Derek Sollenberger <djsollen@google.com> Cleanup unnecessary includes for libskia.

The libskia target exports all of its public includes directories so
redefining them here is redundant. Also this cleans up and makes it
obvious where the framework is making using of private Skia headers.

Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
ndroid.mk
e5f98941bad09f797329aeec090177e1da17220e 27-Feb-2014 Narayan Kamath <narayan@google.com> am 7aec4109: am 7aeb4307: am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"

* commit '7aec4109c53371e69bec111c69767810f45c301c':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
7aeb43072a9fb9b0a7078a390cb4a729321bf117 27-Feb-2014 Narayan Kamath <narayan@google.com> am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"

* commit '2525acf5a9855d748c008268bb26d6f6d5045d84':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
64d38d9f4863f6e9434e6820b924eb958e8a2230 26-Feb-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY

Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen
script

This will allow eglGetDisplay(int) to work on both 32-bit and
64-bit systems when EGL_DEFAULT_DISPLAY is passed as a parameter.

Change-Id: Idf27d6e00d623d331bb2d4d7f85fa450e0db26c9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_opengl_EGL14.cpp
deaa6cc34d032fc46361d0b2f520d90279fcddd2 25-Feb-2014 Narayan Kamath <narayan@google.com> am cc99b18c: am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"

* commit 'cc99b18ce30e6847bd9b29129755f63efd4f06fe':
Use reinterpret_cast when an integer is cast to a pointer
58908b02f38b7bcf713664c76c6eaa732d1e8467 25-Feb-2014 Narayan Kamath <narayan@google.com> am d8410d38: am 614b00de: am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"

* commit 'd8410d38cf2eb133dab29aec722dce862584d115':
Use long for pointers in opengl/EGL classes
a6f70d8b2dc2a2d900dfaa4b3fcd0fbdffdcfb9e 25-Feb-2014 Narayan Kamath <narayan@google.com> am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"

* commit '7fe5978bf7c4b473d8f6db5a12cfdcd110511331':
Use reinterpret_cast when an integer is cast to a pointer
614b00de9cdd354a289d98173ba656e5260288e7 25-Feb-2014 Narayan Kamath <narayan@google.com> am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes"

* commit 'a88abfb3a5dccdad6210b294843fa2e21a27d378':
Use long for pointers in opengl/EGL classes
2ba70fd49bfcbb516e75c198c106764609335feb 25-Feb-2014 Narayan Kamath <narayan@google.com> Merge "Use reinterpret_cast when an integer is cast to a pointer"
f5a9ad1cd046439d8fe0eba883c35717a052943e 25-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge "Updates to the Skia API needed to merge the WebView m33 version of Skia."
5b4a857603a8999bcb2434f9a61dc24d4488862b 11-Dec-2013 Takahiro Aizawa <takahiro.aizawa@sonymobile.com> DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp

Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

This is a cherry-pick of https://android-review.googlesource.com/#/c/72973/ which is already in master, so do not merge.

Change-Id: Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0
ndroid_opengl_EGL14.cpp
b644a3b84521e2155a5af985a4d4ed305474e567 17-Jan-2014 Derek Sollenberger <djsollen@google.com> Updates to the Skia API needed to merge the WebView m33 version of Skia.

This is a cherry-pick of 2 CLs:

21969a2b26945da3fd86aef7c93479e4fb359a65
c7a581cf7691db5c61e6694aa51daaa994004bd9

Change-Id: I6fd9366fbba0a336de1df794be9497983bfd13ae
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Paint.cpp
ndroid/graphics/Region.cpp
ndroid_view_SurfaceControl.cpp
d0c5b9abed60b7bc056d026bf0f2b2235410fb70 22-Feb-2014 Dianne Hackborn <hackbod@google.com> Improve how battery stats collects network stats.

This optimizes the path for battery stats to collect
per-uid network usage. It now collects wifi and mobile
usage separately, with a path that allows it to recycle
all data structures and filter out stats it isn't
interested in before they come back to java.

This is setting us up for the actual goal, to collect
mobile stats independently each time the mobile radio
goes down, allowing us to distribute mobile radio usage
across uids based on the number of packets they transferred
during a session.

Change-Id: I21a0f517cf087ea5aa8b8dd535e20b46e361a52b
om_android_internal_net_NetworkStatsFactory.cpp
95ece35c2f8b86203e88b49d67cef8e80e107a2b 13-Feb-2014 Kévin PETIT <kevin.petit@arm.com> Various format string fixes for 64bit

Change-Id: I74532a4e0400033f5ee3e3f6827ac42f77d16f53
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_media_AudioRecord.cpp
84bbeb9e0c9c185a22d4882b79e0bc8a598642ab 24-Feb-2014 Ashok Bhat <ashok.bhat@arm.com> Use long for pointers in opengl/EGL classes

Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen script

This patch updates EGL classes in frameworks/base to support
64-bit platforms. Key changes in the EGL classes include

[x] EGLObjectHandle class - EGLObjectHandle class has two public
methods (constructor and getHandle) that assume handles are
32-bit. They have not been changed. Instead, two new hidden
methods (EGLObjectHandle(long) and getNativeHandle) have been
added.

[x] EG14 class - Two public methods eglGetDisplay and
eglCreatePbufferFromClientBuffer assume that handles are 32-bit.
They have been changed to throw unsupported operation exception
on non 32-bit machines. Two new methods eglGetDisplay(long)
and eglCreatePbufferFromClientBuffer(...long buffer..) have
been added to support 64-bit handles.

Change-Id: I9e0f064e5b33700eb0baa2e1841a21f931f7a765
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_opengl_EGL14.cpp
ndroid_opengl_EGLExt.cpp
01c26ea89d4bbea3cf550e9328742302dd9a2b25 24-Feb-2014 Ashok Bhat <ashok.bhat@arm.com> Use reinterpret_cast when an integer is cast to a pointer

Note that files changed in this patch have been generated
by running frameworks/native/opengl/tools/glgen/gen script.

Change-Id: Iff3ac2e804af41b9a6ec073fd65019c6806fe821
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
ndroid_opengl_GLES30.cpp
om_google_android_gles_jni_GLImpl.cpp
4418372b21e91f6d4b9e11931dd87a90a023d79e 22-Feb-2014 Greg Hackmann <ghackmann@google.com> am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp

* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
0cab896a987f6687affd5c50c3bdbe10745c8dff 22-Feb-2014 Greg Hackmann <ghackmann@google.com> resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp

Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
bbfc08b3abc0934f67659f3238eb79dcac838c17 21-Feb-2014 Greg Hackmann <ghackmann@google.com> Merge changes I6d4fdada,Ia34899a4

* changes:
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
38bf51466881b726f42832743d8cca6ee67bb148 20-Feb-2014 Greg Hackmann <ghackmann@google.com> Move time setting code from SystemClock to AlarmManagerService

On devices using /dev/rtc instead of /dev/alarm, updating the
time-of-day clock and RTC are separate syscalls. Hence the clock and
RTC could be left in inconsistent states if two threads called
SystemClock.setCurrentTimeMillis() simultaneously.

By moving this code into AlarmManagerService, we can put a global lock
around AlarmManagerService.setTime() and prevent the race condition.

Note that access to SystemClock.setCurrentTimeMillis() is now gated by
android.permission.SET_TIME, where before it was gated by filesystem
permissions (i.e., could the process write to /dev/alarm or /dev/rtc).

Change-Id: Ia34899a4cde983656305fd2ef466dfe908ed23c8
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ndroid_os_SystemClock.cpp
2b20f6db9c152b6ac89b0999a73894b3db047aa5 21-Feb-2014 Narayan Kamath <narayan@google.com> am a1aeac80: am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"

* commit 'a1aeac80df09cf8d481474264b1ce78ed64e7464':
Remove unused JNITest class
25c55ca902f570d3a89753c6eb9492c20dd734ba 21-Feb-2014 Narayan Kamath <narayan@google.com> am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"

* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
Remove unused JNITest class
42f06b0e22971dd2a2049012751c7cd1965a706b 15-Feb-2014 Ashok Bhat <ashok.bhat@arm.com> Remove unused JNITest class

JNITest class is no longer actively used. This patch
removes the class (java and jni) files.

JNI interfaces and calls are extensively tested in
the art unit tests (art/tests) and in cts (see
CtsJniTestCases).

Change-Id: I62f7c72deb5d206fa3f545ae39a9cb9011110d0a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_debug_JNITest.cpp
2fb1fa6c88901fd16f1756a744a5f066f95c9253 21-Feb-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Make AssetAtlasService 64-bit compatible"
17ab38f8a87bc90eab11373f878f220ce3031de6 27-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make AssetAtlasService 64-bit compatible

Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

(cherry-picked from 4de3f481bc59ab4b766dc027e41aff7cda9d62f7)

Change-Id: If22daf40eef46f8df9f94d65ddcc52c45b3acf2a
ndroid_view_GLES20Canvas.cpp
674554fc36932ca50b15bba41ac6f650254d4e72 19-Feb-2014 Derek Sollenberger <djsollen@google.com> Reapply "Refactor setting an SkPaint onto a hwui Layer."

This reverts commit 90d0c75e94a32fb7d993fae69762820aabc2fcbb.

Change-Id: Ie807761231edf7c848b019931dccbf466208c0be
ndroid_view_HardwareLayer.cpp
2d5cf4f6db75d00285306b2d53bc6c0c6532d86e 20-Feb-2014 Derek Sollenberger <djsollen@google.com> Update framework to enable Skia to run in debug mode.

Change-Id: I8ba605cfae61b584dad27e3245c4482c8dfdff2e
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Utils.cpp
c95ed62111e0b8aceda4322011ad019c28987cbc 20-Feb-2014 Narayan Kamath <narayan@google.com> am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."

* commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2':
Fix several bad function definitions.
520a5673fbe8bff90954045b24a361982861ef8d 20-Feb-2014 Narayan Kamath <narayan@google.com> am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"

* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
AArch64: Make AssetAtlasService 64-bit compatible
05cebdc2abd05b0dca351306cb039245d50c67ae 20-Feb-2014 Narayan Kamath <narayan@google.com> Merge "Fix several bad function definitions."
047b938f7188c21c07669108c5c68b2358f6b158 06-Feb-2014 Narayan Kamath <narayan@google.com> Fix several bad function definitions.

We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271

(cherry picked from 017546e65280a3389b6167f5fc3b5d1c3001154a)

Change-Id: Iede02be90e6a3c9a2db1fe04dcd0db99abe37097
ndroid/graphics/Canvas.cpp
ndroid_view_GLES20Canvas.cpp
4de3f481bc59ab4b766dc027e41aff7cda9d62f7 27-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make AssetAtlasService 64-bit compatible

Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

Change-Id: Ib4c77c134e3ad5b21732e20cde9a54a0b16bdab1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_view_GLES20Canvas.cpp
a13a69f0e56a4e9998ec4faa78e24c7431b68e72 20-Feb-2014 John Reck <jreck@google.com> Merge "Fix layer recycling for GLRenderer"
0b2c8df7a6883a6af84c52efbd93619cc63cde53 20-Feb-2014 John Reck <jreck@google.com> Fix layer recycling for GLRenderer

Bug: 13007905

Change-Id: I1589f2bb14429099e391c03d7dfb1650da145f28
ndroid_view_GLRenderer.cpp
b88a904dfe719a8cbb0b9d73cb4637c22a1deed4 20-Feb-2014 Dan Stoza <stoza@google.com> Merge "Allow disabling layer rotation during screenshots"
5efe5a2d35604595913c9e372c904b85c32e71c8 19-Feb-2014 John Reck <jreck@google.com> Merge "Support HardwareLayers in RenderThread"
19b6bcfd83eb7fb92ebd06d2fec89e308311f1d0 15-Feb-2014 John Reck <jreck@google.com> Support HardwareLayers in RenderThread

Also has a few HardwareLayer lifecycle fixes

Change-Id: I6308cb05f8f199eed72189ace768013a46815941
ndroid_view_ThreadedRenderer.cpp
66d792b6631a8dfd0dd0b7abc75077760fa083cc 19-Feb-2014 Chris Craik <ccraik@google.com> Merge "Make outline and shadow APIs public"
dfc1ef92557be5565469a2fc8b075f46dc3b4948 19-Feb-2014 Narayan Kamath <narayan@google.com> am 29596ac2: am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."

* commit '29596ac2baef37de4cfed494cd740de8d1090899':
Remove java.io.tmpdir assignment in AndroidRuntime.
41dd75f8135cd50ba2d38690ce8b05f30964f6e7 19-Feb-2014 Narayan Kamath <narayan@google.com> am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."

* commit '96ddea413dcf266d996877d3fc2d81738c5316c8':
Remove java.io.tmpdir assignment in AndroidRuntime.
7c710936c5129664f8b23bf4592c12eca975d229 19-Feb-2014 Narayan Kamath <narayan@google.com> Merge "Remove java.io.tmpdir assignment in AndroidRuntime."
e9b8817bd720cd2a294126074eb533f943a9348f 11-Feb-2014 Chris Craik <ccraik@google.com> Make outline and shadow APIs public

Change-Id: If40dc27b2fdc41c3ed355bc9029474b1344c1a03
ndroid_view_DisplayList.cpp
73c04711ca13c99f29a84de8cfc6c780811a8f63 13-Feb-2014 Leon Scroggins <scroggo@google.com> Remove call to setIsOpaque (again).

The call was removed in I1b36b0b0ce7126031eb7b769b563c17dcd4b306a,
since setIsOpaque was deprecated in Skia.

It was accidentally reintroduced in
Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71. This line is redundant
with the lines above it (which call the replacement for setIsOpaque,
setAlphaType).

Change-Id: I6520f796d639721987418ec0ecae82b3674dcbfd
ndroid/graphics/Bitmap.cpp
16ec12ae77fdd2b09ea0ea0885ac52f11bd32c59 15-Feb-2014 Dan Stoza <stoza@google.com> Allow disabling layer rotation during screenshots

Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.

Bug: 11805195
Change-Id: I96e65506b198d34724eb3aa84815aae6f6de4935
ndroid_view_SurfaceControl.cpp
3d03e5b90d1ed0de9790ca814d55b454d37f6571 14-Feb-2014 Narayan Kamath <narayan@google.com> Remove java.io.tmpdir assignment in AndroidRuntime.

This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.

Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
ndroidRuntime.cpp
ee904d4d3ee710f292b607224a6017e843827360 14-Feb-2014 Narayan Kamath <narayan@google.com> am 6795e9c7: am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"

* commit '6795e9c783242b31188d76c5186dfe0751f1731a':
AArch64: Use long for pointers in SurfaceSession class
7a66d8ea7caba75b03e5a75d234a8598e2d887c6 14-Feb-2014 Narayan Kamath <narayan@google.com> am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"

* commit '3bec0fbb349a969934828ee726956877a3a21dee':
AArch64: Use long for pointers in SurfaceSession class
fa8f95e9b96e3a12e98269c8a31ed34df6a323ca 14-Feb-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in SurfaceSession class"
d430354c6b6b3b39c35e8af90007414c325ccb2d 13-Feb-2014 Andreas Huber <andih@google.com> Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.""
9ae000ca8c05ad6f700ad7bf119bbc92fb964b57 13-Feb-2014 Andreas Huber <andih@google.com> Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."

This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
ndroid.mk
ndroidRuntime.cpp
ndroidRuntimeBase.cpp
04f0cab79d1499a5fe27330bb30dd94151b82880 13-Feb-2014 Andreas Huber <andih@google.com> Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
edb03c7d6dff4150a93ac37f5ec28bf9a1387d61 13-Feb-2014 Nick Kralevich <nnk@google.com> am 4f2d02fb: am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '4f2d02fb0073c4129957c0d2ac6e0c0055f4dad8':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
20b5fd98fb9c80ed29d57d67eb706a36b02708da 13-Feb-2014 Nick Kralevich <nnk@google.com> am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '93994e9db44a30402bd596764163d81ee1b1fd30':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
a9bb594da6aff97ba927ba67a34486d0b9c1b4a0 13-Feb-2014 Nick Kralevich <nnk@google.com> Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
7825334929b098b36e1144872200e75ba6d24b13 07-Feb-2014 Andreas Huber <andih@google.com> Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.

AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.

Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
ndroid.mk
ndroidRuntime.cpp
ndroidRuntimeBase.cpp
d5c8044e7e1f1402fdd4a035690329294ab07b33 12-Feb-2014 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 1cbea39f to master

Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
dd3d95f182a634acdcc1b1e8e4954234d048eb54 12-Feb-2014 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp

Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
ebcf70b128f209ed74f781f82fe3fa11c017246f 12-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge "Revert "Refactor setting an SkPaint onto a hwui Layer.""
90d0c75e94a32fb7d993fae69762820aabc2fcbb 12-Feb-2014 Derek Sollenberger <djsollen@google.com> Revert "Refactor setting an SkPaint onto a hwui Layer."

This reverts commit e889298cd6ae1fc0d76bc00d7d12586db03eb261.

Change-Id: I4b1d609b2d4280595d40cb10d6c18875c22999f8
ndroid_view_HardwareLayer.cpp
5f97e9e9ed2a6da22a6ed90b8db11052dd6a8cd7 12-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge "Refactor setting an SkPaint onto a hwui Layer."
e889298cd6ae1fc0d76bc00d7d12586db03eb261 11-Feb-2014 Derek Sollenberger <djsollen@google.com> Refactor setting an SkPaint onto a hwui Layer.

This CL removes the unecessary JNI call to set the colorFilter on
a layer.

Change-Id: I9e088f888938d4315745aa618334bfdb9e61343a
ndroid_view_HardwareLayer.cpp
ed8bb0159c03be9eb68af4dc22b7e100ab2ac52b 11-Feb-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioTrack JNI function rename"
67754d93c4bfb2da1831b1dd2b40c12a838b1028 11-Feb-2014 Dianne Hackborn <hackbod@android.com> Merge "Runtime resource overlay, iteration 2"
0d148c8b4ed94891d00acf20aa724493629970e9 11-Feb-2014 Michael Wright <michaelwr@google.com> Merge "Move inputservice over to frameworks/native"
d6b473713f43dec0828971854fe1018642cfaf27 11-Feb-2014 Michael Wright <michaelwr@google.com> Move inputservice over to frameworks/native

Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Try 2.

Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
ndroid.mk
fc53ef27793a39e9effd829e9cae02a9ca14147e 11-Feb-2014 John Reck <jreck@google.com> Implement missing safelyRun() on ThreadedRenderer

Change-Id: I14b75f37a13fabaa759a51369190dbdc84087c4b
ndroid_view_ThreadedRenderer.cpp
f6eebb21d5c58345eca8be25676e34346f5809b2 11-Feb-2014 John Reck <jreck@google.com> Merge "Refactor HardwareLayer"
faa91f852e9526b2f112122da9ae0956526cf662 11-Feb-2014 Narayan Kamath <narayan@google.com> am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"

* commit '86fb9904ad5760cb957782b45e96054c01fe4200':
Use long to store pointers in GLES_JNI/EGL classes
a1cffb429c57eb961282160ae4631d70bfa55204 11-Feb-2014 Narayan Kamath <narayan@google.com> am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"

* commit 'd350af9695018e81f85600fb7dd906003cbaf62e':
Use long for pointers in EmojiFactory and PdfDocument
86fb9904ad5760cb957782b45e96054c01fe4200 11-Feb-2014 Narayan Kamath <narayan@google.com> am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"

* commit '8a63c34bb0f0cf25051c6eeb49c21476258fadfb':
Use long to store pointers in GLES_JNI/EGL classes
d350af9695018e81f85600fb7dd906003cbaf62e 11-Feb-2014 Narayan Kamath <narayan@google.com> am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"

* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
Use long for pointers in EmojiFactory and PdfDocument
3aeb629d8251699237e3d067be4fb44ba206626c 11-Feb-2014 Narayan Kamath <narayan@google.com> Merge "Use long to store pointers in GLES_JNI/EGL classes"
f44a3f1e00e38b09f70efed3eaf771871435e478 11-Feb-2014 Narayan Kamath <narayan@google.com> Merge "Use long for pointers in EmojiFactory and PdfDocument"
04fc583c3dd3144bc6b718fcac4b3e1afdfdb067 06-Feb-2014 John Reck <jreck@google.com> Refactor HardwareLayer

Defer all the things!
Groundwork to allow hardware layers to work in a renderthread world

Change-Id: Ib3aa47525f393083621254a743dbaa6352f933bd
ndroid.mk
ndroidRuntime.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_HardwareLayer.cpp
f52fd37826e759930329fed7bf8a20494edcaff2 11-Feb-2014 Michael Wright <michaelwr@google.com> Merge "Revert "Move inputservice over to frameworks/native""
453fa30ab2dbff5934e551323763200fac96d723 11-Feb-2014 Michael Wright <michaelwr@google.com> Revert "Move inputservice over to frameworks/native"

This reverts commit 89e5c7ebb37fabc4368e87e17a502db62598bd61.
ndroid.mk
740dfefcfcba7a254e65bda3ac0d965ca161458b 10-Feb-2014 Michael Wright <michaelwr@google.com> Merge "Move inputservice over to frameworks/native"
e7755a0d2586b90a75f8358053e5d04952d1f702 10-Feb-2014 Colin Cross <ccross@android.com> am 675d44ad: am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"

* commit '675d44ad2355eb4404e286f2c337196297d1e26f':
frameworks/base: fix errors inside ALOGV
89e5c7ebb37fabc4368e87e17a502db62598bd61 10-Feb-2014 Michael Wright <michaelwr@google.com> Move inputservice over to frameworks/native

Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Change-Id: Iebef71f3030fb3d26a5f338eb66d75bb37c17734
ndroid.mk
675d44ad2355eb4404e286f2c337196297d1e26f 10-Feb-2014 Colin Cross <ccross@android.com> am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"

* commit '12f1f5b87326a31f4c69e949a1e645e82c9152d4':
frameworks/base: fix errors inside ALOGV
3393f390a5145056f9d67a2357125bd995fceac7 10-Feb-2014 Leon Scroggins III <scroggo@google.com> Merge "Decode file descriptor from the correct offset."
eef1be1d83eeb35377cfeb8a4932e317a3a975a7 10-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge "Removing SkiaColorFilter and inspecting the native object directly."
d06969518b12afb27a487ae66f8d73a4d3116587 07-Feb-2014 Colin Cross <ccross@android.com> frameworks/base: fix errors inside ALOGV

Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc
ndroid_database_SQLiteGlobal.cpp
ndroid_os_SELinux.cpp
b67a7bf27ba2ecdb55be2117717b6818053f47fc 08-Feb-2014 Chris Craik <ccraik@google.com> Add shadow casting / global perspective APIs, hidden for now.

Global perspective isn't yet hooked up in rendering.

Change-Id: I64ad272ea5dc523505260ce114f0a6bebdcfe9dc
ndroid_view_DisplayList.cpp
76d3a1b8d035d27bc80b0f2fc480a903bd001514 10-Dec-2013 Derek Sollenberger <djsollen@google.com> Removing SkiaColorFilter and inspecting the native object directly.

bug: 10650594
Change-Id: I4fcf66d008765afa0e35d011f58bc792183cb74f
ndroid/graphics/ColorFilter.cpp
ndroid_view_GLES20Canvas.cpp
fad4593a3c9db193a4308c34168cc91c28218e2b 06-Feb-2014 ztenghui <ztenghui@google.com> Add the clipToOutline by just using the clipPathOp

Change-Id: I6ba23b589e579599d018600d0744be0efe2028c1
ndroid_view_DisplayList.cpp
27bfb24518934f0344c79a1d655ea8d1208d2446 07-Feb-2014 Chris Craik <ccraik@google.com> Merge "Rework and clean up DisplayList projection"
d8fa586099b73cc8b49e51c675cc8807ef65a4a2 07-Feb-2014 Stephen Smalley <sds@tycho.nsa.gov> Convert all selinux_android_restorecon and _setfilecon calls to new API.

libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ndroid_os_SELinux.cpp
8f52fee0609a4f273f87f4178865b0713c8114aa 07-Feb-2014 Narayan Kamath <narayan@google.com> Merge "Fix several bad function definitions."
1df26446b7eac7050767c38ca977fde03a41a033 06-Feb-2014 Chris Craik <ccraik@google.com> Rework and clean up DisplayList projection

Move the projection surface to be a property of a DisplayList,
set to true for every background drawable.

Additionally, handle a projecting view background such that it doesn't
try to project onto itself (which is undesirable).

Change-Id: Ic70b17474bd87340e80767f8518f73b233419c7a
ndroid_view_DisplayList.cpp
2826e5f20295a1adb3b341c8b32f27d748e2ee19 06-Feb-2014 Leon Scroggins III <scroggo@google.com> Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
The old behavior would have continued to modify the
file descriptor's offset each time a new decode was
required. The copy ensures that the file descriptor
remains unchanged.
3. Buffer the file stream.
Prior to this change, if the image was not a PNG,
the stream would be rewound to the beginning of the
file, even if the file descriptor was passed in with
an offset. Thanks to the buffer, the stream is only
rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Change-Id: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
ndroid/graphics/BitmapFactory.cpp
593b19a49e899a1668755b5040162f2b31f95877 06-Feb-2014 John Reck <jreck@google.com> Remove overdraw counter

Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd
ndroid_view_GLES20Canvas.cpp
a3850d8f8fc096a7195d34f05f45a4e29926e36c 08-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in SurfaceSession class

For storing pointers, long is used in SurfaceSession class,
as native pointers can be 64-bit.

Change-Id: I1535a488dfffaddd20e3beac57e558035d715cbf
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_view_SurfaceSession.cpp
017546e65280a3389b6167f5fc3b5d1c3001154a 06-Feb-2014 Narayan Kamath <narayan@google.com> Fix several bad function definitions.

We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271
Change-Id: I6a167a4f3aac1e22ddea33d067caaef6a11b418c
ndroid/graphics/Canvas.cpp
ndroid_view_GLES20Canvas.cpp
9b311c900dcc3666febf52c1bed8eae7ce1f2815 05-Feb-2014 Andy McFadden <fadden@android.com> Pass a thread name to AttachCurrentThread

Reduces logspam from ART.

Bug 12896873

Change-Id: I82ae8e2dbba3918071d9c28f5ae5c882f8dcab3a
ndroid/graphics/SurfaceTexture.cpp
eac8438a7dbe42e81f5273e0847a3f5e4247aa5b 04-Feb-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioTrack JNI function rename

The "native" prefix is used to identify methods with a native
implementation on the Java side, and shouldn't therefore be used
on some of the functions (and not others) here.

Change-Id: I9e88a1159c8f06260af6667e239dcdd39479b11f
ndroid_media_AudioTrack.cpp
7c68a4076e1ef141db5ac338d675646a278f0eb8 16-Jul-2012 Pawel Augustyn <pawel.augustyn@sonymobile.com> Fix for native leaks in YuvToJpegEncoder.cpp

Objects allocated by Get<object>ArrayElements function,
should be released. Add a fix to release this objects
in error cases.

Change-Id: Idf834523d93bb2dfd6b872e3b2179b7f1bba38f3
ndroid/graphics/YuvToJpegEncoder.cpp
48d22323ce39f9aab003dce74456889b6414af55 31-Jan-2014 Mårten Kongstad <marten.kongstad@sonymobile.com> Runtime resource overlay, iteration 2

Support any number of overlay packages. Support any target package.

UPDATED PACKAGE MATCHING
------------------------
In Runtime resource overlay, iteration 1, only a single overlay package
was considered. Package matching was based on file paths:
/vendor/overlay/system/framework-res.apk corresponded to
/system/framework-res.apk. Introduce a more flexible matching scheme
where any package is an overlay package if its manifest includes

<overlay targetPackage="com.target.package"/>

For security reasons, an overlay package must fulfill certain criteria
to take effect: see below.

THE IDMAP TOOL AND IDMAP FILES
------------------------------
Idmap files are created by the 'idmap' binary; idmap files must be
present when loading packages. For the Android system, Zygote calls
'idmap' as part of the resource pre-loading. For application packages,
'idmap' is invoked via 'installd' during package installation (similar
to 'dexopt').

UPDATED FLOW
------------
The following is an outline of the start-up sequences for the Android
system and Android apps. Steps marked with '+' are introduced by this
commit.

Zygote initialization
Initial AssetManager object created
+ idmap --scan creates idmaps for overlays targeting 'android', \
stores list of overlays in /data/resource-cache/overlays.list
AssetManager caches framework-res.apk
+ AssetManager caches overlay packages listed in overlays.list

Android boot
New AssetManager's ResTable acquired
AssetManager re-uses cached framework-res.apk
+ AssetManager re-uses cached 'android' overlays (if any)

App boot
ActivityThread prepares AssetManager to load app.apk
+ ActivityThread prepares AssetManager to load app overlays (if any)
New AssetManager's ResTable acquired as per Android boot

SECURITY
--------
Overlay packages are required to be pre-loaded (in /vendor/overlay).
These packages are trusted by definition. A future iteration of runtime
resource overlay may add support for downloaded overlays, which would
likely require target and overlay signatures match for the overlay to
be trusted.

LOOKUP PRIORITY
---------------
During resource lookup, packages are sequentially queried to provide a
best match, given the constraints of the current configuration. If any
package provide a better match than what has been found so far, it
replaces the previous match. The target package is always queried last.

When loading a package with more than one overlay, the order in which
the overlays are added become significant if several packages overlay
the same resource.

Had downloaded overlays been supported, the install time could have been
used to determine the load order. Regardless, for pre-installed
overlays, the install time is randomly determined by the order in which
the Package Manager locates the packages during initial boot. To support
a well-defined order, pre-installed overlay packages are expected to
define an additional 'priority' attribute in their <overlay> tags:

<overlay targetPackage="com.target.package" priority="1234"/>

Pre-installed overlays are loaded in order of their priority attributes,
sorted in ascending order.

Assigning the same priority to several overlays targeting the same base
package leads to undefined behaviour. It is the responsibility of the
vendor to avoid this.

The following example shows the ResTable and PackageGroups after loading
an application and two overlays. The resource lookup framework will
query the packages in the order C, B, A.

+------+------+- -+------+------+
| 0x01 | | ... | | 0x7f |
+------+------+- -+------+------+
| |
"android" Target package A
|
Pre-installed overlay B (priority 1)
|
Pre-installed overlay C (priority 2)

Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
ndroid_util_AssetManager.cpp
1d89563ff8f5afd77457ef58489a234f490b480c 31-Jan-2014 Chris Craik <ccraik@google.com> Merge "Add initial hidden outline APIs"
90b8eaa68bda6beaf2ff886c3ed642e7050e3ff6 31-Jan-2014 Narayan Kamath <narayan@google.com> am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"

* commit '797b5adcb4ead3c687db3d9fd831dff93760dd4a':
AArch64: Make AssetManager and related classes 64-bit compatible
5ec133b9a0949cda92c5c287169aba86ad615065 31-Jan-2014 Igor Murashkin <iam@google.com> am ed5d7a6f: am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"

* commit 'ed5d7a6f147c75c8af73328bdf816707b58afd90':
EGL14.eglCreateWindowSurface should set producerControlledByApp
797b5adcb4ead3c687db3d9fd831dff93760dd4a 31-Jan-2014 Narayan Kamath <narayan@google.com> am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"

* commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
AArch64: Make AssetManager and related classes 64-bit compatible
ed5d7a6f147c75c8af73328bdf816707b58afd90 31-Jan-2014 Igor Murashkin <iam@google.com> am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"

* commit '4463a4ef26b2eb62fae74568193fd07e97dedd4d':
EGL14.eglCreateWindowSurface should set producerControlledByApp
863f98bbb3e234e18c62ce2678ae970b75995f69 27-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> Use long to store pointers in GLES_JNI/EGL classes

Change-Id: I43b32f2a85c07b3f59c57e28e3d03e8d1cabcd8b
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
om_google_android_gles_jni_EGLImpl.cpp
56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334 31-Jan-2014 George Mount <mount@google.com> Revert "Add Path trimming."

Bug 12489442
This reverts commit 7fe03a267e6edb65142444765ce29ad5ff126052.

Change-Id: Idf434d79683e170364838388c7933a8591f7f4d3
ndroid/graphics/Path.cpp
cb6979acf9794a30ede4b888a078b728c913bb16 31-Jan-2014 Nick Kralevich <nnk@google.com> am 643be3ba: am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels."

* commit '643be3bab19a6305e776721854b293928bf2bfaa':
Map SELinux log levels to Android log levels.
896043d67d3ac75760bd99db8a1561e31ebee1e1 17-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make AssetManager and related classes 64-bit compatible

Following changes have been done:

[x] Long is used to store native pointers as pointers can be
64-bit.

[x] AssetManager openAsset native function returned -1 if
file name was empty and java function considered any
non-zero value as success. This has been fixed by native
function throwing Illegal Argument Exception as well.

[x] AssetManager incRefsLocked and decRefsLocked now accept
long as input to support 64-bit native references.

[x] AssetManager incRefsLocked method incorrecly used
'this.hashCode()' instead of the passed parameter id.
This has been fixed.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

Change-Id: I095b9f900d49e51f43ad6afc47cbc23116a6a64a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_util_AssetManager.cpp
ndroid_util_StringBlock.cpp
ndroid_util_XmlBlock.cpp
5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72 31-Jan-2014 Narayan Kamath <narayan@google.com> am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"

* commit '70986e197bbaf4de4f8126519a75df2b057c3b52':
AArch64: Use of long for pointers in PropertyValuesHolder
133c9649c3c83e6ccefa4f46c162ddb3f55269d0 31-Jan-2014 Narayan Kamath <narayan@google.com> am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit"

* commit 'fa2e16e36d95d5cf0848a28a98ac4566321fc119':
change Surface constructor arg to 64bit
cdf34469b3a49b73ffa4ab2766b55d7c0946fab1 23-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> Use long for pointers in EmojiFactory and PdfDocument

Change-Id: I275c9ce390dd9e01f772e2044c74cebdb0701de6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid/graphics/pdf/PdfDocument.cpp
ndroid_emoji_EmojiFactory.cpp
643be3bab19a6305e776721854b293928bf2bfaa 31-Jan-2014 Nick Kralevich <nnk@google.com> am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels."

* commit '3dfa15c49b4c78cdf3bf1af79e9b307596455708':
Map SELinux log levels to Android log levels.
e05b7b50e234e8ed2471f5ad96bb3d715067e9f3 31-Jan-2014 Igor Murashkin <iam@google.com> Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
a2fe7affd3d077ac163da90996cb2e5e0ca3b8d1 29-Jan-2014 Chris Craik <ccraik@google.com> Add initial hidden outline APIs

Background drawable outline usage and drawable outline calculation
still to come.

Change-Id: I8c7539f1638f86e1f8eb11f4fe49f705f61d58ba
ndroid_view_DisplayList.cpp
ab71f8b68fee0f2a4f2049c4345b5334948c9df9 30-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
b215529c720106165041c56142fce85a81929d33 29-Jan-2014 Chong Zhang <chz@google.com> change Surface constructor arg to 64bit

Bug: 12799017
Bug: 12799384

(cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1)

Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03
ndroid_view_Surface.cpp
6657a6c53930eb0ff8d03317eb10ea7ddb0c49b4 26-Jan-2014 Chris Craik <ccraik@google.com> Update reordering method names, and make 3d reordering API public

IsContainedVolume -> hasIsolatedZVolume conveys that this affects Z
ordering of views

ProjectToContainedBackground -> ProjectBackwards, since it ended up
using its own projection target, separate from the 3d volume bit

Change-Id: Ia2cde838cc4da134366fe6ff623290fbd65e50c3
ndroid_view_DisplayList.cpp
2f03f90d859ee57525178750b19444591174e3a5 29-Jan-2014 Chong Zhang <chz@google.com> Merge "change Surface constructor arg to 64bit"
af608e81d450b962a443a21fb1a6feadeb355fe1 29-Jan-2014 Chong Zhang <chz@google.com> change Surface constructor arg to 64bit

Bug: 12799017
Bug: 12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
ndroid_view_Surface.cpp
e0dda3c8e2c8341e60383619e4ab780bb3b02403 29-Jan-2014 Stephen Smalley <sds@tycho.nsa.gov> Map SELinux log levels to Android log levels.

Change-Id: I202c543ca6e4110c4011d1904eada4b75b59ff10
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
ndroid_os_SELinux.cpp
1e7011fb2903b6b10a78890b2f85ca026e49b168 29-Jan-2014 Narayan Kamath <narayan@google.com> Merge "Path.native_trim should return long, not int."
9932d648834a8fae4f98e6985ce1112ddf28da0b 29-Jan-2014 Narayan Kamath <narayan@google.com> am 1a6e29aa: am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."

* commit '1a6e29aae589073bfd6bd5f42816e622584cfb7a':
mNativeCanvas is long, not int.
d933edc742dcaf96862b211f4641e4cfd98acef5 29-Jan-2014 Narayan Kamath <narayan@google.com> am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."

* commit '9ecada44042c49516d781281bbe0cba4e0af51a2':
mNativeCanvas is long, not int.
c2cf1e1df4117351e58950c8a20e3095cb7a06ed 29-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
d228a03891f60520d517b2a3bc900b008b2da702 29-Jan-2014 Narayan Kamath <narayan@google.com> Merge "mNativeCanvas is long, not int."
11f66d0874669cb23be87202f84b98be9ea7bbc8 29-Jan-2014 Narayan Kamath <narayan@google.com> am 1caea796: am c74f7619: am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"

* commit '1caea796c9f3154048c02db6f46c458e8a80c32c':
AArch64: Use long for pointers in graphics/Interpolator
c42de09a947fa511cc75a624c40b2d2816b8c0ee 29-Jan-2014 Narayan Kamath <narayan@google.com> am 67ac8120: am 0cc4bb1f: am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"

* commit '67ac8120bf4e01b1de9d46673142d7fb92615616':
AArch64: Use long for pointers in SurfaceTexture
ef099b71838e15758c8e859af21748a123bb4a99 29-Jan-2014 Narayan Kamath <narayan@google.com> am 4a587146: am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"

* commit '4a58714606fdeb2e740b0ce51ea5074783e2ecf4':
AArch64: Make Binder and Parcel 64-bit compatible
e3a6663bb2d006c3e8cea7c529378af862f050a6 29-Jan-2014 Narayan Kamath <narayan@google.com> mNativeCanvas is long, not int.

swapNativeCanvas was asking for an int field.

Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07
ndroid_view_TextureView.cpp
c74f7619e19f4d172fc0bc6220abc917024c45b0 29-Jan-2014 Narayan Kamath <narayan@google.com> am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"

* commit 'cdc095ae4850d9ffd08de0d6e8828949603fcdd1':
AArch64: Use long for pointers in graphics/Interpolator
0cc4bb1ff30a7e2ef96837b1dbe79a89d5145dc2 29-Jan-2014 Narayan Kamath <narayan@google.com> am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"

* commit 'e4fc5c17c092a77e0647e01e93a6b0e806c27692':
AArch64: Use long for pointers in SurfaceTexture
d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3 29-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in graphics/Interpolator"
887b1ca87941095797a246b2d68ec2626a7cfc43 29-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in SurfaceTexture"
fbb35fb39eb74c6fa7ba6804faeaccb80483be14 17-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use of long for pointers in PropertyValuesHolder

Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.

Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

(cherry picked from commit 0141e884344a5c267239079d615e1c9d9898a222)

Change-Id: I80408a7227427732db0d8b4c960bcb849b7c8060
ndroid_animation_PropertyValuesHolder.cpp
09d07d0d33d44fc87c02a8f607ecb7b96dbb4145 29-Jan-2014 Narayan Kamath <narayan@google.com> am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"

* commit 'e3e4b40577032f6fad38bfbeb9c2b40df89f0ef9':
AArch64: Make Binder and Parcel 64-bit compatible
0141e884344a5c267239079d615e1c9d9898a222 17-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use of long for pointers in PropertyValuesHolder

Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.

Change-Id: Ifb514fc8473d7c41c0d6194fc6eb85d4816b2cd9
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_animation_PropertyValuesHolder.cpp
50afaefdc09060c7435291bc91aac47295ce2dfd 29-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Make Binder and Parcel 64-bit compatible"
e55bc7f1575fc5dacac70c4cb209e6aa0c582e71 29-Jan-2014 Narayan Kamath <narayan@google.com> Path.native_trim should return long, not int.

Change-Id: Idafc4c58eb86ad1af614d31f8cb05216bd869482
ndroid/graphics/Path.cpp
8bb5e66295f4f0f53dce13a877b922dead4639e8 28-Jan-2014 Mark Salyzyn <salyzyn@google.com> am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db

* commit 'd732f561b24e643676812855396d0c9b9138b4c8':
jni: Resolve build warnings
jni: Incorporate liblog reading API
967c5d00dfcd890820c3ca82bc608814ebfe1cc1 28-Jan-2014 Mark Salyzyn <salyzyn@google.com> Merge changes I3659193f,I8b78e4db

* changes:
jni: Resolve build warnings
jni: Incorporate liblog reading API
8697dc674c7c5f33201d037e1c3ae59d9893a22d 28-Jan-2014 Narayan Kamath <narayan@google.com> am be674bf6: am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"

* commit 'be674bf688fec9ce4ec04e77c93644be8253d273':
AArch64: Use long for pointers in graphics/Camera
39a789bf6efd5c3478a442e60e896cae371fd04c 28-Jan-2014 Narayan Kamath <narayan@google.com> am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"

* commit '7ae1726d0b962878cce4c1fe6c814a315f253293':
AArch64: Make graphics classes 64-bit compatible
5753b45516607988d5e84fee448d020911dde5d1 13-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Change-Id: Ic05ebf2051a225a1638a43f476bab6176c0b5c38
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ndroid/graphics/Camera.cpp
a0398430fcf365fba6e42ad0bdca2fbf45ed6fe0 20-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers as they can
be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.

Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Xfermode.cpp
ndroid/opengl/util.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GLES20DisplayList.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
om_google_android_gles_jni_EGLImpl.cpp
36bef0bf30d6bae48cf3837df351075ca4fce654 20-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make graphics classes 64-bit compatible

This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers as they can
be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

==================================================================

AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Xfermode.cpp
ndroid/opengl/util.cpp
ndroid_view_DisplayList.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
om_google_android_gles_jni_EGLImpl.cpp
e742799cae886e0e9b2eb5514e58bab27e34a0ee 28-Jan-2014 John Reck <jreck@google.com> Merge "Native-side proxy"
4f02bf4eef6af47f35c70c4dda5b7b9523d89ca0 04-Jan-2014 John Reck <jreck@google.com> Native-side proxy

Remove RemoteGLRenderer
Remove reflection-based control

Change-Id: If17c2bbb61c7141986d88c4763def77ed1074985
ndroid.mk
ndroidRuntime.cpp
ndroid_view_RemoteGLRenderer.cpp
ndroid_view_ThreadedRenderer.cpp
3ed8e2e679668767dc90c35a3a8a24e9ebf0b940 07-Nov-2013 Mark Salyzyn <salyzyn@google.com> jni: Resolve build warnings

(cherry picked from commit 087f58dd80e3296a53c6e3c74c089e9a0265f3bd)

Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
ndroid_util_EventLog.cpp
7933c2943f4a13b56944ad92e2194ed0020e5b04 05-Dec-2013 Mark Salyzyn <salyzyn@google.com> jni: Incorporate liblog reading API

(cherry picked from commit e11cbd441df4a1689c89b2ab91b84523c9f2fd10)

Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
ndroid_util_EventLog.cpp
2f4e0c24ab33895a60baf9918cb6cb47a989b81c 27-Jan-2014 Mathieu Chartier <mathieuc@google.com> am 698d3673: am 4a750c1f: am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp."

* commit '698d36731700b168e5debf8c3904d1106f4da20a':
Fix dest == src bugs in Matrix.cpp.
4a750c1f4a2760ae564fa56717c04a5f01396090 27-Jan-2014 Mathieu Chartier <mathieuc@google.com> am 15594557: am 137d74d8: am db525724: Merge "Fix dest == src bugs in Matrix.cpp."

* commit '15594557f118f670e8d8523e9aed0df3345d28ca':
Fix dest == src bugs in Matrix.cpp.
db5257248637df729ec4f8db58bdfbf0660051b2 27-Jan-2014 Mathieu Chartier <mathieuc@google.com> Merge "Fix dest == src bugs in Matrix.cpp."
7023df08f14ec5dee76ac54c03e870f84e297636 27-Jan-2014 Narayan Kamath <narayan@google.com> Revert "AArch64: Make graphics classes 64-bit compatible"

This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976.

Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Xfermode.cpp
ndroid/opengl/util.cpp
ndroid_view_DisplayList.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
om_google_android_gles_jni_EGLImpl.cpp
477d7d1be9340c4730663af7b748d67e85bc2951 27-Jan-2014 Narayan Kamath <narayan@google.com> Revert "Follow up for change 18b4cbeedef21c1fa666a110a157b."

This reverts commit c5b281c981d7290e3615d105cf2e23afc32c304d.

Change-Id: Id36f463e73068e14bc8fac0a289180be078ffbf9
ndroid_view_GLES20Canvas.cpp
c5b281c981d7290e3615d105cf2e23afc32c304d 27-Jan-2014 Narayan Kamath <narayan@google.com> Follow up for change 18b4cbeedef21c1fa666a110a157b.

Fix a few functions that were not converted correctly.

Change-Id: Ieb6bd9ea90af595080f1248a1d5892c460228290
ndroid_view_GLES20Canvas.cpp
18b4cbeedef21c1fa666a110a157bab66edff976 20-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make graphics classes 64-bit compatible

This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers as they can
be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

==================================================================

AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Xfermode.cpp
ndroid/opengl/util.cpp
ndroid_view_DisplayList.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
om_google_android_gles_jni_EGLImpl.cpp
30e20ac528731a778eec45506d1e57c8839b318a 27-Jan-2014 Narayan Kamath <narayan@google.com> am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."

* commit 'ebd43d46ebf53005ae60af59948f8ed634f9bafb':
AssetManager cookies should be int32_t and not void*.
745d4efc8369d255341d810790132660e33d3b61 27-Jan-2014 Narayan Kamath <narayan@google.com> AssetManager cookies should be int32_t and not void*.

Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.

(cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7)
(cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215)
(cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd)

Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
ndroid_util_AssetManager.cpp
a7fa2e592e2e579e5acdb903dba83fc074ebc215 24-Jan-2014 Narayan Kamath <narayan@google.com> AssetManager cookies are now int32_t, not void*.

This makes cookies on both the java & native side
4 byte signed integral values.

Change-Id: I6843d6c5ba7ff42dc454f20240844a158ae8e818
ndroid_util_AssetManager.cpp
768480c2458fda63f5eaab37c03e0671d759c514 26-Jan-2014 Mathieu Chartier <mathieuc@google.com> Fix dest == src bugs in Matrix.cpp.

The main bug was that the AutoJavaFloatArray autoSrc was not passing in
read only. This meant that the destructor overwrote the data which
the autoDst AutoJavaFloatArray had written in it's destructor.
This case only happened if src == dest and the arrays were copies.
Also improved performance by passing in read only a few other places.

Bug: 12570144

Change-Id: Idc8764087dc165433c584b87a0f9d4ed0ec795e8
ndroid/graphics/Matrix.cpp
8ab665dda40ab10e60fc69392022171f454af530 22-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make Binder and Parcel 64-bit compatible

Changes include
[x] Long is used to store native pointers

[x] Added new method obtain(long obj) to Parcel. Binder
uses this method instead of obtain(int obj).

[x] obtain(int) has been changed to throw unsupported
operation exception.

Change-Id: I408e0f2a24deb28c9277d86670653a51eb314266
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_os_Parcel.cpp
ndroid_util_Binder.cpp
39312ff423cac71675e8050d4f04ec38c6fe30a5 18-Jan-2014 Elliott Hughes <enh@google.com> am a850e5ac: am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."

* commit 'a850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44':
Don't confuse stat and stat64.
8815d261d9fefbac8f24936dc37a055ab9ced038 18-Jan-2014 Elliott Hughes <enh@google.com> am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."

* commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
Don't confuse stat and stat64.
ad076286c3140ce9f1f25b8503bdfd2047a968a7 18-Jan-2014 Elliott Hughes <enh@google.com> Don't confuse stat and stat64.

Bug: 11865851
Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
om_android_internal_content_NativeLibraryHelper.cpp
aa27b97f0b67e8a5e0fa542e6db1af07dc0152d1 17-Jan-2014 Narayan Kamath <narayan@google.com> am 8582264d: am 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit '8582264dbf84aabe18adb113807c1ae8b563b88f':
Fix error checking in MemoryFile.
766c95be6f3eb33f40241058c0503123e334050f 17-Jan-2014 Narayan Kamath <narayan@google.com> am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit 'e66fa5c1851f48dce95364dc0acbde1b9f39f160':
Fix error checking in MemoryFile.
087f58dd80e3296a53c6e3c74c089e9a0265f3bd 07-Nov-2013 Mark Salyzyn <salyzyn@google.com> jni: Resolve build warnings

Change-Id: I3659193f1ba1ba94561e4684cdb6627880ffc2fa
Author: Mark Salyzyn <salyzyn@google.com>
ndroid_util_EventLog.cpp
103d34d3bb6c7d570b00fda0970b89d807b2c0b8 16-Jan-2014 Narayan Kamath <narayan@google.com> am 23b7e0a3: am d8facb67: am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"

* commit '23b7e0a32bee5234ef65fccfef1596659a08b630':
AArch64: Use long for pointers in view/input classes
5875c94c591e3e10011509cd6a059844316b7f85 16-Jan-2014 Narayan Kamath <narayan@google.com> am 275586aa: am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"

* commit '275586aa53889a851e0b739e408896861d76e3a8':
AArch64: Use long for pointers in android/os/MessageQueue
4d7f9450663468abf5e41e24b7d3b1d5c3ea6143 16-Jan-2014 Narayan Kamath <narayan@google.com> am 8492e88a: am 077386db: am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"

* commit '8492e88a23ee4ac32f05b277654e0f9455fefa9b':
AArch64: Use long for pointers in graphics/PathMeasure
f25afde8dd24e6a23e3a25c05c9ad2965d0ac96e 16-Jan-2014 Narayan Kamath <narayan@google.com> am 419267a1: am 213f243f: am 87a82800: am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"

* commit '419267a164ba586a81a8e669863a494d2a88a44c':
Make YuvToJpegEncoder more JNI compliant
6606d16e097480e061546306cc95a729f5dccae8 16-Jan-2014 Narayan Kamath <narayan@google.com> am 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68

* commit '6706888e24aee04c2c914c44e5ef5b1510cf8013':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
a3340da7d4ef3872bd1191fcd4bf8b25d1179a25 16-Jan-2014 Narayan Kamath <narayan@google.com> am e18f0e2a: am 19bd2c28: am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"

* commit 'e18f0e2a463374502c0236a0d54909d980bf1043':
AArch64: Use long for pointers in MotionEvent class
a98bf2017ec8d1ef6b60e09b873effb2e370cd25 16-Jan-2014 Narayan Kamath <narayan@google.com> am e413dae8: am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"

* commit 'e413dae8926f45e08e93dd9454f3b683514f3106':
AArch64: Use long for pointers in VelocityTracker class
1bf3ab08db3dc342461a77e7a261ee9f406a5060 16-Jan-2014 Narayan Kamath <narayan@google.com> am c45068e4: am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"

* commit 'c45068e4a48053447413783e549be7273e38ea97':
AArch64: Use long for pointers in android/os/MemoryFile
d4513aea25346770427e19587a77f2e06c551ddd 16-Jan-2014 Narayan Kamath <narayan@google.com> am a5a0d384: am 425b08f1: am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"

* commit 'a5a0d384fce9e9475c1414f69cb47bf6b5259a4d':
AArch64: Use long for pointers in KeyCharacterMap class
6bb5cb24b458a11bd02e9bff37c03f6381e06b7c 16-Jan-2014 Narayan Kamath <narayan@google.com> Resolved conflicts for merge of 28c6ec02 to master

Change-Id: Idf1cabf2694dfa13d928df944d346f5e051b6948
d8facb6763638178bd12f1010466e426c0754f49 16-Jan-2014 Narayan Kamath <narayan@google.com> am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"

* commit 'd569e21dac38fffe0e6a7f935e9a6965495b87d4':
AArch64: Use long for pointers in view/input classes
7471dfc4a894ade4cd83949d2b59b9b7e75bbf92 16-Jan-2014 Narayan Kamath <narayan@google.com> am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"

* commit '42defa02337b94d25714fe737f749f2c3300c790':
AArch64: Use long for pointers in android/os/MessageQueue
077386dbda31bfef96acca3a1ba84fece67e391a 16-Jan-2014 Narayan Kamath <narayan@google.com> am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"

* commit '6b81bfd10f63c166ff6e4afb0f267ce9e5275366':
AArch64: Use long for pointers in graphics/PathMeasure
213f243f35e8ad7b605c91c08ce6271302d211a7 16-Jan-2014 Narayan Kamath <narayan@google.com> am 87a82800: am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant"

* commit '87a82800658c9bcad75881d9761b412a024d7969':
Make YuvToJpegEncoder more JNI compliant
775667c070f6e0375e7a247d30a34b0073d7fd5b 16-Jan-2014 Narayan Kamath <narayan@google.com> am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68

* commit '03e8be757d2703d52fad3fd153c6bcf0b13ed1d1':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
19bd2c28f9c3e4db12cad93ed2a69c17c95e42fd 16-Jan-2014 Narayan Kamath <narayan@google.com> am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"

* commit 'ab220deeb8a413649335d5ef47d974dfdc3ac5ec':
AArch64: Use long for pointers in MotionEvent class
8e96d73a755348b25ceb80f907eae15be2da0d75 16-Jan-2014 Narayan Kamath <narayan@google.com> am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"

* commit 'e488f2c154f089141709279dd93bcd641c85659b':
AArch64: Use long for pointers in VelocityTracker class
d7a54c6574c3ca759e977f27912caecb6b40e827 16-Jan-2014 Narayan Kamath <narayan@google.com> am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"

* commit '31f10bb21b24824c5dbf60b420239513f02b9e55':
AArch64: Use long for pointers in android/os/MemoryFile
425b08f14419a1e67a3d9d2c9b97ea61ecd4f5cb 16-Jan-2014 Narayan Kamath <narayan@google.com> am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"

* commit 'c1abb5e3957f6abdd9cea8f2717290a3f130a216':
AArch64: Use long for pointers in KeyCharacterMap class
1d78ae42d0c5968bec0649784000063b689b2c51 16-Jan-2014 Narayan Kamath <narayan@google.com> am 24d63a83: am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes"

* commit '24d63a838211db019bf7ea970a0d844d8033b729':
AArch64: Use long for pointers in media classes
307023f5500a038d77b4e9c7ddb2f76b0cc8a56c 16-Jan-2014 Leon Scroggins III <scroggo@google.com> Merge "In nativeDecodeFileDescriptor, use fdopen."
a2f9042f4eec167bad04ba8923723cd9458699b5 13-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in graphics/Interpolator

For storing pointers, long is used in
android/graphics/Interpolator class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I1e181476a4fe5273ff190cf34c4a7487aa1aecf4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid/graphics/Interpolator.cpp
6ffb09171960e776466b963e51196565a033998c 16-Jan-2014 Narayan Kamath <narayan@google.com> Fix error checking in MemoryFile.

mmap returns MAP_FAILED on failures, not 0 (NULL).
Also, convert some C style casts to C++ since they
make intent clearer.

Change-Id: I367993c73e9ee576f11ebe76e530d2c2f27c662d
ndroid_os_MemoryFile.cpp
72aa313ff4c91e7b2aae3d37067f9201b2b0fdbe 13-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in SurfaceTexture

Long is used in SurfaceTexture class to store
pointers as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I771aa62c42bc865e644c63fd48f309782dd03e73
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid/graphics/SurfaceTexture.cpp
486544f763bd27eb92c95101e23f939c79c9890e 16-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in view/input classes"
84ee7930bb0f91f6a19662efa4c3f7c7044be426 16-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in android/os/MessageQueue"
98002dfb60a20caf62d6682659547c042a4a3342 16-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in graphics/PathMeasure"
1b0f0be0979cbe00641d5d386691e87d668a2aa8 16-Jan-2014 Narayan Kamath <narayan@google.com> Merge "Make YuvToJpegEncoder more JNI compliant"
bb35356dc05632664e1d65588c9d0570c185280b 16-Jan-2014 Narayan Kamath <narayan@google.com> Merge changes Id54087dd,I946325e4,I2a2b2e68

* changes:
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
138d67c8476a846030be74ced1b1990d497402e0 16-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in MotionEvent class"
d85bba8ebd24257cb52867b6a082350746e97ad2 16-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in VelocityTracker class"
27a647bf382f12aea6d0c9584302423e1c44fbb0 16-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in android/os/MemoryFile"
f19c50d6577b09ddabb5fa8c166b56c35ce2a66d 16-Jan-2014 Narayan Kamath <narayan@google.com> Merge "AArch64: Use long for pointers in KeyCharacterMap class"
81155da28476862a7056ec74312a8010ec154671 15-Jan-2014 John Reck <jreck@google.com> Merge "Remove dead code"
0102f8a87a7571b1ff537a1293d67ae8fa001167 14-Jan-2014 Leon Scroggins III <scroggo@google.com> In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Change-Id: If67da91484acc79f9f3dde6d05201409c0c75e41
ndroid/graphics/BitmapFactory.cpp
2114aef4eaa1c6539d4fe83bb130395dad7fbae7 15-Jan-2014 John Reck <jreck@google.com> Remove dead code

Change-Id: I9c96d3d21bd3faed91a5146f5a2b8916c634fdff
ndroid_view_GLES20Canvas.cpp
8790be6de3644e332ec6a17c855da89ffc13a9bf 03-Dec-2013 Leon Scroggins III <scroggo@google.com> Remove calls to deprecated SkBitmap::setIsOpaque()

setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

Change-Id: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
b091d47a2e31a30581aa210419ff09bcc8715cdf 08-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in BitmapRegionDecoder

For storing pointers, long is used in BitmapRegionDecoder
class, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

In addition, Graphics.cpp has been changed to work
with modified BitmapRegionDecoder.

Change-Id: Id54087dd3bfb29577e8b762e70946793369dc701
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
dcaf5593ddbfe8e1cacaf07813b1e827ba4dba8c 08-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in Movie class

For storing pointers, long is used in Movie class,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I946325e4af6cb9282012bebdaee89e1117d8797b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ndroid/graphics/Movie.cpp
075e9a19ce645752f8282bc19c91b25978a7dc52 06-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in media classes

For storing pointers, long is used in media classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_RemoteDisplay.cpp
ndroid_media_ToneGenerator.cpp
39029b29906fb064fc1e408983809b9b7ad74095 10-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> Make YuvToJpegEncoder more JNI compliant

Minor changes have been done to conform with standard
JNI practice (e.g. use of jint instead of int in JNI
function prototypes)

Change-Id: I4015138921cc18ecae52daaa6710b3c9efd68e87
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ndroid/graphics/YuvToJpegEncoder.cpp
0c10cc6052dc279f020e4adf069961e6e8f9dd6e 10-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in graphics/PathMeasure

For storing pointers, long is used in
android/graphics/PathMeasure class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I4599a9d5f7dcf9c39838db96d9033059114d3a49
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ndroid/graphics/PathMeasure.cpp
fe834d30f4f3f51b754d55fecb36f11279733948 08-Jan-2014 Glenn Kasten <gkasten@google.com> Prepare for additional formats beyond 8-bit and 16-bit PCM

This CL does the same thing for AudioTrack,
that an earlier CL did for AudioRecord:
> Change-Id: Ic3525f049e939bdf125d9f87ed39abd2690dcf9f

Pull out the common parts of that earlier CL and move them to new header
file android_media_AudioFormat.h.

Use the new function audioFormatToNative() to convert from Java
ENCODING_PCM_* to native AUDIO_FORMAT_*.

Use audio_bytes_per_sample() instead of hard-coding the size of various formats.

Use size_t for memory sizes.

Change-Id: I7992dd6a2c9500126a6d7ae5fc1ed9f3312962d6
ndroid_media_AudioFormat.h
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
63a37153238d95cf8897939e6d6e8fbc56e9ec7f 10-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in android/os/MessageQueue

Long is used in android/os/MessageQueue class to store
pointers as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I7e901b8515a5b5e3afe1dadaaf3e5c186955c2a0
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_os_MessageQueue.cpp
c20cadbdad0cdfe8e56431c22bd26ae666101e89 10-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in android/os/MemoryFile

Long is used in android/os/MemoryFile class to store
pointers as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I07afc010524c16b5c852273b89becb0c08ff27d7
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_os_MemoryFile.cpp
7dd77a875c723cce75303773ab1909fb2678f731 09-Jan-2014 Glenn Kasten <gkasten@google.com> Merge "Improve error reporting in AudioTrack JNI"
b311b3424bb97a47ce4c0f7a2dd9ccd9be8a0c10 09-Jan-2014 Leon Scroggins III <scroggo@google.com> Merge "Merge AssetStream with AssetStreamAdaptor."
659a9712f2072f0bb3fa39de23f252f2f97440b4 08-Jan-2014 Glenn Kasten <gkasten@google.com> Improve error reporting in AudioTrack JNI

for android_media_AudioTrack_get_min_buff_size when it
calls AudioTrack::getMinFrameCount. That AudioTrack API
has been changed recently to guarantee that it will always
return a valid frameCount if the return value == NO_ERROR.

Change-Id: I8f7f850f1c30229ce77a02bdc963634cdbaf3aac
ndroid_media_AudioTrack.cpp
a931d5218cfee89c7629ffa6cde324fa966449f9 08-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in view/input classes

For storing pointers, long is used in view/input classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Iafda9f4653c023bcba95b873637d935d0b569f5d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_view_InputChannel.cpp
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputEventSender.cpp
ndroid_view_InputQueue.cpp
4580d9cf1d6c7c753eafd8e6ac779e62783ed124 09-Jan-2014 Martin Kosiba <mkosiba@google.com> Fix the build.

Change I6f1ebb2b20b7436c86fe849b35d582fd9c8a8967 broke the build
with a typo.

Change-Id: If8876078c0e1a20ca1034cc5926080e02fead205
ndroid_view_DisplayList.cpp
c619b6e58b5851b050d2b5b4a55ecd8343adf052 09-Jan-2014 Alan Viverette <alanv@google.com> Merge "Add DisplayList bit for projecting onto a contained volume"
58f09b352417c4ff7e01365727cbf8a09b9bed23 09-Jan-2014 Alan Viverette <alanv@google.com> Add DisplayList bit for projecting onto a contained volume

Does not handle reordering/translating the projected DisplayList.

Change-Id: I6f1ebb2b20b7436c86fe849b35d582fd9c8a8967
ndroid_view_DisplayList.cpp
80a3a364fd0c7441dbee4de7dd441a6ce743f066 09-Jan-2014 Vinit Deshpande <vinitd@google.com> Merge "Revert "Revert "Move Wifi services to a new git project"""
96804bc8fb3d6b2de11e3b9779c976e7b0e96ee8 08-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in VelocityTracker class

For storing pointers, long is used in VelocityTracker class,
as native pointers can be 64-bit.

Change-Id: I8c454663a97745c7440bb6f99ef49d28e9026876
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_view_VelocityTracker.cpp
99a1ef2b7f1eb7266e1c3782f649de0d8dbe23bf 08-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in MotionEvent class

For storing pointers, long is used in MotionEvent class,
as native pointers can be 64-bit.

Change-Id: I88ebfef26070b7f49c14945cad37aa3db209ec90
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_view_MotionEvent.cpp
0c3f9210166a861fe568ac15994a0d7a42f7e28a 08-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in KeyCharacterMap class

For storing pointers, long is used in KeyCharacterMap class,
as native pointers can be 64-bit.

Change-Id: Idc1b39874202e96b9231d7801e6707003787659b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_view_KeyCharacterMap.cpp
0203d58ecf145a0b30dc33828c0f45d83fce983b 08-Jan-2014 Narayan Kamath <narayan@google.com> am db47efd3: am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"

* commit 'db47efd3f8581c2c0d72a1b8617aeae9830f7ea4':
AArch64: Use long for pointers in App/Backup
ee864c0a04b2a37f13478344153a2bbf647df3e6 08-Jan-2014 Narayan Kamath <narayan@google.com> am 55a12adc: am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers"

* commit '55a12adc19b15df4068b90439dccb868534002c7':
AArch64: Use long for pointers
6bbda22e1c5604b0866068913c7466fa23d47818 08-Jan-2014 Narayan Kamath <narayan@google.com> am 29eadb32: am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"

* commit '29eadb328a71f912b0d479860286cd606ed3dc87':
AArch64: Use long for pointers in hardware classes
651807fcd0b1012ea848efe5f67b4381d8ce6797 08-Jan-2014 Narayan Kamath <narayan@google.com> am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"

* commit '3f589e5d1e09e17a2aaa0a52fc15e16520d1bd5a':
AArch64: Use long for pointers in App/Backup
72a8fe6d03a7c9e88e8fdd7181ca6896a2d475eb 08-Jan-2014 Narayan Kamath <narayan@google.com> am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers"

* commit '74661ff119b274e58d1b2f15cff97cfa6a1e64fa':
AArch64: Use long for pointers
9a743575254d7d5d456456517171f0ee31bc9247 08-Jan-2014 Narayan Kamath <narayan@google.com> am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"

* commit '71cdc73d2808944fca0a9e200696253d1f4a5bf4':
AArch64: Use long for pointers in hardware classes
58b8b24256bdc2b613b7fda9151845ed9898a4c7 02-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in App/Backup

For storing pointers, long is used, as
native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_app_NativeActivity.cpp
ndroid_app_backup_FullBackup.cpp
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_BackupHelperDispatcher.cpp
ndroid_backup_FileBackupHelperBase.cpp
738702d28ab7e0e89e3c6e18fd46cc1361917eb9 02-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers

For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.

Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteConnection.cpp
4838e338129e09a37b8c8ad5e44f85ec5cd3aea1 03-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in hardware classes

For storing pointers, long is used in hardware classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_hardware_Camera.cpp
ndroid_hardware_SensorManager.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_hardware_UsbRequest.cpp
3ffa1a899a6169600dabe39fb8528db9af522ba6 08-Jan-2014 Vinit Deshpande <vinitd@google.com> Revert "Revert "Move Wifi services to a new git project""

This reverts commit f1182c9c1abdb4e8f733632d0567410ab9fc1d3c.

Change-Id: Ic440cfa6502b651b2cc67faf73c7c9c49df42190
ndroid.mk
ndroidRuntime.cpp
ndroid_net_wifi_WifiNative.cpp
d9feaf49719d58cfc4fad203bd10e75253024fa9 08-Jan-2014 Vinit Deshpande <vinitd@google.com> Merge "Revert "Move Wifi services to a new git project""
f1182c9c1abdb4e8f733632d0567410ab9fc1d3c 08-Jan-2014 Vinit Deshpande <vinitd@google.com> Revert "Move Wifi services to a new git project"

This reverts commit 4a3f9cf099bbbe52dc0edb2a7e1d1c976bc335a3.

Change-Id: I6269a683e842a5d1cfdafea892be86972ae11c40
ndroid.mk
ndroidRuntime.cpp
ndroid_net_wifi_WifiNative.cpp
ed8ed0bc81864c802f25c54aeb896db6055a7c20 08-Jan-2014 Vinit Deshapnde <vinitd@google.com> Merge "Move Wifi services to a new git project"
9d1ed347d3fdaa18d7c035b9ce5cccf86846fd83 08-Jan-2014 Glenn Kasten <gkasten@google.com> Merge "Remove I/O handle from get/setParameters parameter list"
ed20ebbde5cebc470f426416445b697a0312aac5 08-Jan-2014 John Reck <jreck@google.com> Merge "EGL migration to native"
23b797ab5151eb2474f3bdd679f2f07bfd723042 04-Jan-2014 John Reck <jreck@google.com> EGL migration to native

Move EGL state management to native side for RemoteGLRenderer

Change-Id: I12b0fed70246564d4caebf87374e8bbca655c572
ndroid.mk
ndroidRuntime.cpp
ndroid_view_RemoteGLRenderer.cpp
ndroid_view_ThreadedRenderer.cpp
4a3f9cf099bbbe52dc0edb2a7e1d1c976bc335a3 27-Dec-2013 Vinit Deshapnde <vinitd@google.com> Move Wifi services to a new git project

Bug: 12175455
Change-Id: I1fa07e29c6a9aae38d9e334d519a9f2445d15613
ndroid.mk
ndroidRuntime.cpp
ndroid_net_wifi_WifiNative.cpp
2e09e57e3de418671164e98d92e3154acf221109 07-Jan-2014 Narayan Kamath <narayan@google.com> am 0d8c3c46: am 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"

* commit '0d8c3c469e4a5e74b702b58307c1e24fa15da3d8':
AArch64: Use long for pointers in DisplayEventReceiver
5f83ff6ffa82fb84df6feab4339054b302ac391e 07-Jan-2014 Narayan Kamath <narayan@google.com> am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"

* commit 'e7d7908c28adf77de2cefba4f2a554b770d49def':
AArch64: Use long for pointers in DisplayEventReceiver
27285821b74ca9bc381d33f40028f06ff0f85e0c 18-Dec-2013 Ashok Bhat <ashok.bhat@arm.com> AArch64: Use long for pointers in DisplayEventReceiver

For storing pointers, long is used as
native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_view_DisplayEventReceiver.cpp
e11cbd441df4a1689c89b2ab91b84523c9f2fd10 05-Dec-2013 Mark Salyzyn <salyzyn@google.com> jni: Incorporate liblog reading API

Change-Id: I8b78e4db67b6daabb975ce740fb40478df4ffcef
ndroid_util_EventLog.cpp
91ecb36df50be3446809e9da2a8f571d157f7549 11-Jul-2013 Todd Poynor <toddpoynor@google.com> ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE

Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
ndroid_util_Process.cpp
539394ec3aee7b5868c14e5e692684c8a875a3d4 30-Dec-2013 Chris Craik <ccraik@google.com> Merge "Create abstract base class for OpenGLRenderer"
8b5f80ef9f4c98bf18f97e28c7747acb896a365e 30-Dec-2013 Roger Hu <roger.hu@gmail.com> Fix comment. It should be 'or' not 'of'.

Change-Id: Ie713e1072cd145a493480221d93e400d6d406a0e
ndroid/graphics/NinePatchImpl.cpp
91fcb7d7e35eb6eb4bceaa00d186a8a0b09bb142 28-Dec-2013 Chris Craik <ccraik@google.com> Merge "Avoid implicit parameter/return value casting of pointers."
9f66ea06ace80f60e049e3e7e778a8552cebe5b3 28-Dec-2013 Chris Craik <ccraik@google.com> Avoid implicit parameter/return value casting of pointers.

Change-Id: I88123a75c87bf9a88de9ef9fc3e9af70d6a18d7d
ndroid_view_GLES20Canvas.cpp
7a02ea3eaafac782b532ef366863a0b2554ae536 28-Dec-2013 Chris Craik <ccraik@google.com> Avoid implicit parameter casting of pointers.

Change-Id: I568c4b38ce05f948e2456c54ae69921d328f3010
ndroid_view_DisplayList.cpp
b458942bb6e6cf13c68341dda35ef5cee060f5ae 27-Dec-2013 Chris Craik <ccraik@google.com> Create abstract base class for OpenGLRenderer

This will eventually serve as a base class to allow
DisplayListRenderer to split off from OpenGLRenderer, and could
eventually support other rendering approaches, such as an
SkCanvas/SkPicture.

This will also be the main source of (implementation-independent)
documentation of the canvas/renderer methods.

Change-Id: I52047f338f5cf86a3b0b3002af7154bff5c3c227
ndroid_view_GLES20Canvas.cpp
d863a10b2870ca27f631b2ec69f3e13faed1d02a 19-Dec-2013 Chris Craik <ccraik@google.com> Add initial APIs for 3d view manipulation.

Change-Id: I6de00bc577d5b3a1fbc9ca3a3b3668fcfa32b867
ndroid_view_DisplayList.cpp
3c8a529b3c2a0bb1eceb3c1ec7afa58634ace044 20-Dec-2013 Chris Craik <ccraik@google.com> Merge "Move GLES20DisplayList functionality into DisplayList"
5438979e498750b6a28ada7974d4e9fe17fd8394 20-Dec-2013 Chris Craik <ccraik@google.com> Move GLES20DisplayList functionality into DisplayList

Removes unneeded indirection layer

Change-Id: I75d3e369eda2788cbc52a3575c4e1c521e842f59
ndroid.mk
ndroidRuntime.cpp
ndroid_view_DisplayList.cpp
ndroid_view_GLES20DisplayList.cpp
44e26f2f5c0761f8211a3baef3f4a2fb1ea5f622 20-Dec-2013 Glenn Kasten <gkasten@google.com> Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM"
c94752a01a709e9f3914c40ebdd77face2d52cce 19-Dec-2013 Glenn Kasten <gkasten@google.com> Remove I/O handle from get/setParameters parameter list

This is a step towards isolating application-level from
I/O handles as much as possible.

Change-Id: I355619c36fee2d5743080b57f146626fb849fc19
ndroid_media_AudioSystem.cpp
a5a42384367230b8e16cf441d5dcf4225332f9d7 19-Dec-2013 Glenn Kasten <gkasten@google.com> Prepare for additional formats beyond 8-bit and 16-bit PCM

Factor out code that converts from Java ENCODING_PCM_* to native
AUDIO_FORMAT_* into a new function audioFormatToNative().

Also use audio_bytes_per_sample() from <system/audio.h>
instead of hard-coding the size of various formats.

Use size_t for memory sizes.

Change-Id: Ic3525f049e939bdf125d9f87ed39abd2690dcf9f
ndroid_media_AudioRecord.cpp
0c2a8c7f271082f5c595e1239230be418ecc41b8 19-Dec-2013 Brian Carlstrom <bdc@google.com> am 67fa194e: am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper"

* commit '67fa194ecb9e1d28ae3c60110bef671a3312b13b':
Track Looper decoupling from ALooper
82b007d7572dceb0981b269338bd1ac6c40496c5 13-Dec-2013 Brian Carlstrom <bdc@google.com> Track Looper decoupling from ALooper

Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
ndroid_view_DisplayEventReceiver.cpp
f933737784bea4e27b70522cfd34ddaa45481d12 11-Dec-2013 Takahiro Aizawa <takahiro.aizawa@sonymobile.com> EGL14.eglCreateWindowSurface should set producerControlledByApp

Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

Change-Id: Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0
ndroid_opengl_EGL14.cpp
b9c58ab617c257dbece105167b21e94faad67320 03-Dec-2013 Leon Scroggins III <scroggo@google.com> Merge AssetStream with AssetStreamAdaptor.

Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.

The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
the length (read(NULL, 0)) is no longer implemented, since it is
no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
so some implementation is necessary.

Change-Id: I2a5395914e4f53830aaefee396556459083a1c56
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
6ab81e996d3d446a25dcb749e525e93a25bc83e7 17-Dec-2013 Greg Hackmann <ghackmann@google.com> am 69ad42a3: am 1877f7dc: am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock"

* commit '69ad42a3cf12bf39fe2c47c4298f23567b3306ef':
Add /dev/rtc backend to SystemClock
c978799c4a7cc8339d560bb47a029861230fa2a6 17-Dec-2013 Greg Hackmann <ghackmann@google.com> Merge "Add /dev/rtc backend to SystemClock"
b7bbca2d6a0ba8e7a0cee5f7683a8193c0e30140 12-Dec-2013 Greg Hackmann <ghackmann@google.com> Add /dev/rtc backend to SystemClock

On devices without /dev/alarm, use the settimeofday() syscall and the
standard RTC_SET_TIME ioctl (which are collectively equivalent to the
ANDROID_ALARM_SET_RTC ioctl).

Change-Id: I3c1d741099e253186e43c9369b62603b214b9c9a
Signed-off-by: Greg Hackmann <ghackmann@google.com>
ndroid_os_SystemClock.cpp
ba9b613437c34873fa95800a25fc51720638267c 16-Dec-2013 Chris Craik <ccraik@google.com> Create private properties on GLCanvas for experimentation with 3d

Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
ndroid_view_GLES20Canvas.cpp
18809c063b89d9b235401d080b952885a4ef9628 13-Dec-2013 Chris Craik <ccraik@google.com> Merge "3d view system!"
85948593e31157207660dcd144fa5dbe2e6b6585 13-Dec-2013 Kristian Monsen <kristianm@google.com> resolved conflicts for merge of 800d4d72 to master

Change-Id: Ib1defc447745e5406d64c0d99c962832c79d15ef
f57776b2d195f0937906eb88b777bb55ccc36967 26-Oct-2013 Chris Craik <ccraik@google.com> 3d view system!

True 3d transformations are now supported by DisplayLists and the
renderer, initially with the translationZ property on view.

Renderer operations used directly by DisplayList (formerly,
clip/save/restore/saveLayer) are now more simply managed by allocating
them temporarily on the handler's allocator, which exists for a single
frame. This is much simpler than continuing to expand the pool of
pre-allocated DisplayListOps now that more operations are called
directly by DisplayList, especially with z ordered drawing.

Still TODO:
-APIs for camera positioning, shadows
-Make Z apis public, and expose through XML
-Make invalidation / input 3d aware

Change-Id: I95fe6fa03f9b6ddd34a7e0c6ec8dd9fe47c6c6eb
ndroid_view_GLES20DisplayList.cpp
f5fabdf83d2a1b30fcbd2a25882f98e282e4f762 12-Dec-2013 Kristian Monsen <kristianm@google.com> Fix one and hide the other warnings from core/jni

Most of the warnings are unused parameter from skia functions.

Change-Id: I9df57718d117c26b96163f751ccb056ca86ac072
ndroid.mk
om_android_internal_net_NetworkStatsFactory.cpp
ffadfb9ffdced62db215319d3edc7717802088fb 07-Dec-2013 Vinit Deshapnde <vinitd@google.com> Move Wifi/P2p service components under services

Some methods need to be public, since frameworks/base complies before
frameworks/base/services; and services takes build dependency on base.

Similar issue exists with WifiEnterpriseConfig constants.

Bug: 9907308
Change-Id: Ied0e3dee0b25c939067dbc66867a9814b3b3b68e
ndroid_net_wifi_WifiNative.cpp
ce0d569857ebf13a99fe85daf7ee531b26580dc2 11-Dec-2013 Elliott Hughes <enh@google.com> am e2fbb2ac: am d3dd83c6: am 5b9437df: am 4a72b306: Merge "fix possible buffer overrun and memory leak"

* commit 'e2fbb2ac6802e54d67a910da790711fbb2f09201':
fix possible buffer overrun and memory leak
5a74e2df57acb93b61568b90b048016046ef4512 03-Dec-2013 Narayan Kamath <narayan@google.com> Reimplement ZipFileRO in terms of libziparchive.

This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).

This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.

One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).

bug: 10193060

(cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df)

Change-Id: I86a2c528575d4a3ca86b94be068dcdc3c17c2ed6
om_android_internal_content_NativeLibraryHelper.cpp
ed62560f69d8a5445d2cae253937f3e4a4900b12 11-Dec-2013 George Mount <mount@google.com> Merge "Add Path trimming."
d21752dff45c7d8856e63026cfddc303a302df14 11-Dec-2013 Narayan Kamath <narayan@google.com> Merge "Reimplement ZipFileRO in terms of libziparchive."
4a72b3064cecc85c56b8d75bb4a2d9fedbf76ec8 11-Dec-2013 Elliott Hughes <enh@google.com> Merge "fix possible buffer overrun and memory leak"
630491973269da1b260e69d6a3f9490b97705037 11-Dec-2013 John Reck <jreck@google.com> Unbreak display list debug dumping

Change-Id: I1c6a79f047b29fa60907f6e128cb843a45b88bff
ndroid_view_GLES20Canvas.cpp
ndroid_view_GLES20DisplayList.cpp
cec24ae16e9a0a7c3075f1a8d9149bb7fb3813fc 05-Nov-2013 John Reck <jreck@google.com> RenderThread work

Hacky prototype needs a private API to enable

Change-Id: I21e0ddf3cdbd38a4036354b5d6012449e1a34849
ndroid.mk
ndroidRuntime.cpp
ndroid_view_ThreadedRenderer.cpp
7fe03a267e6edb65142444765ce29ad5ff126052 23-Nov-2013 George Mount <mount@google.com> Add Path trimming.

Change-Id: Iafcf127a5136883ad4c0185d3c15f96d67f38d0d
ndroid/graphics/Path.cpp
afd31e08299008fdc5c2813f21b2573f29dc53df 03-Dec-2013 Narayan Kamath <narayan@google.com> Reimplement ZipFileRO in terms of libziparchive.

This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).

This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.

One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).

bug: 10193060

Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
om_android_internal_content_NativeLibraryHelper.cpp
ebcb32f58a6220802ca129ea33f47b4b69931a10 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD

Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
2a69b17309d141375474d68879e5695305b17a3f 23-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Remove obsolete libwpa_client library

Change-Id: I222c60ec65375768dc62f9219d115b5b09a374f6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ndroid.mk
e2aad50479c537518d2808ced9e4eb9554c113e5 05-Dec-2013 Brian Carlstrom <bdc@google.com> am 4a657244: am 59595f7a: am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."

* commit '4a657244b3de44cf28aae952b8dc76f8598c61cb':
Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
59595f7a3e8efcefc62bbcf8e085b6da6d8ea339 05-Dec-2013 Brian Carlstrom <bdc@google.com> am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf."

* commit '8026b2ce23396262ad1f1e7a75093cd0e2467d4b':
Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
a1a19d28d0e432c2d90e4fd73146891c57d01479 05-Dec-2013 Mathieu Chartier <mathieuc@google.com> Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.

Since VMRuntime.newNonMovableArray and VMRuntime.addressOf are java
methods implemented in Native, they don't necessarily return NULL
when an exception is thrown. Checking the exception instead of the
return value fixes errors which may occur if the runtime returns
garbage when an exception is pending.

Bug: 11971220
Change-Id: I70478834c9f14cc5d9e666e1e174d3fd09269719
ndroid/graphics/Graphics.cpp
aec09b6b98aa75fac426cff6f39a46ae5850594b 04-Dec-2013 Leon Scroggins III <scroggo@google.com> Merge "Call SkBitmap::config() instead of ::getConfig()"
385739be8c05ea40cd9c17ae02530dd90e0157bd 04-Dec-2013 Victoria Lease <violets@google.com> Merge "Deprecate Android-specific SkPaint functions."
43b692d9a18224e89fc09a0e68d097322e0ef6bb 04-Dec-2013 Victoria Lease <violets@google.com> Deprecate Android-specific SkPaint functions.

The following functions were problematic:
const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
const void* findImage(const SkGlyph&, const SkMatrix*);

Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.

Bug: 11968757
Change-Id: Id746315d41aec5b211b78b172a883c2061130f08
ndroid/graphics/TextLayoutCache.cpp
4b9a19a8f865970e0079f431c8c2c2a8e4333ae9 03-Dec-2013 Leon Scroggins III <scroggo@google.com> Call SkBitmap::config() instead of ::getConfig()

getConfig() has been deprecated.

Change-Id: I32066256ab82ac4760c752c80856d1b56d291fae
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/opengl/util.cpp
ece57d7d7821703c00e23e72a0f7a3492cfc30f9 03-Dec-2013 Leon Scroggins III <scroggo@google.com> Merge "Remove call to deprecated function."
4a1232f814278ad72634abb29fa6ebef8a905221 03-Dec-2013 Glenn Kasten <gkasten@google.com> Merge "Include more information in AudioRecord error logs"
36c245ace557aeb569e546b82baec6fe1491d733 03-Dec-2013 Mathieu Chartier <mathieuc@google.com> am dae9f5a5: am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."

* commit 'dae9f5a5158257c65fae014b38bde08741b97e62':
Add dalvik.vm.gctype to enable switching between different GCs.
f3a2430a2b849f2c4041bcfba7fbefa9b2bb4d79 03-Dec-2013 Mathieu Chartier <mathieuc@google.com> am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."

* commit '738fa2f64e064f5c6d1003e528cde742e262312f':
Add dalvik.vm.gctype to enable switching between different GCs.
7e4fdec6f0ac6385c5f8aeaf0f2e12e162138ac3 03-Dec-2013 Mathieu Chartier <mathieuc@google.com> Add dalvik.vm.gctype to enable switching between different GCs.

The option passes the specified GC type into the Xgc runtime
option.

Currently the three different supported GC types are MS, CMS, SS
which represent mark-sweep, concurrent mark-sweep, mark-sweep +
semi-space hybrid.

Change-Id: I6ad95c8d12c0d1158f7c861ff0c3180761619172
ndroidRuntime.cpp
82b7b0b2af24704c6eb465665024ea6aaf7699c2 02-Dec-2013 Leon Scroggins III <scroggo@google.com> Remove call to deprecated function.

setPrefConfigTable(array) is being removed in
https://codereview.chromium.org/99473004

Change-Id: I2d7e25052861f7f1d54e2418c11204d51bb88b1e
ndroid/graphics/NinePatchPeeker.cpp
a9838afbe3ef58b63e5d52060d5ff2776c1c603a 22-Nov-2013 Glenn Kasten <gkasten@google.com> Include more information in AudioRecord error logs

Change-Id: I15ec85760d3523120925608ebe3560f901cdffd7
ndroid_media_AudioRecord.cpp
c12ac98b2819a19cb87c9132c78953d41781ba98 25-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "wifi: Remove obsolete libwpa_client library"
e41451993e183067414d9db1785566343fac4063 23-Nov-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Remove obsolete libwpa_client library

Change-Id: I222c60ec65375768dc62f9219d115b5b09a374f6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ndroid.mk
b0fa90c9b45302422a7bb1a13696c9c463c887cd 23-Nov-2013 Chris Craik <ccraik@google.com> Merge "Clean up quick rejection, especially surrounding points + lines."
f0a590781b2c3e34132b2011d3956135add73ae0 20-Nov-2013 Chris Craik <ccraik@google.com> Clean up quick rejection, especially surrounding points + lines.

bug:4351353

quickReject and quickRejectNoScissor have been renamed and refactored:
- to make the scissor side effect clear and explicit
- dangerous methods no longer public
- to make the simple quick reject check logic const
- simple quick reject is now conservative

This CL also fixes several issues with line and point quickRejection -
sub-pixel and hairline lines are much less likely to be incorrectly
rejected, especially at small canvas scale.

Additionally, alpha modulation for AA points < 1px in size is now
correct, dumplicating SW behavior (similar to lines and stroked
shapes work).

Change-Id: Ibb0710c721b9fb415d05acf54dd3d2b4d602156a
ndroid_view_GLES20Canvas.cpp
dbccd44a638ae8705a5b14bff8b2dd74abc26045 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
f8627d658d8c7edf43a49b5f6f2727ce64822f7e 21-Nov-2013 Derek Sollenberger <djsollen@google.com> Merge "framework changes needed to support Skia at r12108."
ed79ff0026a44741237a6eb5e3810dbf5d765154 20-Nov-2013 Derek Sollenberger <djsollen@google.com> framework changes needed to support Skia at r12108.

Change-Id: I231e187e7d2db84fa06bd6783c9b49abba5b4e70
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/opengl/util.cpp
34d8519de44f301ce0b7196e248e58345d3cd35a 20-Nov-2013 George Mount <mount@google.com> Merge "Add animations along a Path."
c96c7b2e54965e30c8fb82295f1ca9f891ebd5e7 23-Aug-2013 George Mount <mount@google.com> Add animations along a Path.

Change-Id: If03bd10a3961ff874e33489e1253146b8dadca33
ndroid/graphics/Path.cpp
aff6ea9516ebb4c7e5bf487f7c867f31e8fbbd96 18-Nov-2013 Raph Levien <raph@google.com> Merge "Initial integration of Minikin to framework"
a033630e805c407080221e20b236b6054f324670 23-May-2013 Raph Levien <raph@google.com> Initial integration of Minikin to framework

With this patch, framework does at least some of its text rendering
using Minikin instead of TextLayoutCache. There's a lot of stuff broken
and not yet implemented, but the phone will boot.

Changes are hidden behind USE_MINIKIN, which should be set in
BoardConfig.mk for the brave. Without that, there are changes to
signatures in JNI methods and so on, but shouldn't be any visible
changes.

This commit also introduces a new abstraction for Typeface:

The new TypefaceImpl abstraction represents the functionality that
corresponds to a Java Typeface object. Currently it is backed by
SkTypeface, but in the migration to Minikin it is a FontCollection
combined with a FontStyle. This patch introduces a USE_MINIKIN
preprocessor switch, so there is no substantial change to existing
Skia-based code, but which lets us start replacing the implementation
with the Minikin version.

Change-Id: I532c4c2d32d4f4c1f349dc1db37caa112af587ea
ndroid.mk
ndroid/graphics/Canvas.cpp
ndroid/graphics/MinikinSkia.cpp
ndroid/graphics/MinikinSkia.h
ndroid/graphics/Paint.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/TypefaceImpl.cpp
ndroid/graphics/TypefaceImpl.h
e77a040f3adcdbfc8fea265126c2d27f73c01243 11-Nov-2013 John Reck <jreck@google.com> Merge "More refactoring"
3083579424785e55ca8f82856a6553ee983c3ffb 07-Nov-2013 John Reck <jreck@google.com> More refactoring

Merge GlRenderer and Gl20Renderer
Move GLRenderer to its own file
Move native methods from HardwareRenderer to GLRenderer

Change-Id: Ib4680b03dd98101b2a428062cc94774ff73baa75
ndroid.mk
ndroidRuntime.cpp
ndroid_view_GLRenderer.cpp
ndroid_view_HardwareRenderer.cpp
443e3a209ce0b323fb5165cfe091ffed5c13d565 08-Nov-2013 Elliott Hughes <enh@google.com> am 5c1aa4ef: am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) capget code."

* commit '5c1aa4efa9568d38cd2e8756a274bb30ddd590ba':
Remove incorrect (and unused) capget code.
5c1aa4efa9568d38cd2e8756a274bb30ddd590ba 08-Nov-2013 Elliott Hughes <enh@google.com> am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) capget code."

* commit 'ede7f9d3a39d87f12d58df495f28108784e9b588':
Remove incorrect (and unused) capget code.
42a4bb5730266f80585e67262c73505d0bfffbf8 08-Nov-2013 Elliott Hughes <enh@google.com> Remove incorrect (and unused) capget code.

Note that if you revert this change, the code it removes is incorrect,
and doesn't handle the top 32 bits of capabilities, one of which we're
already using: CAP_BLOCK_SUSPEND.

Bug: 11508244
Change-Id: Ice1f51334bce4941c6d24d6016450a2ebcf92886
om_android_internal_os_ZygoteInit.cpp
42ae5f3196966ce86930f384862ef71bfad16be3 08-Nov-2013 Michael Wright <michaelwr@google.com> Merge "Disable unused parameter warning for jni code"
1fc1834d66a4dba4c9620f1f5e8d3474783af591 06-Nov-2013 Michael Wright <michaelwr@google.com> Disable unused parameter warning for jni code

Change-Id: Iee2620186c8868d86ccb5f8d0fd6239079638e2d
ndroid.mk
765c9dfd54a57a062ce9702eb843b3d2dea716e7 08-Nov-2013 Svetoslav <svetoslavganov@google.com> am ebd616e8: am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-dev

* commit 'ebd616e88dab185bbf5b309d29c92a9eea9817e0':
Switch to the new Skia PDF generation APIs.
ebd616e88dab185bbf5b309d29c92a9eea9817e0 08-Nov-2013 Svetoslav <svetoslavganov@google.com> am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-dev

* commit '134631b9078df0b9277fb3b8319bf3b85f690727':
Switch to the new Skia PDF generation APIs.
35aacf2eb325d24c67d01f4dbd706ed26ab9e8c3 07-Nov-2013 Svetoslav <svetoslavganov@google.com> Switch to the new Skia PDF generation APIs.

The new Skia PDF generation APIs are a small extension to
the code that converts drawing commands to PDF (SkPDFDevice)
and this new functionality is exposed via new APIs. This
change switches to using these new APIs allowing us to
capitalize on the new perspective support for PDF
generation.

bug:11561776

Change-Id: Ief61f7ff6a5a22c27d3acbe99a48910cb679f594
ndroid/graphics/pdf/PdfDocument.cpp
d0d4b00ac5010bd3ea309a9a99147cf318a66cb7 06-Nov-2013 Victoria Lease <violets@google.com> am dd3776d6: am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev

* commit 'dd3776d673776785f32aa7d813871a38de906c5d':
Fix for Typeface.create(Typeface, style) semantics changed in KK
dd3776d673776785f32aa7d813871a38de906c5d 06-Nov-2013 Victoria Lease <violets@google.com> am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev

* commit '30a3ef6c85011ba82a777e6eef7f026323019f35':
Fix for Typeface.create(Typeface, style) semantics changed in KK
c89eaf916ad7e88565d2a15991432b22cd9099ff 06-Nov-2013 Victoria Lease <violets@google.com> Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev
4f0064fa3448c95e116a8d5646547a7a0fa8a432 06-Nov-2013 Raph Levien <raph@google.com> Fix for Typeface.create(Typeface, style) semantics changed in KK

This is a fix for bug 11553661. The "closest match" heuristic for
resolving a typeface when an exact match was not found changed between
JB MR2 and KK, resulting in loss of custom typeface when StyleSpan was
applied. This patch reinstates the logic that had been present. Also
reported externally as:
https://code.google.com/p/android/issues/detail?id=61771

Change-Id: Ia432fca07c4bf3b830ee2487cd8f5267a9cfb7ff
ndroid/graphics/Typeface.cpp
dd86ed9b578332661ecea50e20f91335a0151a88 29-Oct-2013 Elliott Hughes <enh@google.com> resolved conflicts for merge of ed84dea9 to master

Change-Id: Id214389f321f07aadd7a25e454a07863d7b128cb
ed84dea928a5a830a19b5bcab7ad05a7e92f3279 29-Oct-2013 Elliott Hughes <enh@google.com> am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."

* commit '8f592378a1ea7f31d57253dc202f42707ef4da36':
Fix a variety of small publicly-reported bugs.
0160bcbe531eebe882999f041348ce0182fc5bab 29-Oct-2013 Michael Wright <michaelwr@google.com> am 0116f08b: am 961cc671: am 3f836741: Merge "Speculatively schedule input consumption" into klp-dev

* commit '0116f08b387d237c334b10bb0266426e1ab3c793':
Speculatively schedule input consumption
0116f08b387d237c334b10bb0266426e1ab3c793 29-Oct-2013 Michael Wright <michaelwr@google.com> am 961cc671: am 3f836741: Merge "Speculatively schedule input consumption" into klp-dev

* commit '961cc6717a59eaff449acf1ddd3d3857d8c47430':
Speculatively schedule input consumption
3f8367415095651e9dd8e074f97659a1b633e900 29-Oct-2013 Michael Wright <michaelwr@google.com> Merge "Speculatively schedule input consumption" into klp-dev
c367d48c55e5a3fa0df14fd62889e4bb6b63cb01 29-Oct-2013 Elliott Hughes <enh@google.com> Fix a variety of small publicly-reported bugs.

Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp.
https://code.google.com/p/android/issues/detail?id=61556

Missing fclose in core/jni/android_os_Debug.cpp.
https://code.google.com/p/android/issues/detail?id=61546

Bad loop guards in core/jni/android_util_Process.cpp.
https://code.google.com/p/android/issues/detail?id=61557

Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552

Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553

Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554

Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
ndroid_os_Debug.cpp
ndroid_util_Process.cpp
62ce65d6edbc2c34c63b0e2f2fef9cb08e28c783 25-Oct-2013 Michael Wright <michaelwr@google.com> Speculatively schedule input consumption

With the new tuned vsync offset, vsyncs are likely to occur shortly
after the input is received, meaning we will empty the input queue,
and thus won't schedule input consumption until more input is
received. If an application then speculatively posts draw commands to
the main looper faster than 60 hz, it will eventually end up blocking
in eglSwapBuffers. Since we're blocking in eglSwapBuffers, we won't
even schedule consumption until after the current frame (8-16ms), and
it's entirely likely we won't actually get around to consuming input
until after the next frame (another 16 ms of latency). This means we
can often go 16-32ms without processing any input events, causing
very noticeable amounts of jank.

Rather than waiting for the next input event to schedule input
consumption, speculatively schedule it every frame as long as we've
consumed some motion batch during this frame.

Bug: 11398045
Change-Id: I25e46308e00e9f9de00a1d8906f6b0e0f2e845b4
ndroid_view_InputEventReceiver.cpp
560ce7738c359f9c3de555bc5eb3a414dcfb73f4 26-Oct-2013 Igor Murashkin <iam@google.com> am ee46eab2: am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev

* commit 'ee46eab2d026c9d22d6243cc945c150c877edc16':
Trace: add ALOGVs for easier debugging
ee46eab2d026c9d22d6243cc945c150c877edc16 26-Oct-2013 Igor Murashkin <iam@google.com> am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev

* commit 'ba111ef9b5ed90d6b5021086548fcc9c35953ecf':
Trace: add ALOGVs for easier debugging
c802a6614095660bccfd0cdf4f15404ad1863b76 26-Oct-2013 Igor Murashkin <iam@google.com> Merge "Trace: add ALOGVs for easier debugging" into klp-dev
ec1ae35c3e5456d2e0d3d262be528652526c9dbb 21-Oct-2013 Victoria Lease <violets@google.com> am ed82a648: am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSUB processing" into klp-dev

* commit 'ed82a6482806b44fa816b8224d8c06fbffcd5bd3':
Implement language-specific GSUB processing
ed82a6482806b44fa816b8224d8c06fbffcd5bd3 21-Oct-2013 Victoria Lease <violets@google.com> am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSUB processing" into klp-dev

* commit '54b7e3e81c39a5e94fd3dcd67cc4eba0f56351f2':
Implement language-specific GSUB processing
a80d6424987602cc3141d4cb4cdee21a54747691 21-Oct-2013 Victoria Lease <violets@google.com> Merge "Implement language-specific GSUB processing" into klp-dev
b1ce729fd055b6740ca112f6bf21cc82eba44701 18-Oct-2013 Elliott Hughes <enh@google.com> am 9f13a608: am 2ec939ba: am cf4c7bdd: Merge "Fix whitespace issues after casts."

* commit '9f13a608a703d4d12bbfc65472de766ece0037da':
Fix whitespace issues after casts.
9f13a608a703d4d12bbfc65472de766ece0037da 18-Oct-2013 Elliott Hughes <enh@google.com> am 2ec939ba: am cf4c7bdd: Merge "Fix whitespace issues after casts."

* commit '2ec939bac6263fefee2605d2b50136955cfcba6d':
Fix whitespace issues after casts.
f585655b4e301c31e59b994699d6de13ec8a672f 18-Oct-2013 Elliott Hughes <enh@google.com> am 4a5b3f0a: am ac6e036a: Merge "Remove dependency on jniGetNonMovableArrayElements."

* commit '4a5b3f0ad0b742fbdce154236b15185aaff87ffb':
Remove dependency on jniGetNonMovableArrayElements.
6ecb7a9a27c96e50525de2bc5c78391bf401bf72 18-Oct-2013 Mathieu Chartier <mathieuc@google.com> Fix whitespace issues after casts.

Change-Id: Ief3e50fbedd193e22509aac783f16ba1288908de
ndroid/graphics/Graphics.cpp
7384b428c445f07540fd6a80a21727d03be65d96 18-Oct-2013 Mathieu Chartier <mathieuc@google.com> Remove dependency on jniGetNonMovableArrayElements.

jniGetNonMovableArrayElements is not safe and is going to be deleted.

Change-Id: I6daae1e4ac9e01ca593cda522fdbeb774eef1eff
(cherry picked from commit 75a5038849cecf38aba72721272ff07cca09501f)
ndroid/graphics/Graphics.cpp
75a5038849cecf38aba72721272ff07cca09501f 18-Oct-2013 Mathieu Chartier <mathieuc@google.com> Remove dependency on jniGetNonMovableArrayElements.

jniGetNonMovableArrayElements is not compaction safe and is going
to be deleted.

Change-Id: I6daae1e4ac9e01ca593cda522fdbeb774eef1eff
ndroid/graphics/Graphics.cpp
db289e0ac752ea204cf88abd7c38bf9b27e294c9 18-Oct-2013 Jeff Sharkey <jsharkey@android.com> am 47938450: am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev

* commit '47938450b4d19f60edf774c8f451d53aa110ea0b':
Plumb through physical device UUID and label.
47938450b4d19f60edf774c8f451d53aa110ea0b 18-Oct-2013 Jeff Sharkey <jsharkey@android.com> am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev

* commit '306bb90d97da583c3728d35073ebcb7f7ca5c467':
Plumb through physical device UUID and label.
c7282eb8414f585603ff2aa7743323b36b754bba 18-Oct-2013 Igor Murashkin <iam@google.com> Trace: add ALOGVs for easier debugging

Bug: 11071158
Change-Id: I08764db1742267dad88fd61f22c21df9b70f879e
ndroid_os_Trace.cpp
5aca2b8dc4f4ff2d466a64587d06666c7bbd9749 17-Oct-2013 Jeff Sharkey <jsharkey@android.com> Plumb through physical device UUID and label.

vold now parse out UUID and label for inserted physical devices,
and reports them to framework. Add these to hidden StorageVolume
class for use by DocumentsUI and MediaProvider.

Remove last JNI method in FileUtils!

Bug: 11175082
Change-Id: I1cfcd1ade61767b103f693319ea2600008ee2e3c
ndroid.mk
ndroidRuntime.cpp
ndroid_os_FileUtils.cpp
e5a990867580b162d842dc7446f8eae9ae969aee 14-Oct-2013 Nick Kralevich <nnk@google.com> am 1f5da180: am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

* commit '1f5da180b425c2c568a47b7080345412d0078a13':
core: fix arithmetic on a pointer to void
1f5da180b425c2c568a47b7080345412d0078a13 14-Oct-2013 Nick Kralevich <nnk@google.com> am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

* commit 'f730b7599d18c49e132b73856697b7444cdf091f':
core: fix arithmetic on a pointer to void
01994c79f4e39db08a343fc9db23e771e670ef39 14-Oct-2013 synergydev <synergye@codefi.re> core: fix arithmetic on a pointer to void

Use char* instead of void* for this
pointer arithmetic. Fixes the following:

error: arithmetic on a pointer to void
buf = buf + offset;
~~~ ^

Change-Id: I6cfc92c9240fda66a52e780cda7820fdba76914a
om_google_android_gles_jni_GLImpl.cpp
986481d52aa313a4e3235f15f0f7ee8fc8048707 11-Oct-2013 Aravind Akella <aakella@google.com> am 554069ee: am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev

* commit '554069ee8c3a0c06d0849d198325eda9c0128097':
Fix registerListener and flush bugs.
554069ee8c3a0c06d0849d198325eda9c0128097 11-Oct-2013 Aravind Akella <aakella@google.com> am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev

* commit 'd18920f5c9c3f4662ceb8f729805ae06761cf108':
Fix registerListener and flush bugs.
d9b09fa97eb47b051bbfab8cc491143198fbc9bc 11-Oct-2013 Aravind Akella <aakella@google.com> Merge "Fix registerListener and flush bugs." into klp-dev
32f2e6267481bd4b81b71061c539748143342fef 10-Oct-2013 Mike Lockwood <lockwood@google.com> Handle null thread name more gracefully in javaCreateThreadEtc()

Change-Id: I67bebb05736b717e0da60da36839985be08cf1d6
ndroidRuntime.cpp
4bdc37d315a6dbdcf2425e70423ec43d7b74e102 02-Oct-2013 Aravind Akella <aakella@google.com> Fix registerListener and flush bugs.

1) Fix registerListener to return false when called with a Trigger sensor. Correct java documentation.
2) Remove reservedFlags and FlushCompleteListener parameters from the public API.
3) Create SensorEventListener2 which extends SensorEventListener and has the onFlushCompleted callback.
3) Change flush(Sensor) API to flush(SensorEventListener).

Change-Id: I56ce4e0b6e329483e129a14ad7e8a0cd35665ffe
Bug: 10894703
ndroid_hardware_SensorManager.cpp
7d8589c1562519f2fe644647b83a525b321e44be 09-Oct-2013 George Mount <mount@google.com> Merge "Support for multiple value animations."
677726b376402937f53ddb192dc97078b92b7c9e 08-Oct-2013 Raph Levien <raph@google.com> Implement language-specific GSUB processing

This patch allows HarfBuzz to select language-specific features based
on the language. It is a fix for bug 7004056.

Change-Id: I63f01b9580250728b900f19f357cefdeb9d36c72
ndroid/graphics/TextLayoutCache.cpp
6034ee95a0d703f535391728c6e63451b7ca35b1 08-Oct-2013 Leon Scroggins III <scroggo@google.com> am 25c4e987: am 97b707d5: am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev

* commit '25c4e98711d29a69db96526e3c72604f7dbb1005':
Do not attempt to decode NULL SkData.
25c4e98711d29a69db96526e3c72604f7dbb1005 08-Oct-2013 Leon Scroggins III <scroggo@google.com> am 97b707d5: am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev

* commit '97b707d5eb34d5e76e2b820c158b14fe47631be0':
Do not attempt to decode NULL SkData.
80a058b3033200835f86ee0e61367a87a470cde8 08-Oct-2013 Leon Scroggins III <scroggo@google.com> Merge "Do not attempt to decode NULL SkData." into klp-dev
f65183fd76aa82eedaebcbde9395a5dba42fc969 07-Oct-2013 Leon Scroggins III <scroggo@google.com> Do not attempt to decode NULL SkData.

NewFromFD fails if mmap fails. In that case, it returns a NULL
SkData. SkMemoryStream handles NULL input by calling SkData::NewEmpty,
which is not threadsafe. If the SkMemoryStream were to get some
busted SkData, its call to read might fail. Sidestep this problem
by not creating the SkMemoryStream if the SkData is NULL, skipping
the call to SkData::NewEmpty.

BUG:11028218
Change-Id: Id70299bef1c85ffb5d17102fdb5ea071b0bee68a
ndroid/graphics/BitmapFactory.cpp
4eed52944c0fcb3afa7369aba60fb5c655580286 30-Aug-2013 George Mount <mount@google.com> Support for multiple value animations.

Bug 2805977
Support for multi-value setters in ObjectAnimator.

Change-Id: I7854dfcb82372afc6d9afb4c50a289ff9d41574e
ndroid_animation_PropertyValuesHolder.cpp
28ff40405dc30d82d53472f2b28436234e8c9f65 05-Oct-2013 Victoria Lease <violets@google.com> am e8200873: am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev

* commit 'e8200873598cf872062126b86edd933620f594aa':
reset mShapingPaint's SkTypeface before we use it
e8200873598cf872062126b86edd933620f594aa 05-Oct-2013 Victoria Lease <violets@google.com> am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev

* commit '0d5a719dc7f2ca8726f670af3c5b9fdee614ab07':
reset mShapingPaint's SkTypeface before we use it
b088c9e0dd2d66a181b9cfbf7f9ba8e27bde0922 05-Oct-2013 Victoria Lease <violets@google.com> Merge "reset mShapingPaint's SkTypeface before we use it" into klp-dev
8450a6ef8b4282491857fd5af6574019983ec243 05-Oct-2013 Victoria Lease <violets@google.com> reset mShapingPaint's SkTypeface before we use it

Harfbuzz works in TTF glyph-space, but most of Skia works in
fallback glyph-space. shapeFontRun() helpfully calculates the
baseGlyphCount needed to convert between the two, but leaves
mShapingPaint's SkTypeface set to the specific TTF being shaped
rather than the original SkTypeface that was requested. Needless
to say, this causes all manner of horrific malady when glyph
indices are calculated in one glyph-index-space and then applied
to another.

To fix this issue, I reset mShapingPaint's SkTypeface when done
with the Harfbuzz shaping operation so that the baseGlyphCount only
gets applied once.

Change-Id: Ia886f89d667634e15e5fc8d7af443c9d1ba89622
ndroid/graphics/TextLayoutCache.cpp
6588538ec5121e058cf3f93df95c07d8b793abb6 04-Oct-2013 Dianne Hackborn <hackbod@google.com> am 7c55154d: am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev

* commit '7c55154d4776896c3e602f4739fd5b9cbbf1dba4':
Implement issue #11050739: Show swapped out RAM
7c55154d4776896c3e602f4739fd5b9cbbf1dba4 04-Oct-2013 Dianne Hackborn <hackbod@google.com> am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev

* commit '80e75d3946fd4c5cdd913d217df1b8d32ec464ee':
Implement issue #11050739: Show swapped out RAM
8883ced18ac25199330843964634fdf70647a127 03-Oct-2013 Dianne Hackborn <hackbod@google.com> Implement issue #11050739: Show swapped out RAM

Add "swapped out" field to mem info everywhere.

Change-Id: I89abe8eb0e91fa5c193da93815dc592593c8a3c8
ndroid_os_Debug.cpp
81f87faeded7ee48a30379e59682a5a65f94f4b3 02-Oct-2013 Dianne Hackborn <hackbod@google.com> am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev

* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
Fix issue #10948509: Crash in procstats when there is no data
e2a67ac27bb258ee3f28e9651a01632bc9bdf942 01-Oct-2013 Dianne Hackborn <hackbod@google.com> am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev

* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
Fix issue #10948509: Crash in procstats when there is no data
cb4285537b1bf67b5a248e509d5fe41a6f49282e 26-Sep-2013 Dianne Hackborn <hackbod@google.com> Fix issue #10948509: Crash in procstats when there is no data

Not dealing with the case where there is a null list.

Also fixed some bugs I found while looking at this:

- When resetting the stats, we would use a newly computed time stamp
for the total durations rather than the one we used to reset the
proc/service entries. This would result in them being able to be
slightly > 100%.
- There was a bug in how we split a single process state into its
per-package representation, where we would but the cloned process
state into the new package's entry (instead of properly for its
own package entry), to be immediately overwritten by the new
process state we make for that package. This could result in
bad data for processes that have multiple packages.
- There was a bug in resetting service stats, where we wouldn't
update the overall run timestamp, allowing that time to sometimes
be > 100%.
- There was a bug in computing pss data for processes with multiple
packages, where the pss data was not distributed across all of the
activity per-package process states.
- There was a bug in computing the zram information that would cause
it to compute the wrong value, and then never be displayed.

Finally a little code refactoring so that ProcessState and ServiceState
can now share a common implementation for the table of duration values.

Change-Id: I5e0f4e9107829b81f395dad9419c33257b4f8902
ndroid_os_Debug.cpp
cfd9a2c1db1c7b5c3461149f05017208dfa1bce1 28-Sep-2013 Elliott Hughes <enh@google.com> am 917f88f0: am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."

* commit '917f88f033aafb89cbb77feda2932cf88698a56a':
Regenerate all the OpenGL stubs.
917f88f033aafb89cbb77feda2932cf88698a56a 28-Sep-2013 Elliott Hughes <enh@google.com> am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."

* commit '82e5d8758a61f1a49700f67f6ddb69219528bad2':
Regenerate all the OpenGL stubs.
9c437bcb57a7cf5eb3bd1a85a4f2322fd34f50a3 26-Sep-2013 Adam Lesinski <adamlesinski@google.com> am 7979e170: am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev

* commit '7979e170b5bdfb6922d758f2c66f06829b6b5d9b':
Add Graphics alloc tracking via memtrack
7979e170b5bdfb6922d758f2c66f06829b6b5d9b 26-Sep-2013 Adam Lesinski <adamlesinski@google.com> am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev

* commit 'bde988ade5f75c3d241422dce2ee4124871fab53':
Add Graphics alloc tracking via memtrack
bde988ade5f75c3d241422dce2ee4124871fab53 26-Sep-2013 Adam Lesinski <adamlesinski@google.com> Merge "Add Graphics alloc tracking via memtrack" into klp-dev
f3647c7bdc1733d28e878564facf49108c0dc2c6 26-Sep-2013 Dianne Hackborn <hackbod@google.com> am f9ad7b9d: am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev

* commit 'f9ad7b9d92f0464bdffb36f4b9f9f63292ba9863':
Fix issue #10903002: com.facebook.katana keeps itself in A Services
f9ad7b9d92f0464bdffb36f4b9f9f63292ba9863 26-Sep-2013 Dianne Hackborn <hackbod@google.com> am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev

* commit '66a9b2d7392a7f6334b5fe23d00ba718f3fa1851':
Fix issue #10903002: com.facebook.katana keeps itself in A Services
cbd9a52f256087426feb19ac6e51eff772e81375 25-Sep-2013 Dianne Hackborn <hackbod@google.com> Fix issue #10903002: com.facebook.katana keeps itself in A Services

Now when memory low, if a service's process is above
a selected pss, then the process is not allowed to go
in to the service a list.

Also simplified the normal meminfo details dump to not
include the shared dirty and shared clean sizes by
default, since these can be very confusing. You will
still get to see them with the "-a" flag.

Finally some small steps to better managing service
processes in the LRU list, so hopefully we can some
day be better about letting them drop down in the list
when there isn't really much interesting happening in
the process. Not yet used at this point.

Change-Id: I654bfd6d05de2a63120185ebb15ffda8cbeb5dac
ndroid_os_Debug.cpp
5b4ef81f2b79dd5d597b1681de4d0311d46693aa 23-Sep-2013 Adam Lesinski <adamlesinski@google.com> Add Graphics alloc tracking via memtrack

Any OpenGL memory reported by /proc/pid/smaps will not be included
in the GPU GL memory count and will be considered Unknown. This is
an artifact of how some memory reporting is done in libmemtrack
and some is done in this module.

bug:10294768

Change-Id: Id8fb63b2e86520f4dbc8410573a509e66b96b13b
ndroid.mk
ndroid_os_Debug.cpp
428d3fcbe3596b18549cdada9fc68a29f159a946 25-Sep-2013 Elliott Hughes <enh@google.com> Regenerate all the OpenGL stubs.

Bug: https://code.google.com/p/android/issues/detail?id=60390
Change-Id: I2e6f210178f656a5f08a1fcd4239581d680329a6
ndroid_opengl_EGL14.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
ndroid_opengl_GLES30.cpp
om_google_android_gles_jni_GLImpl.cpp
5380709c780fae2f3bf9862d40176b86b0de85df 24-Sep-2013 Derek Sollenberger <djsollen@google.com> am fad41c8f: am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev

* commit 'fad41c8fd1024a8257bdced18dbcbc9cd67e407a':
Fix Java API error where requesting another style for a provided family fails
fad41c8fd1024a8257bdced18dbcbc9cd67e407a 24-Sep-2013 Derek Sollenberger <djsollen@google.com> am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev

* commit '5db1f5aaacf01e176f2463c212da72eaafc79165':
Fix Java API error where requesting another style for a provided family fails
fe8e21fd80f0594f2be341643ef52d2095eda3b6 23-Sep-2013 Derek Sollenberger <djsollen@google.com> Fix Java API error where requesting another style for a provided family fails

Internally the API uses the same code path as SkTypeface::CreateFromName which
returns NULL if the requested style is not supported by the existing family.
However, the existing Java API expects that we return the default font in the
requested style so this CL ensures that we do.

bug: 10860066
Change-Id: Ide3a0cc24015e97fa35aef283b42e7d7d11edd9c
ndroid/graphics/Typeface.cpp
f045a893ca4772b214679c0a9e6755d243ff751e 21-Sep-2013 Glenn Kasten <gkasten@google.com> am dd47d78a: am 543de874: Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev

* commit 'dd47d78a5e2b8d6f383e79fd4531fd38403d5614':
Revert "Workaround for slow AudioRecord destructor"
dd47d78a5e2b8d6f383e79fd4531fd38403d5614 21-Sep-2013 Glenn Kasten <gkasten@google.com> am 543de874: Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev

* commit '543de8746e1c238f81a863f687d258ad86f5ef95':
Revert "Workaround for slow AudioRecord destructor"
543de8746e1c238f81a863f687d258ad86f5ef95 21-Sep-2013 Glenn Kasten <gkasten@google.com> Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev
6e1e8b17c575bc6a115bcbbec47040d5f58740b7 20-Sep-2013 Svetoslav <svetoslavganov@google.com> am c0e1ae01: am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev

* commit 'c0e1ae0176b2ce23ea1b19883507cd920712289a':
Move PdfDocument to android.graphics.pdf
1f6ec93f1243e4e46b1867e8d26d83d4aee24c53 20-Sep-2013 Glenn Kasten <gkasten@google.com> am 0fbb7484: am 9d53e30e: Merge "Workaround for slow AudioRecord destructor" into klp-dev

* commit '0fbb74847aec65b057cad019d86617d9703c7c7a':
Workaround for slow AudioRecord destructor
29baa03ba582a6a831a5aa463eba6261461592a3 20-Sep-2013 Leon Scroggins III <scroggo@google.com> am 2360ada9: am 57989c0e: Merge "Skip writing zeroes to java allocated memory." into klp-dev

* commit '2360ada939b0abd4a6cca794288ff06701219f19':
Skip writing zeroes to java allocated memory.
84fa15ce63a5259823b4fe79e04b4a7cc8be98ad 20-Sep-2013 Eino-Ville Talvala <etalvala@google.com> am f3c61c66: am a84ca8a3: Merge "TextureView/GLES20Canvas: Support synchronous GLConsumers" into klp-dev

* commit 'f3c61c6657fb2a25e5ac04e55ce0d7eefabc07f7':
TextureView/GLES20Canvas: Support synchronous GLConsumers
f69cd6787d39188ea7bc41fe7d54314fb18eb214 20-Sep-2013 Glenn Kasten <gkasten@google.com> Revert "Workaround for slow AudioRecord destructor"

This reverts commit 8d87d7ba113ad90685f1d2669e65251a9b422a5a.

Change-Id: I78cbe73959d29fc0ff3153268503ae685cd0995c
ndroid_media_AudioRecord.cpp
8fa4e29f167af0d0541f496e1bb24f6a6af75e9d 20-Sep-2013 Derek Sollenberger <djsollen@google.com> am 23b7bc1b: am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev

* commit '23b7bc1b4409ca5844db5f17992b906aa3e63927':
Update SkTypeface::CreateFromName to handle NULL if familyName does not match
c0e1ae0176b2ce23ea1b19883507cd920712289a 20-Sep-2013 Svetoslav <svetoslavganov@google.com> am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev

* commit 'facc08c7757cef56da6d10e78ce99ef7949700e3':
Move PdfDocument to android.graphics.pdf
facc08c7757cef56da6d10e78ce99ef7949700e3 20-Sep-2013 Svetoslav <svetoslavganov@google.com> Merge "Move PdfDocument to android.graphics.pdf" into klp-dev
0fbb74847aec65b057cad019d86617d9703c7c7a 20-Sep-2013 Glenn Kasten <gkasten@google.com> am 9d53e30e: Merge "Workaround for slow AudioRecord destructor" into klp-dev

* commit '9d53e30e5eaf53cb0bd57319e02025ba7182bba3':
Workaround for slow AudioRecord destructor
6811f4e92cbb64e72a0d13eb9b99b5894bd59c76 19-Sep-2013 Svetoslav <svetoslavganov@google.com> Move PdfDocument to android.graphics.pdf

1. Move PdfDocument to android.graphics.pdf.

2. Changed the PdfDocument as per API concil request.

3. Updated the documentation.

bug:10461180
bug:10552565
bug:10681585
bug:10552336

Change-Id: I08e15b34cf37bb064248c887e6f59808019cafe8
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/pdf/PdfDocument.cpp
ndroid/print/android_print_pdf_PdfDocument.cpp
9d53e30e5eaf53cb0bd57319e02025ba7182bba3 20-Sep-2013 Glenn Kasten <gkasten@google.com> Merge "Workaround for slow AudioRecord destructor" into klp-dev
8d87d7ba113ad90685f1d2669e65251a9b422a5a 20-Sep-2013 Glenn Kasten <gkasten@google.com> Workaround for slow AudioRecord destructor

Bug: 10816117
Change-Id: If59028bc7dc7abb84e1e3642c721c2629653631f
ndroid_media_AudioRecord.cpp
2360ada939b0abd4a6cca794288ff06701219f19 20-Sep-2013 Leon Scroggins III <scroggo@google.com> am 57989c0e: Merge "Skip writing zeroes to java allocated memory." into klp-dev

* commit '57989c0e042c4f4e9362d875cf3df481243c0488':
Skip writing zeroes to java allocated memory.
57989c0e042c4f4e9362d875cf3df481243c0488 20-Sep-2013 Leon Scroggins III <scroggo@google.com> Merge "Skip writing zeroes to java allocated memory." into klp-dev
f3c61c6657fb2a25e5ac04e55ce0d7eefabc07f7 19-Sep-2013 Eino-Ville Talvala <etalvala@google.com> am a84ca8a3: Merge "TextureView/GLES20Canvas: Support synchronous GLConsumers" into klp-dev

* commit 'a84ca8a3ca2525855e705c13666bc5da2eaf3260':
TextureView/GLES20Canvas: Support synchronous GLConsumers
a3402c33c61b55e8d068b8b4e06aae158fd1af4e 19-Sep-2013 Eino-Ville Talvala <etalvala@google.com> TextureView/GLES20Canvas: Support synchronous GLConsumers

Always update to the newest available frame from a GLConsumer.
Otherwise, with a synchronous queue, rendering can fall behind and
eventually deadlock with producer.

Bug: 10830400
Change-Id: I7f1d752c80ae5dac892a26d82e86806c27f5d955
ndroid_view_GLES20Canvas.cpp
1ffe727c0616ca11092a45c3dfb94479fe55fdd9 19-Sep-2013 Leon Scroggins III <scroggo@google.com> Skip writing zeroes to java allocated memory.

If pixel memory was just allocated by Java, tell our decoders not
to write 0s, since the memory was initialized to 0. Likewise,
when drawing to a bitmap with memory just allocated by Java, do
not erase to 0.

Depends on a change to external/skia to add the new option on
image decoders:
https://googleplex-android-review.git.corp.google.com/362663

BUG:10016979
Change-Id: I9a3dc969870f8516e7d8495fe96d0a6b8225eda2
ndroid/graphics/BitmapFactory.cpp
23b7bc1b4409ca5844db5f17992b906aa3e63927 19-Sep-2013 Derek Sollenberger <djsollen@google.com> am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev

* commit 'a2c6209f6120d300cd28d97ec868b5cabb3ee1a9':
Update SkTypeface::CreateFromName to handle NULL if familyName does not match
89ec829908c8ff405b88b82f9e3a67bb53caefa3 18-Sep-2013 Derek Sollenberger <djsollen@google.com> Update SkTypeface::CreateFromName to handle NULL if familyName does not match

This is a multi-project change with a dependency on external/skia

bug: 10730965
Change-Id: Ida880a86ebd182a221333bbd85eaa30d047a1618
ndroid/graphics/Typeface.cpp
44f65cb5fd3b36dbf06f76da62cd6c495358985b 18-Sep-2013 Leon Scroggins III <scroggo@google.com> am 2e4e9889: am 3490228e: Merge "Use a native buffer for decoding images." into klp-dev

* commit '2e4e98895b17ef248f5071202a3610ac715eaf0e':
Use a native buffer for decoding images.
2e4e98895b17ef248f5071202a3610ac715eaf0e 18-Sep-2013 Leon Scroggins III <scroggo@google.com> am 3490228e: Merge "Use a native buffer for decoding images." into klp-dev

* commit '3490228efb949ad1979c89bb206a3697f5ffc185':
Use a native buffer for decoding images.
7315f1baee19476363235127bc1438e2a291fa15 11-Sep-2013 Leon Scroggins III <scroggo@google.com> Use a native buffer for decoding images.

Fixes BUG:10725383

Depends on https://googleplex-android-review.git.corp.google.com/#/c/357300/
in external/skia.

In the previous fix for BUG:8432093 and BUG:6493544
(https://googleplex-android-review.googlesource.com/#/c/346191/),
instead of calling mark on the provided input stream, we
copied the entire stream in native code (except in one case;
more details below), allowing rewind no matter how much of
the stream had been read. This was because two decoders
may rewind after reading an arbitrary amount of the stream:
SkImageDecoder_wbmp and SkImageDecoder_libjpeg.

It turns out that the jpeg decoder does not need this rewind
after arbitrary length (it is a failure recovery case, and
libjpeg has a default recovery we can use - the above referenced
CL in Skia uses the default).

Although the wbmp decoder could read any amount given a
stream with the "right" data, and then return false, such a
stream would not be a valid stream of another format, so it
is okay for this rewind to fail.

Further, the previous fix was inefficient in the common case
where the caller decodes just the bounds, resets, then decodes
the entire image (since we have copied the entire stream twice).
The copy also resulted in the crashes seen in BUG:10725383.

In this CL, buffer only the amount of input needed by
SkImageDecoder::Factory to determine the type of image decoder
needed. Do not mark the input stream provided by the caller,
so their mark (if any) can remain in tact. The new Skia class
SkFrontBufferedStream allows buffering just the beginning
of the stream.

core/jni/android/graphics/BitmapFactory.cpp:
Instead of calling GetRewindableStream (which has been removed),
call CreateJavaInputStreamAdaptor. Then wrap it in an
SkFrontBufferedStream, with a large enough buffer to determine
which type of image is used.

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h:
core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp:
Remove mark, markSupported, and rewind. CreateJavaInputStreamAdaptor
now turns an SkStream which is not rewindable. If the caller
needs rewind that needs to be handled differently (for example,
by using SkFrontBufferedStream, as is done in BitmapFactory and
Movie.
Remove RewindableJavaStream and GetRewindableStream.
Remove code specific to ByteArrayInputStream, which makes slow
JNI calls. Instead, depend on the caller to buffer the input
in the general case. There is no reason to special case this
stream (especially since we already have decodeByteArray).
Remove CheckForAssetStream, which is now always special cased
in Java.

core/jni/android/graphics/Movie.cpp:
Call CreateJavaInputStreamAdaptor and use an SkFrontBufferedStream.
Add a native function for decoding an Asset, and remove old
call to CheckForAssetStream.

graphics/java/android/graphics/BitmapFactory.java:
Write a helper function for decoding a stream to consolidate
common code.
Buffer enough of the input so that SkImageDecoder::Factory
can rewind after having read enough to determine the type.
Unlike the old code, do NOT mark the caller's stream. This is
handled in native code. The caller's mark (if any) is left alone.

graphics/java/android/graphics/Movie.java:
Check for an Asset stream before passing to native, and
call a native function for handling the asset directly.

BUG:6493544
BUG:8432093
BUG:10725383

Change-Id: Ide74d3606ff4bb2a8c6cdbf11bae3f96696f331a
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.h
ndroid/graphics/Movie.cpp
5387aa50298eeded52b14631e130996e551d9bca 16-Sep-2013 Leon Scroggins III <scroggo@google.com> am 3b8a7a04: am b693ef60: Merge "Do not allocate so much memory on the stack." into klp-dev

* commit '3b8a7a0402fbc2cb34e59a5757b8134c8bdadedc':
Do not allocate so much memory on the stack.
3b8a7a0402fbc2cb34e59a5757b8134c8bdadedc 16-Sep-2013 Leon Scroggins III <scroggo@google.com> am b693ef60: Merge "Do not allocate so much memory on the stack." into klp-dev

* commit 'b693ef60ef27538402d941702ab652a57f585158':
Do not allocate so much memory on the stack.
b693ef60ef27538402d941702ab652a57f585158 16-Sep-2013 Leon Scroggins III <scroggo@google.com> Merge "Do not allocate so much memory on the stack." into klp-dev
1cd9a73ac020bfb2db32da3c8e853c4a514be858 14-Sep-2013 Dianne Hackborn <hackbod@google.com> am f3b4cf7d: am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev

* commit 'f3b4cf7d01b68418dd652e201868d140de081bd8':
Implement #10749688: Improve low memory reporting
f3b4cf7d01b68418dd652e201868d140de081bd8 14-Sep-2013 Dianne Hackborn <hackbod@google.com> am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev

* commit '28eeb42012018bfa3cffc77e9a970e8f5c13f70b':
Implement #10749688: Improve low memory reporting
8e69257a9c7e9c1781e1f53d8856358ada38921d 11-Sep-2013 Dianne Hackborn <hackbod@google.com> Implement #10749688: Improve low memory reporting

This significantly reworks the logging we do when
all cached processes are killed:

- We now collect the list of processes in-place so we
have a snapshot of exactly when the low memory situation
happened.
- In that snapshot we include the key process state: oom
adj, proc state, adj reasons.
- The report then asynchronously collects pss information
for those processes.
- The ultimate data printed to the log looks like a mix
between the "dumpsys meminfo" and "dumpsys activity"
output. This code no longer uses "dumpsys meminfo"
itself, so some of that data is no longer included,
in particular pss organized by allocation type.

In doing this, I realized that the existing code that is
supposed to run "procstats" is not currently working. And
at that point I realized, really, when we are collecting
this pss data we'd really like to include all those native
processes using ghod-only-knows how much RAM. And guess
what, we have a list of processes available in
ProcessCpuTracker.

So we now also collect and print information for native
processes, and we also do this for "dumpsys meminfo" which
really seems like a good thing when we are printing summaries
of all pss and such.

I also improved the code for reading /proc/meminfo to be
able to load all the interesting fields from there, and
am now printing that as well.

Change-Id: I9e7d13e9c07a8249c7a7e12e5433973b2c0fdc11
ndroid_os_Debug.cpp
37b82e32324d0911aba897880c28b2fdedc3ec9a 13-Sep-2013 Leon Scroggins III <scroggo@google.com> Do not allocate so much memory on the stack.

Instead, allocate a smaller amount and grow as necessary.

BUG:10697851
Change-Id: Iec57a8a374a4a76a3770e241cf561d58f3c8e1dc
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
835b5f344ba63a6c0ac9c8a7cc40052134d59b8c 12-Sep-2013 Eric Laurent <elaurent@google.com> am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev

* commit 'e33b79ef373fd3db9de035b5ecf2137a0684a441':
Add HOTWORD as an AudioSource
1663033d96c8b12b648e6a39a52448ed06f9d948 12-Sep-2013 Eino-Ville Talvala <etalvala@google.com> am fb09a738: am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-dev

* commit 'fb09a7381992c6ca88b35d3d0103b38051174928':
Camera2: Immutable metadata
Camera2: Listener rework and other API updates
b78b4af70de731aebf76417b189bcf29376343aa 12-Sep-2013 Ruben Brunk <rubenbrunk@google.com> am fae16ab3: am 91019c9e: Merge "Remove dependency on JNIHelp header side effects." into klp-dev

* commit 'fae16ab39fe651f97bf86e6f5fe07f95342450aa':
Remove dependency on JNIHelp header side effects.
33069f40e5ba5a8c036671a67668b6bdfe6eb3a9 12-Sep-2013 Igor Murashkin <iam@google.com> am 47869404: am 2cad64c0: Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev

* commit '47869404cb8233c536a0a5d2c5ce4d0089e39882':
Surface: Change OutOfResourcesException to be a runtime exception
e33b79ef373fd3db9de035b5ecf2137a0684a441 12-Sep-2013 Eric Laurent <elaurent@google.com> am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev

* commit '95a181397dad3113b96e3cc7392a5b0f5d742f39':
Add HOTWORD as an AudioSource
95a181397dad3113b96e3cc7392a5b0f5d742f39 12-Sep-2013 Eric Laurent <elaurent@google.com> Merge "Add HOTWORD as an AudioSource" into klp-dev
fb09a7381992c6ca88b35d3d0103b38051174928 12-Sep-2013 Eino-Ville Talvala <etalvala@google.com> am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-dev

* commit 'ede3eeb72c9708df023bdfb369905ededd1ebb06':
Camera2: Immutable metadata
Camera2: Listener rework and other API updates
ede3eeb72c9708df023bdfb369905ededd1ebb06 12-Sep-2013 Eino-Ville Talvala <etalvala@google.com> Merge changes Ia6300c23,Idd2ae8ad into klp-dev

* changes:
Camera2: Immutable metadata
Camera2: Listener rework and other API updates
fae16ab39fe651f97bf86e6f5fe07f95342450aa 12-Sep-2013 Ruben Brunk <rubenbrunk@google.com> am 91019c9e: Merge "Remove dependency on JNIHelp header side effects." into klp-dev

* commit '91019c9ef34b2fb00a1c027a57d75ed9e0810df5':
Remove dependency on JNIHelp header side effects.
91019c9ef34b2fb00a1c027a57d75ed9e0810df5 12-Sep-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Remove dependency on JNIHelp header side effects." into klp-dev
70c2207c34cf0e6b3b383b1b1500ff5385aa51a6 27-Aug-2013 Eino-Ville Talvala <etalvala@google.com> Camera2: Immutable metadata

Make all camera metadata immutable once created; requests are
created using CameraRequest.Builder.

- Separate CameraMetadata implementation from interface
- Implement deep copying of metadata
- Requests/results/properties have-a native implementation

Bug: 10360518
Change-Id: Ia6300c237219d39f70c63156fa9ca666d951a36e
ndroid_hardware_camera2_CameraMetadata.cpp
47869404cb8233c536a0a5d2c5ce4d0089e39882 11-Sep-2013 Igor Murashkin <iam@google.com> am 2cad64c0: Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev

* commit '2cad64c0fbeba07bb546674e19cfb0166d7ec332':
Surface: Change OutOfResourcesException to be a runtime exception
2cad64c0fbeba07bb546674e19cfb0166d7ec332 11-Sep-2013 Igor Murashkin <iam@google.com> Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev
27569f24477785a28c087aeaa4671a2ac817a018 11-Sep-2013 Chris Craik <ccraik@google.com> am a180fd6d: am 68fbe16b: Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev

* commit 'a180fd6d67819a45bafc052581d43c0ecc1faccf':
Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref
a180fd6d67819a45bafc052581d43c0ecc1faccf 11-Sep-2013 Chris Craik <ccraik@google.com> am 68fbe16b: Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev

* commit '68fbe16ba0072326c1c6b09817f46ccdc5ee15b9':
Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref
68fbe16ba0072326c1c6b09817f46ccdc5ee15b9 11-Sep-2013 Chris Craik <ccraik@google.com> Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev
87eac99a21772ae56018cb81db6966557b459554 10-Sep-2013 Ruben Brunk <rubenbrunk@google.com> Remove dependency on JNIHelp header side effects.

Bug: 10680559
Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
ndroid_database_SQLiteConnection.cpp
ndroid_media_RemoteDisplay.cpp
ndroid_os_Debug.cpp
ndroid_view_KeyEvent.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_PointerIcon.cpp
ndroid_view_Surface.cpp
28a1222bafbc5b3124cc8a5c400024c037047699 11-Sep-2013 Chris Craik <ccraik@google.com> Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref

bug:10691404

Only ref the wrapped pixel refs, so that they are the single source of
correct refcount, since the wrapping pixel ref can change out from
underneath an SkBitmap.

Change-Id: I253b8737d2afdcc567a26725fa40b1d9ef0e6a92
ndroid/graphics/Graphics.cpp
357263da0ec2bc2be9d48c1becc3d94288c2f3ed 09-Sep-2013 Eric Laurent <elaurent@google.com> Add HOTWORD as an AudioSource

- This is a low-priority source that can be preempted by others
- This is required for scenarios where someone wants an alway-on
graceful microphone

Bug: 10640877.

Change-Id: Idb3577541103717cb713a7a93d3762ad2c2f4710
ndroid_media_AudioRecord.cpp
a86ab640f7bb0bf3cb4eaed80473ca8c5d131903 30-Aug-2013 Igor Murashkin <iam@google.com> Surface: Change OutOfResourcesException to be a runtime exception

- Deprecates SurfaceTexture.OutOfResourcesException, it wasn't used
- Make all JNI code throw only Surface.OutOfResourcesException
- Get rid of redundant SurfaceControl.OutOfResourcesException

Bug: 10566539
Change-Id: I58126260771b9ccff6a69c672ce7719b9f98138d
ndroid/graphics/SurfaceTexture.cpp
ce526bde4cba82bd72a6bfa814858cf9e7abd6e9 10-Sep-2013 Chris Craik <ccraik@google.com> am 47e6c4be: am 932e59fc: Merge "Create a pixelref wrapper for reused bitmaps" into klp-dev

* commit '47e6c4be1e1ef0f377aed7be773a070f3bfa4a13':
Create a pixelref wrapper for reused bitmaps
47e6c4be1e1ef0f377aed7be773a070f3bfa4a13 10-Sep-2013 Chris Craik <ccraik@google.com> am 932e59fc: Merge "Create a pixelref wrapper for reused bitmaps" into klp-dev

* commit '932e59fc2aae145a8930e4a2da4885f607fd47aa':
Create a pixelref wrapper for reused bitmaps
932e59fc2aae145a8930e4a2da4885f607fd47aa 10-Sep-2013 Chris Craik <ccraik@google.com> Merge "Create a pixelref wrapper for reused bitmaps" into klp-dev
fe3b9727ba05f4c6655c403fdb2ac1f6bbed2db5 09-Sep-2013 Leon Scroggins III <scroggo@google.com> am a818f0fa: am 91c8111d: Merge "Register jni objs in CreateJavaOutputStreamAdaptor" into klp-dev

* commit 'a818f0face6eeee24795c80f8c3b66169e75ffba':
Register jni objs in CreateJavaOutputStreamAdaptor
a818f0face6eeee24795c80f8c3b66169e75ffba 09-Sep-2013 Leon Scroggins III <scroggo@google.com> am 91c8111d: Merge "Register jni objs in CreateJavaOutputStreamAdaptor" into klp-dev

* commit '91c8111d3ae654e7646e9cbcf486554a8810b47c':
Register jni objs in CreateJavaOutputStreamAdaptor
cd0ba71aa942f35fcdb26808b86f20073b8aff92 06-Sep-2013 Chris Craik <ccraik@google.com> Create a pixelref wrapper for reused bitmaps

Reused bitmaps may gain a color table when reused, so we wrap a new
AndroidPixelRef that holds the color table around the old.

bug:10608305
Change-Id: I35288edf3158cfda21c500360ad1abdf5654af8d
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
91c8111d3ae654e7646e9cbcf486554a8810b47c 09-Sep-2013 Leon Scroggins III <scroggo@google.com> Merge "Register jni objs in CreateJavaOutputStreamAdaptor" into klp-dev
1775ebb76fecaad3c708d9a022aa49d50f50c333 07-Sep-2013 Dianne Hackborn <hackbod@google.com> am b6459eb2: am 3e1fdd9e: Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev

* commit 'b6459eb25f0593561389d7cb3da38a4f960cce14':
Implement issue #10550827: watching gpu memory for occam_svelte
b6459eb25f0593561389d7cb3da38a4f960cce14 07-Sep-2013 Dianne Hackborn <hackbod@google.com> am 3e1fdd9e: Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev

* commit '3e1fdd9ed02f95fd2dfefc36b34754f2ede1a2af':
Implement issue #10550827: watching gpu memory for occam_svelte
d0d7eaf129b48ea04c06902a11c2a4f74056d76c 06-Sep-2013 Leon Scroggins III <scroggo@google.com> Register jni objs in CreateJavaOutputStreamAdaptor

Write a registration function and call it in AndroidRuntime,
which calls FindClass/GetFieldID only once per class/method.
Use NewGlobalRef for classes that will be checked against later.

BUG:10612755
Change-Id: I25541da1b7bb1cd53a1579ea84c4620e1901310f
ndroidRuntime.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
37c99432625e2adeb50baf25f471abc8481b2b3e 06-Sep-2013 Dianne Hackborn <hackbod@google.com> Implement issue #10550827: watching gpu memory for occam_svelte

Well, it would work if the published file permissions gave the
system process access to them. :(

Change-Id: I99e0c506f52c212384b20a042dcdd35516cf49c2
ndroid_os_Debug.cpp
7bb90e9a0b43fcee241d1ae1157fb78928364d3b 05-Sep-2013 Glenn Kasten <gkasten@google.com> am 44b4fd2c: am 04c58e9e: Merge "Java API for AudioTrack timestamps" into klp-dev

* commit '44b4fd2cb9440dfbd5eca5758d9cabcdeaab0a1b':
Java API for AudioTrack timestamps
44b4fd2cb9440dfbd5eca5758d9cabcdeaab0a1b 05-Sep-2013 Glenn Kasten <gkasten@google.com> am 04c58e9e: Merge "Java API for AudioTrack timestamps" into klp-dev

* commit '04c58e9ec12c65c15738ba456f18a1f36416b0cc':
Java API for AudioTrack timestamps
04c58e9ec12c65c15738ba456f18a1f36416b0cc 05-Sep-2013 Glenn Kasten <gkasten@google.com> Merge "Java API for AudioTrack timestamps" into klp-dev
948c2e6ff46d65942277f2e0e9ce0c038972b9d8 04-Sep-2013 Glenn Kasten <gkasten@google.com> Java API for AudioTrack timestamps

This change adds android.media.AudioTimestamp and
android.media.AudioTrack.getTimestamp, with implementation, but hidden.

Change-Id: Ic314f04ff775baca05c57d19b5ea91133dbd0be1
ndroid_media_AudioTrack.cpp
ed59cbb2d8801d2d636c565df3421943254bb7c6 04-Sep-2013 Derek Sollenberger <djsollen@google.com> am 22f36b1a: am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev

* commit '22f36b1a8d9b6b4ecb27e3e35a79579fd9e9cff8':
Revert workaround for Skia bug now that Skia has been fixed.
22f36b1a8d9b6b4ecb27e3e35a79579fd9e9cff8 04-Sep-2013 Derek Sollenberger <djsollen@google.com> am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev

* commit '4c92f7cec761f1e6550a1cf3dd1305a186ce0e05':
Revert workaround for Skia bug now that Skia has been fixed.
2696797939fdf3b236635998b2739aba87e68ebb 04-Sep-2013 Derek Sollenberger <djsollen@google.com> Revert workaround for Skia bug now that Skia has been fixed.

bug: 7170836
Change-Id: If357767a5f66d539f775bce766e963b3d0df38bf
ndroid/graphics/Paint.cpp
567753c895a058e079d82a2884987c563275970b 04-Sep-2013 Aravind Akella <aakella@google.com> am ce025258: am 14abafa1: Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev

* commit 'ce025258ed12d1885150bae41f367248c0f65f97':
Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
ce025258ed12d1885150bae41f367248c0f65f97 04-Sep-2013 Aravind Akella <aakella@google.com> am 14abafa1: Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev

* commit '14abafa10853d979d184e2e934253aaded105137':
Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
b4c76b18a369d940f448bcc55d7245b6b30084dd 27-Jun-2013 Aravind Akella <aakella@google.com> Sensor batching. Implementation for registerListener(with batch support) and flush APIs.

Bug: 10109508
Change-Id: I6dfdd986bd8c3368cb568fa7d90abf9c03de9aef
ndroid_hardware_SensorManager.cpp
bfdd62323e7b3bb724c98730e4143afa3e4d9cb5 11-Jul-2013 Todd Poynor <toddpoynor@google.com> ActivityManagerService use lmkd low memory killer daemon

Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
ndroid_util_Process.cpp
9f5da6ff42854537f16f7b02554c333b8acc2151 03-Sep-2013 Leon Scroggins III <scroggo@google.com> am 050129b4: am 3f8da091: Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev

* commit '050129b44ada6c105c317092056803b2a60cef74':
Change name back to CreateJavaInputStreamAdaptor.
050129b44ada6c105c317092056803b2a60cef74 03-Sep-2013 Leon Scroggins III <scroggo@google.com> am 3f8da091: Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev

* commit '3f8da09136087bd4f97c1e13e2fb7f8cfb81941c':
Change name back to CreateJavaInputStreamAdaptor.
3f8da09136087bd4f97c1e13e2fb7f8cfb81941c 03-Sep-2013 Leon Scroggins III <scroggo@google.com> Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev
c7797525084ba0ea441e394aa0a2ba35d6ff3320 03-Sep-2013 Leon Scroggins III <scroggo@google.com> Change name back to CreateJavaInputStreamAdaptor.

In order to fix open source builds, change WrapJavaInputStream's
name back to CreateJavaInputStreamAdaptor.

Remove FIXME in CopyJavaInputStream, and return a more generic type,
since the more specific type was only needed by a change in external/webkit,
which is being reverted since it depends on unreleased code.

Change-Id: I89b0431e357b509a2a0c17a624b31bd49d29070f
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.h
ndroid/graphics/Picture.cpp
e721327ee78fa819a0f208b0c4cdbc1776627dfa 30-Aug-2013 Jesse Hall <jessehall@google.com> am 64582578: am 655cff17: Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev

* commit '6458257836da466347f1d82a78c9c3ca3f16ec33':
EGL10.eglCreateWindowSurface should set producerControlledByApp
6458257836da466347f1d82a78c9c3ca3f16ec33 30-Aug-2013 Jesse Hall <jessehall@google.com> am 655cff17: Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev

* commit '655cff1799c3b7cce616676500e38bf43f83bc34':
EGL10.eglCreateWindowSurface should set producerControlledByApp
0fa257fe53bf520bdde93996a1901ce6bc3e1788 30-Aug-2013 Jesse Hall <jessehall@google.com> EGL10.eglCreateWindowSurface should set producerControlledByApp

Bug: 10521699
Change-Id: Ief3f01edf7dabc7996b7af1a756dfd00f0987f1a
om_google_android_gles_jni_EGLImpl.cpp
f7142e3e8bfba982ad73a7c7a6a992491b7cfb43 29-Aug-2013 Leon Scroggins III <scroggo@google.com> am af172519: am 4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev

* commit 'af1725190fbb8dd7c29726f8b7c072f3af734aed':
Replace stream wrap-function w/ more specific ones
af1725190fbb8dd7c29726f8b7c072f3af734aed 29-Aug-2013 Leon Scroggins III <scroggo@google.com> am 4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev

* commit '4b2993123bf9a1c56d0a16b032612834dd418520':
Replace stream wrap-function w/ more specific ones
4b2993123bf9a1c56d0a16b032612834dd418520 29-Aug-2013 Leon Scroggins III <scroggo@google.com> Merge "Replace stream wrap-function w/ more specific ones" into klp-dev
f5b43bdc6231df8b646d5bbb215e639230f37260 29-Aug-2013 Mike Klein <mtklein@google.com> SkTScopedPtr -> SkAutoTDelete in Android

Change-Id: I8f0312f34e112d302b05852c31308a43967e7a3f
ndroid/graphics/BitmapRegionDecoder.cpp
ca32021b43f326af7d3f4ae041f8db297f98a518 20-Aug-2013 Leon Scroggins III <scroggo@google.com> Replace stream wrap-function w/ more specific ones

The current stream wrapper returns a potentially incorrect
value for a call to getLength(), is typically copied into
another stream (not always in the same way), and doesn't
always take advantage of its underlying data (like when it
is an Asset). The overall goal of this CL is to provide the
caller with something that is ready to use, depending on
what is asked for. If a copy is desired, the copy is made
before being returned to the caller.

core/jni/android/graphics/Bitmap.cpp:

Include SkStream.h, since it is no longer included by
CreateJavaOutputStreamAdaptor's header file.

core/jni/android/graphics/BitmapFactory.cpp:

Pass an SkStreamRewindable to decoding functions, as Skia
decoders will be updated to only take an SkStreamRewindable
(which makes more sense because they require rewinding).

Call the more specific GetRewindableStream to get a
rewindable stream.

Remove copyAssetToStream which has been moved to Utils.

In nativeDecodeAsset, pass forcePurgeable as allowPurgeable
in doDecode. Technically the old code worked, but it checked
the BitmapOptions again.

Remove getFDSize, which is no longer used.

core/jni/android/graphics/BitmapRegionDecoder.cpp:

Remove redundant buildSkMemoryStream. nativeNewInstanceFromStream
now calls CopyJavaInputStream, which handles the copy.

Copy the Asset directly, using common code, rather than creating
an AssetStreamAdaptor to copy.

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp:
core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h:

Provide new interfaces to access data from a Java InputStream.
The new interfaces are more specific about what type of stream
is desired.

Use forward declarations where possible.

Remove doSize, which gives a misleading answer to the question
of how long the entire stream is.

TODO: Only call FindClass etc once.

core/jni/android/graphics/Movie.cpp:

Check for an asset stream, and use it if possible. Then call
GetRewindableStream if there is not an asset.
Remove the memory leak. Call DeleteLocalRef to delete the
allocated memory.

core/jni/android/graphics/Picture.cpp:

Call the new interface.

core/jni/android/graphics/Utils.cpp:
core/jni/android/graphics/Utils.h:

Make AssetStreamAdaptor inherit from SkStreamRewindable so it
can be passed to Skia decoding functions once they require it.

Add CopyAssetToStream (moved from BitmapFactory.cpp) so it can
be used by multiple files.

graphics/java/android/graphics/BitmapFactory.java:

Remove the call to mark, which is now done natively.

Remove the BufferedInputStream. Mark/reset is now handled
by native code.

Allow decodeStream to handle a FileInputStream by using the
FileDescriptor, if it is seekable. In decodeFileDescriptor,
call nativeDecodeStream instead of decodeStream so this new
functionality will not loop.

Call setDensityFromOptions in decodeFileDescriptor.

graphics/java/android/graphics/BitmapRegionDecoder.java:

Remove the BufferedInputStream. Mark/reset is now handled
by native code.

TODO: ADD TESTS!

Requires https://googleplex-android-review.googlesource.com/#/c/344317/

BUG=https://b.corp.google.com/issue?id=8432093

Change-Id: I4419b70b3482325c98ecc673dbfc4613f1b18581
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.h
ndroid/graphics/Movie.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
28fe1ee579db0f50beca525f24b35de5e898fa34 27-Aug-2013 Chris Craik <ccraik@google.com> Forward compatibility fix

Change-Id: Ib031372d43881a9bb7af1e51fb2c7cf55e03a326
ndroid/graphics/GraphicsJNI.h
c6ad1f438461e4dc7e33a3f02ae4263799f6e954 27-Aug-2013 Leon Scroggins III <scroggo@google.com> am 8f564fbe: am 3871fdb9: Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev

* commit '8f564fbef3f8d1916662ededb33cb541802953d0':
Fix unpremul setting in BitmapRegionDecoder.
2e0ee66389fbc790fc711c2bc47be308581a31e8 27-Aug-2013 Chong Zhang <chz@google.com> am 9c70038c: am 5de1faca: Merge "wifi-display: add certification options" into klp-dev

* commit '9c70038cba0e265b553aa8cda9b133fd8866b692':
wifi-display: add certification options
8f564fbef3f8d1916662ededb33cb541802953d0 27-Aug-2013 Leon Scroggins III <scroggo@google.com> am 3871fdb9: Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev

* commit '3871fdb966846d9026500696e48ccc64349eedb4':
Fix unpremul setting in BitmapRegionDecoder.
9c70038cba0e265b553aa8cda9b133fd8866b692 27-Aug-2013 Chong Zhang <chz@google.com> am 5de1faca: Merge "wifi-display: add certification options" into klp-dev

* commit '5de1faca166e2241cf9ad1981007caa947a1fc1b':
wifi-display: add certification options
2cc409ae52a2a50f54195579a000e98f403de9be 26-Aug-2013 Leon Scroggins III <scroggo@google.com> Fix unpremul setting in BitmapRegionDecoder.

requireUnpremultiplied should be the opposite of BitmapOptions.
inPremultiplied, as in BitmapFactory.

Fixes CTS tests.

BUG=10490308

Change-Id: I21b8c057ccdc9b35c69730a7fe8c3b6802ee6dd8
ndroid/graphics/BitmapRegionDecoder.cpp
1f3ecaae6303d5ee6c5ca8499262c9962f036365 04-May-2013 Chong Zhang <chz@google.com> wifi-display: add certification options

When certification mode is enabled:

- Pass wfd session info to wifi display settings

- Allow sink to connect to source

- Add interface in display manager for pausing/resuming session

- Add interface in WifiP2pManager for setting lc, oc and starting
autonomous GO

Note that we're compliant regardless of certification mode, but
some confusing options (eg. allowing incoming connection from
sink) we want to hide when not being tested.

Bug: 9371882
Change-Id: Icc7dcae4e046453796cfa03f5f197055fabf234b
ndroid_media_RemoteDisplay.cpp
2ef42b3d254537caafdb263361b7fcc6f79699d2 22-Aug-2013 Eino-Ville Talvala <etalvala@google.com> am 1de3ac64: am d5ea6e11: Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev

* commit '1de3ac646315f625a58b9009f21f74965dec1765':
Camera1: Rename setPreviewTexture to ...Target for clarity
1de3ac646315f625a58b9009f21f74965dec1765 22-Aug-2013 Eino-Ville Talvala <etalvala@google.com> am d5ea6e11: Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev

* commit 'd5ea6e113cfd573859f0966ae71cdcfd3d5e5f51':
Camera1: Rename setPreviewTexture to ...Target for clarity
d5ea6e113cfd573859f0966ae71cdcfd3d5e5f51 22-Aug-2013 Eino-Ville Talvala <etalvala@google.com> Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev
d7a90ca50c333008857c41118446cfc6b55735f9 21-Aug-2013 Elliott Hughes <enh@google.com> The VM handles blocking SIGPIPE.

We don't need this any more.

Bug: 10211309

(cherry picked from commit 437e76208d451e7954699ead8931d0fe147bb07d)

Change-Id: I97b3ab4f65a70eacca2fbe95cfb11b1cc85c4021
ndroidRuntime.cpp
554d5e11b5669c96eefa593f0e7731c56d1ef1e3 22-Aug-2013 Elliott Hughes <enh@google.com> am ac26d9db: am 3d86d3b6: am f39abeb4: Merge "The VM handles blocking SIGPIPE."

* commit 'ac26d9db0e10f3c7849bbf78220d55f213ab6e2a':
The VM handles blocking SIGPIPE.
ac26d9db0e10f3c7849bbf78220d55f213ab6e2a 22-Aug-2013 Elliott Hughes <enh@google.com> am 3d86d3b6: am f39abeb4: Merge "The VM handles blocking SIGPIPE."

* commit '3d86d3b633105695881fbfa55332fc8aa09d0573':
The VM handles blocking SIGPIPE.
7b29779d970deb13c41e4a762df9c16544d83a05 21-Aug-2013 Eino-Ville Talvala <etalvala@google.com> Camera1: Rename setPreviewTexture to ...Target for clarity

Bug: 10312644
Change-Id: I4bee90428cb932a12d73dad89e91bb2ef492dc86
ndroid_hardware_Camera.cpp
437e76208d451e7954699ead8931d0fe147bb07d 21-Aug-2013 Elliott Hughes <enh@google.com> The VM handles blocking SIGPIPE.

We don't need this any more.

Bug: 10211309
Change-Id: I8be0071d50296974e3861f8af9d2bae4f5678d5a
ndroidRuntime.cpp
8a31b860711b296537c89d58f0fcc727e6398aa7 21-Aug-2013 Mathieu Chartier <mathieuc@google.com> am 577a0759: am 67a4d32c: Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev

* commit '577a0759838fc2d3ae45b19a78d4cb8ce45c491a':
Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".
577a0759838fc2d3ae45b19a78d4cb8ce45c491a 21-Aug-2013 Mathieu Chartier <mathieuc@google.com> am 67a4d32c: Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev

* commit '67a4d32c0d722e5daec48918211bf1474ab2f667':
Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".
67a4d32c0d722e5daec48918211bf1474ab2f667 21-Aug-2013 Mathieu Chartier <mathieuc@google.com> Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev
ed2515e853a0440555d76b2b935086211107dcef 21-Aug-2013 Chris Craik <ccraik@google.com> am 908d9bfa: am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev

* commit '908d9bfafd576755d06f0566fc4cac3831476f63':
Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
908d9bfafd576755d06f0566fc4cac3831476f63 21-Aug-2013 Chris Craik <ccraik@google.com> am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev

* commit 'dc70afaeabd7acacc07e8852b15cc820cd07531c':
Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
1abf5d62429e5a9329520b2f7c2b5a5e7a8e72ec 16-Aug-2013 Chris Craik <ccraik@google.com> Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap

bug:2248948

Change-Id: I8fdd649332667598504a1076d5a447572bd53086
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapFactory.h
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_emoji_EmojiFactory.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_SurfaceControl.cpp
e6c2241f7a1e6bca3fd8d5d0c49abbbd348366b7 21-Aug-2013 Mathieu Chartier <mathieuc@google.com> Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".

Bug: 10131789

Change-Id: Ib9962f7becdedd71f48123a4720dcce1d09abb9d
ndroidRuntime.cpp
e435e646fe4baabe140f490dacf346f8721dee0d 20-Aug-2013 Andy McFadden <fadden@android.com> am 272f8bba: am 59210de1: Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev

* commit '272f8bba47dadcf560cf1a11749cf61cbe367a83':
Avoid crashing in unlockCanvasAndPost
272f8bba47dadcf560cf1a11749cf61cbe367a83 20-Aug-2013 Andy McFadden <fadden@android.com> am 59210de1: Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev

* commit '59210de17c840bb60fc1c623250df8f39ebba132':
Avoid crashing in unlockCanvasAndPost
59210de17c840bb60fc1c623250df8f39ebba132 20-Aug-2013 Andy McFadden <fadden@android.com> Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev
ed55c8db1c0d47492423fc54f4b0dd5cd585e593 20-Aug-2013 Andy McFadden <fadden@android.com> Avoid crashing in unlockCanvasAndPost

It's possible to update the native surface pointer while the
surface is locked (via lockCanvas). This leads to a surprise when
the surface is unlocked. Avoid the surprise by tracking the
locked surface separately.

Bug 10289713

Change-Id: I84346c952be859bbd91ceae7df07b91dabe0948e
ndroid_view_Surface.cpp
c993c61c02152ecf5576e5d351c2b688221f5835 20-Aug-2013 Eric Laurent <elaurent@google.com> am d2bb835d: am 9f78d309: Merge "AudioSystem: new audioflinger restart detection" into klp-dev

* commit 'd2bb835dd8ac2ef1ac3625cb76559c568dfeb3fc':
AudioSystem: new audioflinger restart detection
d2bb835dd8ac2ef1ac3625cb76559c568dfeb3fc 20-Aug-2013 Eric Laurent <elaurent@google.com> am 9f78d309: Merge "AudioSystem: new audioflinger restart detection" into klp-dev

* commit '9f78d309dc99668d5b06ca18af8b854be44cedfc':
AudioSystem: new audioflinger restart detection
dfb881f96af7898151940a4bbc52e45e6043d38b 18-Jul-2013 Eric Laurent <elaurent@google.com> AudioSystem: new audioflinger restart detection

Add a specific method to AudioSystem for AudioService to poll
for AudioFlinger service restart instead of relying on current
callback mechanism which is flaky.

Bug: 9693068.
Change-Id: Id21d142a22b257205700201978cce1cb8b15180d
ndroid_media_AudioSystem.cpp
c9031a09395ed72263fffebf4375fe45b1a70967 20-Aug-2013 Romain Guy <romainguy@google.com> Merge "Make color filters mutable"
13656743cc21bac43676568314366497346713ee 20-Aug-2013 Romain Guy <romainguy@google.com> Make color filters mutable

Change-Id: I3d035d24a75e09db13d136a22bd7dbd326d0ce36
ndroid/graphics/ColorFilter.cpp
6f1fda90a9beace9b90a6bee5f3fe4a3d4dcdb52 20-Aug-2013 Eric Laurent <elaurent@google.com> am 51d9652d: Merge "Revert "Fix media server restart detection mechanism"" into klp-dev

* commit '51d9652d45ec0a22b625a8529479ba61cdb55314':
Revert "Fix media server restart detection mechanism"
539719a7af34be96743a4f408aedf6437f441bbf 18-Jul-2013 Eric Laurent <elaurent@google.com> Revert "Fix media server restart detection mechanism"

This reverts commit ca35e4823459189dd57ec5472caf3a617d03b568.
ndroid_media_AudioSystem.cpp
8367eddcaf246ef7eac3c8f9d51a0862d7ebdba5 19-Aug-2013 Elliott Hughes <enh@google.com> am b9348927: Merge "Remove a fixed-length buffer in the wifi code." into klp-dev

* commit 'b93489270d41bbaf513f0018164ab8b6d6ca9519':
Remove a fixed-length buffer in the wifi code.
b93489270d41bbaf513f0018164ab8b6d6ca9519 19-Aug-2013 Elliott Hughes <enh@google.com> Merge "Remove a fixed-length buffer in the wifi code." into klp-dev
bef53cec5c6580535501d5a7305cc5223e9095b6 17-Aug-2013 Jeff Sharkey <jsharkey@android.com> am d1da6701: Merge "Richer ParcelFileDescriptor close events." into klp-dev

* commit 'd1da67017f0e1c8a47cb61050c8d7a753efc918c':
Richer ParcelFileDescriptor close events.
d1da67017f0e1c8a47cb61050c8d7a753efc918c 17-Aug-2013 Jeff Sharkey <jsharkey@android.com> Merge "Richer ParcelFileDescriptor close events." into klp-dev
a11d574fc632158fe7d6cdd06bd3992c3817ca5c 09-Aug-2013 Elliott Hughes <enh@google.com> Remove a fixed-length buffer in the wifi code.

Also increase the size of the buffer we do need, simplify the code, and
fix some of the error checking.

(cherry-pick of 56968581ce77d3c0ee4286da6b0d5548874934b9.)

Bug: http://code.google.com/p/android/issues/detail?id=36193
Bug: 10363597
Change-Id: Iadd2ee25469a37ddf06c3292b675a4cbcc4ecfa3
ndroid.mk
ndroidRuntime.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_net_wifi_WifiNative.cpp
da5a3e12f4f8f965c57d6f93c74190f43ea233f3 11-Aug-2013 Jeff Sharkey <jsharkey@android.com> Richer ParcelFileDescriptor close events.

When reading from the end of a pipe or socket, there is no way to
tell if the other end has finished successfully, encountered an error,
or outright crashed. To solve this, we create a second socketpair()
as a communication channel between the two ends of a pipe or
socket pair, sending a status code with details about why the
ParcelFileDescriptor was closed.

The writer end of a pipe or socket can closeWithError() to send a
message to the reader end. When the reader encounters EOF, they
call checkError() to detect if any error occured. This also detects
the case where the remote process died without sending a success
message.

This design is also extended to support regular files on disk, using
the communication channel above to detect various remote close events
or crashes, and delivering that event to a supplied OnCloseListener.

Replaces JNI with best-practice Libcore.os calls, and deprecates
some flags to match Context.

Bug: 10330121
Change-Id: I8cfa1e4fb6f57397667c7f785106193e0faccad3
ndroid.mk
ndroidRuntime.cpp
ndroid_os_ParcelFileDescriptor.cpp
2a9195d53daeee464cc07bb30135c38fa8121c7b 15-Aug-2013 Romain Guy <romainguy@google.com> am 3ed72781: Convert 4444 bitmaps to 8888 Bug #10206452

* commit '3ed72781a0b155a88e52c8d295f50daab8cfb9ae':
Convert 4444 bitmaps to 8888 Bug #10206452
3ed72781a0b155a88e52c8d295f50daab8cfb9ae 15-Aug-2013 Romain Guy <romainguy@google.com> Convert 4444 bitmaps to 8888
Bug #10206452

Change-Id: I928c9189b0d80741490b01a739959d8c2d5312a7
(cherry picked from commit a2cdb59b186d0ee51f110c1a7d358911573d48bf)
ndroid/graphics/Bitmap.cpp
40faf8dc65e1745a7e64314f6e06aa5a4292e8e6 15-Aug-2013 Jeff Sharkey <jsharkey@android.com> am e0475c82: Gracefully handle missing directories.

* commit 'e0475c828773aae42bf6bf54422df996d6b0fcef':
Gracefully handle missing directories.
e0475c828773aae42bf6bf54422df996d6b0fcef 15-Aug-2013 Jeff Sharkey <jsharkey@android.com> Gracefully handle missing directories.

Bug: 10295932
Change-Id: I9d18682d0ba57bf7f77d043ee8dab286ee80ba2a
ndroid_app_NativeActivity.cpp
aad62128100f0c1562f9c61a721b703480ed3772 13-Aug-2013 Michael Wright <michaelwr@google.com> am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev

* commit '51b4a40ef505962becb450f9f1b3170b11082dcb':
Expose vendor and product IDs for InputDevices
51b4a40ef505962becb450f9f1b3170b11082dcb 13-Aug-2013 Michael Wright <michaelwr@google.com> Merge "Expose vendor and product IDs for InputDevices" into klp-dev
54e56946d1aa3586e7b27fb63dfb7d3c1238c61d 13-Aug-2013 Michael Wright <michaelwr@google.com> Expose vendor and product IDs for InputDevices

Change-Id: I08665a41e474cbedd10b342eeae20d2ca7c03ac0
ndroid_view_InputDevice.cpp
76bf4d6dbee90268ecdf5eab63a9048fcaa8ff02 12-Aug-2013 Romain Guy <romainguy@google.com> am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev

* commit 'd1f6b6245c546f95a44d0252544ea9e2028a33b4':
Take text alignment into account to compue text bounds Bug #10258621
d1f6b6245c546f95a44d0252544ea9e2028a33b4 12-Aug-2013 Romain Guy <romainguy@google.com> Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev
b15b446f420b3ec69424dabcbcbc8cf019d6c8d6 12-Aug-2013 Romain Guy <romainguy@google.com> Take text alignment into account to compue text bounds
Bug #10258621

Change-Id: I91abf1829a1814410ce8c0c2c17d888031987f18
ndroid_view_GLES20Canvas.cpp
00b581de0e3ef49ea10c5ff039d272df086750e6 10-Aug-2013 Colin Cross <ccross@android.com> am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev

* commit 'dd78a0fb0d537e0bb2aa5b7a7b58bce55bb57029':
parse named anonymous memory for dumpsys meminfo
795a7decc2e9e547e0cf6291567d427a2a60517a 10-Aug-2013 Elliott Hughes <enh@google.com> am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred."

* commit '5adfb21e3a3eb6e4628a2f1c8976e6d781492933':
Remove possible leak when exception occurred.
a0b320a66f6467107edac57f3f41471d9d550507 09-Aug-2013 Elliott Hughes <enh@google.com> Merge "Remove possible leak when exception occurred."
cb4728f247e3793e7fc1baa031290aa732bb77a7 09-Aug-2013 Colin Cross <ccross@android.com> parse named anonymous memory for dumpsys meminfo

Treat [anon:libc_malloc] as native heap and anything else that
starts with [anon: as unknown.

Bug: 10212959
Change-Id: Ifd120ae86e7a22291383df37d2b96f9f2dcd68b9
ndroid_os_Debug.cpp
5893a97cbf398ca3e1bff5444454343d94e25a4c 09-Aug-2013 Mathias Agopian <mathias@google.com> Merge "fix-up dependencies to gl headers" into klp-dev
e3eae73abb5e429d9747f9c36ab025219e68bb26 09-Aug-2013 Mathias Agopian <mathias@google.com> fix-up dependencies to gl headers

Change-Id: I9f176847587db1f9ccee2bc425106d277ffceee6
ndroid/graphics/SurfaceTexture.cpp
8a65f5b87139b90b35bae88e46ae442934ff6483 09-Aug-2013 Jeff Sharkey <jsharkey@android.com> Merge "Allow packages.list access with new GID." into klp-dev
184a0100abc431fc3d6d8dd1b20212b84958cada 11-Jul-2013 Jeff Sharkey <jsharkey@android.com> Allow packages.list access with new GID.

The FUSE daemon is using packages.list to map from package name to
appId after it drops permissions, so create a new "package_info" GID
to grant read access.

Also switches FileUtils to use Libcore.os.

Change-Id: I9451ca4e90e8a985526805c6df0888a244a1db36
ndroid_os_FileUtils.cpp
427733280b85663587bf0e61174103b0a3423691 09-Aug-2013 Jonathan Dixon <joth@google.com> Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev
667fe1039feae068d3333de8fb7115313f4a517b 03-Aug-2013 Jonathan Dixon <joth@google.com> Refactor Canvas.drawPicture() to delegate to Picture

Bug: 9814370

To allow WebView.capturePicture() to return a subclass, we need to
ensure the subclass is always consulted when being drawn into a canvas.

Change-Id: Ia0357f95b6fafb3ac81e6bcfaef05739e619897a
ndroid/graphics/Canvas.cpp
09335703572db7d6a9b43f3aba32074e473d6a0f 09-Aug-2013 Jeff Brown <jeffbrown@google.com> Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev
6a6bc216d15293886ad088bb0ca99aadb7df85dc 08-Aug-2013 Jesse Hall <jessehall@google.com> Use new ISurfaceComposer::destroyDisplay method

Bug: 10191053
Change-Id: I3ecc6880db4a4c77c6db4e8b50faa9b4021d17c6
ndroid_view_SurfaceControl.cpp
c249c2cc6b601ed1ff063f1748ba4399b9270209 08-Aug-2013 Vinit Deshapnde <vinitd@google.com> Use a single socket to communicate with supplicant

This helps to prepare for future updates from external sources.

Bug: 9298955

Change-Id: I4c63ad5fc1ea3564aab38cfce955de19bad75c0c
(cherry picked from commit fb40801ed8c217ae01082fb1cbd0c30bbf5532ac)
ndroid_net_NetUtils.cpp
ndroid_net_wifi_Wifi.cpp
d840526196108956c9e62e880b3f749cec11a5ec 07-Aug-2013 Glenn Kasten <gkasten@google.com> Merge "Update audio comments"
24f43c9d2c9c81bfdeeec0c201703cccfba14c51 07-Aug-2013 Mathias Agopian <mathias@google.com> put TextureView back to async mode

it's probably not strictly needed, but it guarantees
that the app won't deadlock itself while using a
TextureView -- this could happen if it blocked
in View.onDraw() waiting for the producer

this mimics the behavior TextureView always had.

Change-Id: I453339237a48dea91a10840b8cc0f5d2d84d1520
ndroid_view_TextureView.cpp
86fad47e68e344b19fabeab1156c5e6742d8dfad 22-Jun-2012 Glenn Kasten <gkasten@google.com> Update audio comments

Change-Id: If470efd77ed886da8d83a1b427c132bad77e668b
ndroid_media_AudioRecord.cpp
52a9a10b6b8c7b7a9f97777541841b94d4fd9754 02-Aug-2013 Mathias Agopian <mathias@google.com> Clearly separate consumer and producer interfaces

Bug: 9265647
Change-Id: Ic68e91788d0a05251e1d2fb9f9d4de403c7099bf
ndroid/graphics/SurfaceTexture.cpp
ndroid_hardware_Camera.cpp
ndroid_opengl_EGL14.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
om_google_android_gles_jni_EGLImpl.cpp
3c9c0918635143f373817fff1ce5131b995282cf 05-Aug-2013 Jean-Baptiste Queru <jbq@google.com> Revert "Revert "be more robust with handling unknown sensors""

This reverts commit 17548b3c70fe4f29d33367a61300f5323f5efe99.
ndroid_hardware_SensorManager.cpp
f7d280396c3ae4d76915cadeb29df556d6cd8d38 05-Aug-2013 Glenn Kasten <gkasten@google.com> Merge "Replace run-time PCM encodings by compile-time constants"
094010925a1b9db5238c495bea48c606e87d6e32 05-Aug-2013 Glenn Kasten <gkasten@google.com> Merge "Explicitly compare raw pointers to NULL"
4c59c54f77f2bac38f0225a5212772f5a3837cf2 05-Aug-2013 Glenn Kasten <gkasten@google.com> Merge "Remove dead code in AudioTrack JNI"
1e01943fe1876144f0c180163b5b39ee0a9a91ee 03-Aug-2013 Jean-Baptiste Queru <jbq@google.com> am ae311f4c: am 17548b3c: Revert "be more robust with handling unknown sensors"

* commit 'ae311f4c5f86779bb681b9fa8c1122dc174fea72':
Revert "be more robust with handling unknown sensors"
17548b3c70fe4f29d33367a61300f5323f5efe99 03-Aug-2013 Jean-Baptiste Queru <jbq@google.com> Revert "be more robust with handling unknown sensors"

This reverts commit 80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
ndroid_hardware_SensorManager.cpp
a667ff30e4fb6f741c2a930e7c31ef7e962d3b40 22-Jul-2013 Glenn Kasten <gkasten@google.com> Explicitly compare raw pointers to NULL

Change-Id: If76a15509d4121e391e28f26ca273cc00552efa8
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ec90545b5ff0e651154f8b9ab107b34e3a1124d8 25-Jul-2013 Dmitry Shmidt <dimitrysh@google.com> dhcp: Get mtu property from dhcp results

Change-Id: I1b032094e0945b27d98f7ac786247b7cc9d60131
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ndroid_net_NetUtils.cpp
80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6 04-Jul-2013 Mathias Agopian <mathias@google.com> be more robust with handling unknown sensors

- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
ndroid_hardware_SensorManager.cpp
9afc78d7ceb90c449e5dcee727cdbcb4f3ec7adc 01-Aug-2013 Glenn Kasten <gkasten@google.com> Replace run-time PCM encodings by compile-time constants

Change-Id: I2ab9103f3666d88eb1c7292307cc0a90a6482af6
ndroid_media_AudioRecord.cpp
844b0475ed26a1967919a3f119448c7c3159cb25 01-Aug-2013 Glenn Kasten <gkasten@google.com> Remove dead code in AudioTrack JNI

Change-Id: I17103485cdefdf2d1dbda8d1993e64c80d4e952e
ndroid_media_AudioTrack.cpp
e242e2f236939ace5930392763057ea1e4fb67cb 02-Aug-2013 Derek Sollenberger <djsollen@google.com> Merge "Changes needed to support Skia at r10377."
5827cb5059ed0eec4c73adf1acbd7ee47b2c5c8f 26-Jul-2013 Derek Sollenberger <djsollen@google.com> Changes needed to support Skia at r10377.

Change-Id: Id1e1c8c5938ee1a33c6fa3caabd2c28e89243eb4
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Picture.cpp
2a805f930463ece57bc0d0fd8dee7f5d50681b22 01-Aug-2013 Elliott Hughes <enh@google.com> resolved conflicts for merge of 368d81fe to master

Change-Id: I4bc59cd9a54cbc1b62ac135cf86dc73ac85968d5
6d4b1e24aef5b74b40de4d8f6e63c21874ce8e3a 01-Aug-2013 Elliott Hughes <enh@google.com> Switch Process.myTid over to the libcore JNI too.

Change-Id: I80eaecff014fabf809f4be3c9ee8b26aa64bf0cf
ndroid_util_Process.cpp
406ec15647b7664cadadde41dbaaa10e298c582b 30-Jul-2013 Jeff Hao <jeffhao@google.com> Replace native Process getpid/getuid with calls to libcore equivalents.

The Process natives were getting called were getting called while
handling a jdwp packet before the vm had a chance to register them.

(cherry-pick of 5bce6a308fc8a3c1e449cf905b8b6e8ace4ef3e2.)

Change-Id: Ia2b4f79b11e427283a712b2d0c52948f394640bf
ndroid_util_Process.cpp
d45c68dd24fe3dd510af5a9591b5e2f509b56772 31-Jul-2013 Dianne Hackborn <hackbod@google.com> Resource memory optimization.

Don't ever need the cached UTF-16 string conversions on the
device. Don't need to create those strings, and don't need
to create the lookup array for them at all. This requires
fixing all of the remaining places in the platform where we
interacted with the resources with the blind assumption that
the strings are UTF-16.

Change-Id: Ia0e5a150499837471e494e85b23b05fa06e0cf1d
ndroid_util_AssetManager.cpp
2f1a2e423e0fbb64467d6fcfa4e82c6384f31210 26-Jul-2013 Eino-Ville Talvala <etalvala@google.com> Camera2 API: Rename package to android.hardware.camera2

Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_camera2_CameraMetadata.cpp
ndroid_hardware_photography_CameraMetadata.cpp
8018c8db8221aa604b3c083e09d173cc27e53d83 30-Jul-2013 Romain Guy <romainguy@google.com> Add path ops API

Path ops can be used to combine two paths instances in a single path
object. The following operations can be used:

- Difference
- Reverse difference
- Union
- XOR
- Intersection

To use the API:

Path p1 = createCircle();
Path p2 = createRect();

Path result = new Path();
result.op(p1, p2, Path.Op.DIFFERENCE);

This code will subtract the rectangle from the circle and generate
the resulting path in "result."

Change-Id: Ic25244665b6691a7df0b0002a09da73d937b553b
ndroid/graphics/Path.cpp
e591b49de038a9942cbcc77540c03e85c96e3dcb 25-Jul-2013 Mathias Agopian <mathias@google.com> single buffer mode for SurfaceTexture

Bug: 9891035
Change-Id: Ib9cc2b64f7ff3c084ef1d7db442db8e7a24a923d
ndroid/graphics/SurfaceTexture.cpp
b251f3d0c619c37cc4e4b8d9f8b95eb377423190 26-Jul-2013 Mathias Agopian <mathias@google.com> get rid of HAL pixelformats 5551 and 4444

Change-Id: I6a6c4c656d80280eb85f90f99f35721ffca285df
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
9f213c8b648c06e781911c12d6c12f6a6606f6d2 26-Jul-2013 Mathias Agopian <mathias@google.com> Merge changes I487d4eef,Ia750811f

* changes:
get rid of PixelFormatInfo and simplify things
get rid of PIXEL_FORMAT_A_8
da85ef30821dcc534e071c6daeac002a991366bd 26-Jul-2013 Alex Ray <aray@google.com> Merge "libandroid_runtime: android_print needs NELEM def"
2ca204e4c0ba805c8fa0db79eeac9608d01cf5b4 26-Jul-2013 Mathias Agopian <mathias@google.com> get rid of PixelFormatInfo and simplify things

Change-Id: I487d4eef7db0095ace4babf5bb100a8769711257
ndroid.mk
ndroidRuntime.cpp
ndroid_graphics_PixelFormat.cpp
6f7b58917104916ee6afd6f246c251c1d7a2102a 26-Jul-2013 Mathias Agopian <mathias@google.com> get rid of PIXEL_FORMAT_A_8

Change-Id: Ia750811f08ddebdd5818da211fd03d61b75f8e97
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
om_google_android_gles_jni_EGLImpl.cpp
eb63254431f693a9ac1809d21c056804592eb6b6 25-Jul-2013 Colin Cross <ccross@android.com> Merge "replace cutils/logger.h with log/logger.h"
aff14e7008d65ae01c8552ea9d991c060f037534 25-Jul-2013 Alex Ray <aray@google.com> libandroid_runtime: android_print needs NELEM def

NELEM is defined many places in the framework, so this gives
android_print_PdfDocument.cpp one of them (JNIHelp.h). Without this
updating an upstream library (libskia) to remove an NELEM definition
causes this file to break.

Change-Id: Ifd033f9bd92b8902b6035ec5a8381cb9debd87ce
ndroid/print/android_print_pdf_PdfDocument.cpp
44bc18664985e845a2299f20b6392d378fad8b4d 24-Jul-2013 Colin Cross <ccross@android.com> replace cutils/logger.h with log/logger.h

and remove it from files that don't use it.

Change-Id: Ieb44a3f1f75c2d2b277f0d01ca926a92211e3fe6
ndroid_net_TrafficStats.cpp
ndroid_os_Parcel.cpp
ndroid_util_Binder.cpp
ndroid_util_EventLog.cpp
om_android_internal_net_NetworkStatsFactory.cpp
33c437df39029b70d4ffafac2ca31bd71eafd0c6 19-Jul-2013 Glenn Kasten <gkasten@google.com> 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
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
b1f5585f89c49690b1263daba419a394af58cc41 23-Jul-2013 Michael Wright <michaelwr@google.com> Merge "Add controller numbers for gamepads / joysticks"
ac6c78b6eef49f5c1ab2a346d90ccb99ccec18f4 17-Jul-2013 Michael Wright <michaelwr@google.com> Add controller numbers for gamepads / joysticks

Change-Id: I30ac9add6a2473a5ebd83a022c571545e61d1136
ndroid_view_InputDevice.cpp
922a8c0aa8b9ea278c6d5dc21498930dab47ea75 23-Jul-2013 Glenn Kasten <gkasten@google.com> Merge "Use switch in callback handler for events, and no EVENT_MORE_DATA"
5bae9df4e886439a3a1e63b60d191e2d59e9c4eb 23-Jul-2013 Glenn Kasten <gkasten@google.com> Merge "Replace run-time PCM encodings by compile-time constants"
6824a143c90a2cd05c5f4f05830fa53527e856b8 23-Jul-2013 Glenn Kasten <gkasten@google.com> Merge "Remove unused includes"
9ad3afe52e9c85e958a3b3e1bce4477f15379151 23-Jul-2013 Glenn Kasten <gkasten@google.com> Merge "Return correct status for android.media.AudioRecord.read(short[]...)"
6944165014bf026e24aafe0cb359d7aad66bea7b 22-Jul-2013 Igor Murashkin <iam@google.com> Merge "camera2 api: marshal rect, size, string for metadata"
82c2d54b53d4b0f568a0ca8bf3d77ef6c2be0c12 22-Jun-2012 Glenn Kasten <gkasten@google.com> Remove unused includes

Change-Id: Id9842fe092aba2761c0641c76ad06749b2e1d9b3
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
5b1576ccbd9ab43d5e3238589cf5b43a4834447d 19-Jul-2013 Glenn Kasten <gkasten@google.com> Use switch in callback handler for events, and no EVENT_MORE_DATA

EVENT_MORE_DATA is no longer possible for the transfer mode used by Java.

Change-Id: Iffd98bca8adea7e066d5d069e82aa841e5c02330
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
70c17f47031a60b4ce8bf65df895e8d53f8846fe 22-Jul-2013 Glenn Kasten <gkasten@google.com> Merge "Inform AudioFlinger of device's low RAM attribute"
3f0af8be9e11112b03fc487bc2cc393286b923b5 19-Jul-2013 Glenn Kasten <gkasten@google.com> Return correct status for android.media.AudioRecord.read(short[]...)

This is similar to Change-Id: If43c63a4ceeb8fef98708f0d42496d2fb90a21fd

Bug: 9776374
Change-Id: I8d9e03b70ad55b4e1b3acfe26e31de8b374e2b43
ndroid_media_AudioRecord.cpp
d84feebba428d2f5adc021353ae24d3d2737220a 20-Jul-2013 Mathias Agopian <mathias@google.com> Merge "update to new Consumer APIs"
7caaeeb6a8a4c4d299b14617c643f96a5055f2f7 20-Jul-2013 Michael Wright <michaelwr@google.com> Merge "Add input device property for buttons under touchpads"
9d2bc860d3f8468422ea2b5de9fa9d4ada4fbbe5 16-Jan-2012 Glenn Kasten <gkasten@google.com> Replace run-time PCM encodings by compile-time constants

Simplify the code to use the constant values of ENCODING_PCM_16BIT and
ENCODING_PCM_8BIT from AudioFormat.java.

There is already a comment in AudioFormat.java saying that these symbols
need to be kept in sync with this file, and they are public static final
so they can never be changed.

This change is similar to commit 3d301cb2b1d9e61c3af8a8b0b9db370d3d7abf77
or Change-Id I6cb10ac511df4845610454d1659e64d9195d67cd

Change-Id: Ib62d8cfeb6261ffd362dba3600d593e2a268d76a
ndroid_media_AudioTrack.cpp
3710db80d4b9e573d775790e4c9a2ab6e062201e 19-Jul-2013 Igor Murashkin <iam@google.com> camera2 api: marshal rect, size, string for metadata

Change-Id: Iec2fd823bc92394da44abb32ca38a625d7638e3d
ndroid_hardware_photography_CameraMetadata.cpp
757ec7837db85eae675cda5cfaf94040268327fd 19-Jul-2013 Mike Lockwood <lockwood@google.com> Merge "LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET"
ef5498edf62eb439b4c3f980422c3513e23b5ee9 19-Jul-2013 Chris Craik <ccraik@google.com> Merge "Add reconfigure method to Bitmap"
fd116ad1ab02f6060a0b2201f018317fa32e28b4 13-Jul-2013 Glenn Kasten <gkasten@google.com> Inform AudioFlinger of device's low RAM attribute

to help it configure it's memory

Bug: 9798886
Change-Id: Ia2df59cfcb76f5ff48cca92b107915e2adde899c
ndroid_media_AudioSystem.cpp
230e0120a4d7bb83f01c41760256a3c5e3f5a585 18-Jul-2013 Eric Laurent <elaurent@google.com> Merge "Fix media server restart detection mechanism"
ca35e4823459189dd57ec5472caf3a617d03b568 18-Jul-2013 Eric Laurent <elaurent@google.com> Fix media server restart detection mechanism

There is a flaw in the mechanism used by AudioService
to detect the fact that mediaserver process did crash and restart.
It relies on polling AudioFlinger service until a successful
connection triggers a callback into AudioSystem JNI and then into AudioService.
But if another thread in system_server process, not attached to the
JNI environment, reconnects before AudioService, the callback is called in
a detached context and dropped.

The fix consists in attaching the thread executing the callback
and detaching it if needed.

Bug: 9693068.
Change-Id: I184308b12a3f87653bf818abf0159e0e45a66ef0
ndroid_media_AudioSystem.cpp
7ddd11035b25b0a2dbf09f9d9efd3fca701f0a79 21-May-2013 Michael Wright <michaelwr@google.com> Add input device property for buttons under touchpads

Bug: 8990644
Change-Id: I2cc10457595a861b707c0394bd435d60efa8405b
ndroid_view_InputDevice.cpp
c84d203da21c3ae3ded94c79c035d41b27809b3b 13-Jul-2013 Chris Craik <ccraik@google.com> Add reconfigure method to Bitmap

bug:9797004

Grants a means to reuse a bitmap's allocation for different
width/height/Config without going through
BitmapFactoryOptions.inBitmap

Change-Id: Ib62319f3bd96c451fc1636288adf06a8275b4e3d
ndroid/graphics/Bitmap.cpp
e32632682ca9207bd247ca27012cf670b5c23f54 17-Jul-2013 Mathias Agopian <mathias@google.com> update to new Consumer APIs

Change-Id: I8649f3add40e0aeeeb0396b98e2cb93312e8e990
ndroid/graphics/SurfaceTexture.cpp
ndroid_view_Surface.cpp
e7d309a929bf87a5752cd1fb2d48c72e47a671a2 16-Jul-2013 Mike Lockwood <lockwood@google.com> LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET

Also replaced some JNI code with libcore IO support

Change-Id: I091e2b6b8dd1fec554936c1ffab29e50f0979e4a
ndroid_net_LocalSocketImpl.cpp
cdae0f3c608ed5aee5ddbdf9c54ac86a5619e64b 16-Jul-2013 Dianne Hackborn <hackbod@google.com> Merge "Switch proc stats to use new process state constants."
78b6a8615cf6c2c062187c23ced0c6fe6046498e 16-Jul-2013 Glenn Kasten <gkasten@google.com> Merge "AudioTrack write() on a full buffer while paused returns 0"
0a880d040203ddbd89253d4a80ea03c10a5e8798 16-Jul-2013 Rom Lemarchand <romlem@google.com> Merge "Increase swappiness of processes when memcgroups are enabled"
377d7bd543235148bf6dc956776007345b4d09c1 16-Jul-2013 Mathias Agopian <mathias@google.com> Merge "always pass the BufferQueue explicitely to consumers"
11093285c2af1d0842009079c7bd68478566b5e4 16-Jul-2013 Jeff Brown <jeffbrown@google.com> Completely remove skia dependency from libinput.

Change-Id: I943d0e5b7bb6e922803e14b8c3a3564e82fc5e63
ndroid_view_MotionEvent.cpp
48a3d98d1ff9c07dc5bf446fa50899ac6017b7a0 16-Jul-2013 Jeff Brown <jeffbrown@google.com> Fix PDK build.

Change-Id: Ide48ea30c2f7f24d20ab6fcdc47c806ac1f133ee
ndroid_view_MotionEvent.cpp
c8230519728b14065effd3b7d4eca273ff86160c 14-Jul-2013 Dianne Hackborn <hackbod@google.com> Switch proc stats to use new process state constants.

These new constants are a better mapping to the kind of
information that procstats is wanting to collect about
processes. In doing this, the process states are tweaked
to have a bit more information that we care about for
procstats.

This changes the format of the data printed by procstats,
so the checkin version is bumped to 2. The structure is
the same, however the codes for process states have all
changed. The new codes are, in order of precedence:

p -- persistent system process.
t -- top activity; actually any visible activity.
f -- important foreground process (ime, wallpaper, etc).
b -- important background process
u -- performing backup operation.
w -- heavy-weight process (currently not used).
s -- background process running a service.
r -- process running a receiver.
h -- process hosting home/launcher app when not on top.
l -- process hosting the last app the user was in.
a -- cached process hosting a previous activity.
c -- cached process hosting a client activity.
e -- cached process that is empty.

In addition, we are now collecting uss along with pss
data for each process, so the pss checkin entries now
have three new values at the end of the min/avg/max uss
values of that process.

With this switch to using process state constants more
fundamentally, I realized that they could actually be
used by the core oom adj code to make it a lot cleaner.
So that change has been made, that code has changed quite
radically, and lost a lot of its secondary states and flags
that it used to use in its computation, now relying on
primarily the oom_adj and proc state values for the process.

This also cleaned up a few problems -- for example for
purposes of determing the memory level of the device, if a
long-running service dropped into the cached oom_adj level,
it would start being counted as a cached process and thus
make us think that the memory state is better than it is.
Now we do this based on the proc state, which always stays
as a service regardless of what is happening like this, giving
as a more consistent view of the memory state of the device.

Making proc state a more fundamentally part of the oom adj
computation means that the values can also be more carefully
tuned in semantic meaning so the value assigned to a process
doesn't tend to change unless the semantics of the process
has really significantly changed.

For example, a process will be assigned the service state
regardless of whether that services is executing operations
in the foreground, running normally, or has been dropped to
the lru list for pruning. The top state is used for everything
related to activities visible to the user: when actually on
top, visible but not on top, currently pausing, etc.

There is a new Context.BIND_SHOWING_UI added for when system
services bind to apps, to explicitly indicate that the app
is showing UI for the system. This gives us a better metric
to determine when it is showing UI, and thus when it needs
to do a memory trim when it is no longer in that state. Without
this, services could get in bad states of continually trimming.

Finally, more HashSet containers have been changed to ArraySet,
reducing the temporary iterators created for iterating over
them.

Change-Id: I1724113f42abe7862e8aecb6faae5a7620245e89
ndroid_os_Debug.cpp
045ad910b7efb912725b4fdc9e710d9a1d3d9d65 15-Jul-2013 Geremy Condra <gcondra@google.com> Merge changes Ia6646363,I94389b64

* changes:
Add per user VPN support
Add NetworkUtil function for marking sockets
5534ba91ac0a0c9af822af62bcf92e2c5a8d6ec8 13-Jul-2013 Rom Lemarchand <romlem@google.com> Increase swappiness of processes when memcgroups are enabled

When memcgroups are enabled, migrate heavier and lower priority processes
to the sw memcgroup.

Change-Id: Iba07a723037a599736ef23dea16a30a26634428a
ndroid_util_Process.cpp
d63ee7565211d9a5dd4251079e3073886562b6d6 15-Jul-2013 Chris Craik <ccraik@google.com> Merge "Add webp to BitmapFactory.Options outMimetype"
b550929b7a4b0d5f9645a7a1ebf287d3f13cf1af 13-Jul-2013 Mathias Agopian <mathias@google.com> always pass the BufferQueue explicitely to consumers

Change-Id: I32e380979a3f4c6b1dfb440cc5b5c3d30d7607db
ndroid/graphics/SurfaceTexture.cpp
95587f9045443f8201d01db1d2bee8ae79edab8c 13-Jul-2013 Chris Craik <ccraik@google.com> Add webp to BitmapFactory.Options outMimetype

Change-Id: Id0d5b4d6c2c5b21fa0b31f1a5ada6275fdc38f44
ndroid/graphics/BitmapFactory.cpp
2dafbe78c12252073d94ba954efdc107d0d2deba 12-Jul-2013 Glenn Kasten <gkasten@google.com> Merge "Return correct status for android.media.AudioTrack.write(short[]...)"
12324b46049f9bcba9aa3d5fe7ae540d49a03076 11-Jul-2013 Chad Brubaker <cbrubaker@google.com> Add NetworkUtil function for marking sockets

Add NetworkUtil function for setting the SO_MARK field of sockets

Change-Id: I94389b64296d87ee928293f24a26f8dd08c3bf37
ndroid_net_NetUtils.cpp
6b217a4d2a82dabfefe38a1e26a1b9e89602232a 12-Jul-2013 Romain Guy <romainguy@google.com> Merge "Trace bitmaps decoding"
787e35793f47abdb6cc10f328cd58d362c7bd250 12-Jul-2013 Romain Guy <romainguy@google.com> Trace bitmaps decoding

Also remove dead code

Change-Id: Ie931b21858ccbe6ee4def54caf028fd2aed23317
ndroid/graphics/BitmapFactory.cpp
b519cc52ecba8f44da31173c9fc90a7b66d52b79 02-Jul-2013 Igor Murashkin <iam@google.com> camera2 api: Add CameraMetadata get/set support

* Add a Rational class
* Can get/set Key<T> where T is a primitive (or Rational)
* Can get/set Key<T> where T is a primitive array
* Can get/set Key<T> where T is an enum (synthetic constructor only)

Not implemented yet:
* When T is anything else, i.e. Rect, Size, etc

Bug: 9529161
Change-Id: I64438024a1e8327a38dd2672652626f0ffbb70e3
ndroid.mk
ndroid_hardware_photography_CameraMetadata.cpp
9b53db378aa76c3c24bd423113a46e696fa9af22 10-Jul-2013 Glenn Kasten <gkasten@google.com> AudioTrack write() on a full buffer while paused returns 0

Change-Id: I85d44452cd8a5f87c7fc9b6a0858569cb5293eb4
ndroid_media_AudioTrack.cpp
f7e0a370e7178f698605165fc362384a42f3547d 10-Jul-2013 Glenn Kasten <gkasten@google.com> Return correct status for android.media.AudioTrack.write(short[]...)

Bug: 9776374
Change-Id: If43c63a4ceeb8fef98708f0d42496d2fb90a21fd
ndroid_media_AudioTrack.cpp
d19db9a7c4427765dddd3210963c4277eee412f2 09-Jul-2013 Mathias Agopian <mathias@google.com> Merge "be more robust with handling unknown sensors"
b25c0efad2a2b4439f764776f5782f06542c67d7 04-Jul-2013 Mathias Agopian <mathias@google.com> be more robust with handling unknown sensors

- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
ndroid_hardware_SensorManager.cpp
0c20c3898a533b7b76f60827cb6ea02e17c5953d 02-Jul-2013 Chris Craik <ccraik@google.com> Use global references for Bitmap AndroidPixelRefs

bug:9621717

Because we're no longer holding onto Bitmaps Java side during
DisplayList lifetime, use global refs to keep the backing byte arrays
around.

Adds back bitmap buffer passing + native ref management removed by
3b748a44c6bd2ea05fe16839caf73dbe50bd7ae9

Adds back globalRef-ing removed by
f890fab5a6715548e520a6f010a3bfe7607ce56e

Change-Id: Ia59ba42f05bea6165aec2b800619221a8083d580
ndroid_view_GLES20Canvas.cpp
dae9aa3f3716e7f370ea0b5681d87a7297201b7f 02-Jul-2013 Oliver Woodman <olly@google.com> am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev

* commit '9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0':
Expose latency methods through AudioManager and AudioTrack.
9d3b1a424c5c61e24e9659d15fb353026a00d925 02-Jul-2013 Jeff Brown <jeffbrown@google.com> Move input library code to frameworks/native.

No longer compile libandroidfw as a static library on the device
since it already exists as a shared library. Keeping the static
library would force us to provide a static library version of
libinput for the device as well which doesn't make sense.

Change-Id: I3517881b87b47dcc209d80dbd0ac6b5cf29a766f
ndroid.mk
ndroid_app_NativeActivity.cpp
ndroid_view_InputChannel.cpp
ndroid_view_InputChannel.h
ndroid_view_InputDevice.cpp
ndroid_view_InputDevice.h
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputEventSender.cpp
ndroid_view_InputQueue.cpp
ndroid_view_KeyCharacterMap.cpp
ndroid_view_KeyCharacterMap.h
ndroid_view_KeyEvent.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_VelocityTracker.cpp
e64716ad01e52a9ce034369142c41d0333dd8dd4 26-Jun-2013 Oliver Woodman <olly@google.com> Expose latency methods through AudioManager and AudioTrack.

There's a longer term plan to fix audio/video sync, but
this gets the Java level to parity with the native level,
and allows applications in Java to achieve sync in the
same way as the native media player. APIs are left as hidden
for now.

Bug: 9587132
Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
cfc837f7fa43362b5049f648fe1bfdf5a010cc1c 28-Jun-2013 Dianne Hackborn <hackbod@google.com> Start really collecting PSS data for process stats.

The activity manager now uses some heuristics to try to
sample PSS data from processes so that it can get enough
data to over reasonable time have something useful, without
doing it too aggressively.

The current policy is:

1. Whenever a significant global change happens (memory state,
sceen on or off), we collect PSS from all processes; this will
not happen more than every 10 minutes.
2. When all activities become idle, we will collect PSS from the
current top process; this will not happen more than every 2
minutes per process.
3. We will sample the top-most process's PSS every 5 minutes.
4. When an process's oom adj changes and it has been more than
30 minutes since PSS has been collected from it, we will
collect a new PSS sample.
5. If a process changes from service A to service B (meaning it
has been running a service for a long time), we will collect
a PSS sample from it.
6. If someone explicitly requests PSS data (for running services
UI or dumpsys), record that.

Also:

- Finish moving the procstats output all to the new format.
- Record information about processes being killed due to excessive
wake locks or CPU use in procstats.
- Rework how we structure common vs. per-package process stats to
make it simpler to deal with.
- Optimize the Debug.getPss() implementation (we use it a lot now).
Should probably optimize it further at some point.

Change-Id: I179f1f7ae5852c7e567de4127d8457b50d27e0f0
ndroid_os_Debug.cpp
9b43a604059a8d8dc8186862bddbf12082d67e93 27-Jun-2013 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #9586838: Crash after waking up Hammerhead device"
86bebb4c78ffb1c2968f90841a65c07f81ba664b 27-Jun-2013 Oliver Woodman <olly@google.com> Merge "Expose latency methods through AudioManager and AudioTrack."
053f61d6a6e23825e680dc49982e55c5b4299d61 27-Jun-2013 Dianne Hackborn <hackbod@google.com> Work on issue #9586838: Crash after waking up Hammerhead device

I made the power manager more rigid, not allowing different uids
to use the same wake lock. This never should happen. I would
guess there is somewhere that the activity manager is acquiring
the wake lock without clearing the calling identity... but it is
hard to follow all the paths this may happen in. So here we add
some checks when acquiring/releasing the wake lock to make sure
it is being done as the system uid.

Also:

- Protect the new activity stack calls with a permission, and
make sure to clear the calling uid once past that.
- Collect uid data from process stats so we can correctly
associate CPU use with a uid even if we don't know about the
pid for some reason.
- Fix battery stats dump commands to clear calling uid before
executing so they aren't broken.

Change-Id: I0030d4f7b614e3270d794ecfc3669139a5703ce9
ndroid_os_FileUtils.cpp
e3b0a0117a2ab4118f868a731b238fe8f2430276 27-Jun-2013 Romain Guy <romainguy@google.com> Refcount 9-patches and properly handle GC events

This change adds refcounting of Res_png_9patch instances, the native
data structure used to represent 9-patches. The Dalvik NinePatch class
now holds a native pointer instead of a Dalvik byte[]. This pointer
is used whenever we need to draw the 9-patch (software or hardware.)

Since we are now tracking garbage collection of NinePatch objects
libhwui's PatchCache must keep a list of free blocks in the VBO
used to store the meshes.

This change also removes unnecessary instances tracking from
GLES20DisplayList. Bitmaps and 9-patches are refcounted at the
native level and do not need to be tracked by the Dalvik layer.

Change-Id: Ib8682d573a538aaf1945f8ec5a9bd5da5d16f74b
ndroid/graphics/NinePatch.cpp
ndroid_view_GLES20Canvas.cpp
49a31e0d67042886c1b2f5bedd6d0dfafda8a021 26-Jun-2013 Dianne Hackborn <hackbod@google.com> Merge "Update procstats to start collecting/reporting pss."
70725500dcf3b666b43d50563d64705aab58d2d3 25-Jun-2013 Igor Murashkin <iam@google.com> Initial camera device implementation

* Working streaming preview requests only
* Almost everything else returns empty objects that don't do anything

Bug: 9213377
Change-Id: Ie6f02a7c0952b0f5ebc41905425b15cae221f7d3
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_photography_CameraMetadata.cpp
13ac041b9f21043bc7c848a743be618bfd7a67e9 26-Jun-2013 Dianne Hackborn <hackbod@google.com> Update procstats to start collecting/reporting pss.

Completely reworked how it manages its data, since trying
to keep track of all of the possible pss data with the old
data structures would have made it huge. Now we have a sparse
data structure for pss and process times. (Will switch service
times over to it soon.)

Currently the only thing that collects pss data is running
"dumpsys meminfo". More will be added later.

Modified checkin output to also scale better as more distinct
data categories are added, and added output of pss data. Now
instead of dumping every possible entry as a comma-separated
list, it dumps a comma-separated list of only the entries with
data, tagged with the state they go with.

Also fixed some problems in the checkin reporting of batterystats
(it needs to escape commas), added checkin reporting of the history
list, fixed parsing of kernel wake locks to strip quotes, fixed
wake lock name that the sync manager generates to be more sane.

Change-Id: Ibf4010838a9f685ebe1d93aff86c064ccc52b861
ndroid_util_Process.cpp
61dcdf3764b614c6f01e77cb4342d192e3101f8a 26-Jun-2013 Oliver Woodman <olly@google.com> Expose latency methods through AudioManager and AudioTrack.

There's a longer term plan to fix audio/video sync, but
this gets the Java level to parity with the native level,
and allows applications in Java to achieve sync in the
same way as the native media player. APIs are left as hidden
for now.

Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
36483e9622b399ea1368fb84ed0c5a5495f65e42 25-Jun-2013 Igor Murashkin <iam@google.com> Revert "Initial camera device implementation"

This reverts commit 59bc67c732eab53b370b196066e8012d3f6bf09a.

Change-Id: I9e1ce3b9f4af4e2b9b98855c0ca533581c87ea7f
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_photography_CameraMetadata.cpp
59bc67c732eab53b370b196066e8012d3f6bf09a 20-Jun-2013 Igor Murashkin <iam@google.com> Initial camera device implementation

* Working streaming preview requests only
* Almost everything else returns empty objects that don't do anything

Bug: 9213377
Change-Id: I183dd47ddd737ec2c3c374e5c3461542a97f09b0
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_photography_CameraMetadata.cpp
6b0437c2c7a552c8195956444facff3532e25c21 24-Jun-2013 Derek Sollenberger <djsollen@google.com> Fix SkASSERT errors resulting from the order objects are allocated
on the stack.

Change-Id: I24649fed5c069d8d3777d153e8fb31a55a9cf7a1
ndroid/graphics/BitmapFactory.cpp
b06accf34f53956a5ccd44cecc3604cc2d166cd7 21-Jun-2013 Svetoslav Ganov <svetoslavganov@google.com> Merge "Generate PDF from Canvas."
9f8203a159d46124a0907a0d9500e599533beed3 19-Jun-2013 Brian Carlstrom <bdc@google.com> Remove libdvm dependency

Change-Id: I7d37db4e72e9435ecd514340cf61a051dc272f04
ndroid.mk
ndroidRuntime.cpp
ff4adde5737be08d3e2d03fbe588c591d27d4a74 10-Jun-2013 Svetoslav Ganov <svetoslavganov@google.com> Generate PDF from Canvas.

This change adds simple APIs that enable an Android application
to generate a PDF document by drawing content on a canvas.

Change-Id: Ibac93d7c37b01a376ce7c48238657d8c7698d588
ndroid.mk
ndroidRuntime.cpp
ndroid/print/android_print_pdf_PdfDocument.cpp
94c747db09033e24188e79c7e0e2cfef8402b48f 18-Jun-2013 Dianne Hackborn <hackbod@android.com> am 2f3f86c1: am 1d4cd879: am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."

* commit '2f3f86c113f10b841b8597a05f724a996ba76641':
Avoid unnecessary FindClass("java/lang/String").
1d4cd879044578cf7e2b37d45ef29abaabf7e662 18-Jun-2013 Dianne Hackborn <hackbod@android.com> am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."

* commit '11cd57caee4058dab743b91e715d7469c59a5c2f':
Avoid unnecessary FindClass("java/lang/String").
49cc5d71192cbd776e237488218aea18a3ed14b1 18-Jun-2013 Chris Craik <ccraik@google.com> Merge "Handle all text bounds as post-translated"
f09b746acb266a849f3421df1604ebec161bb93d 18-Jun-2013 Chris Craik <ccraik@google.com> Handle all text bounds as post-translated

We were treating immediate mode bounds as pre translate, which is
inconsistent with using them for quickRejection.

This fixes the overdraw counter not drawing correctly (since it uses
immediate mode drawing.

Change-Id: I1c734d367a00942bd7d9b041822c0a9f284e70a8
ndroid_view_GLES20Canvas.cpp
fb5c9050978afad2c1df570a13a6747f438c27f7 17-Jun-2013 Romain Guy <romainguy@google.com> Merge "Cancel layer update when a layer is about to be destroyed Bug #9310706"
e93482f5eac3df581d57e64c2a771a96aa868585 17-Jun-2013 Romain Guy <romainguy@google.com> Cancel layer update when a layer is about to be destroyed
Bug #9310706

Change-Id: I73eea6314c326f15a979617e3a05b525935f0d3f
ndroid_view_GLES20Canvas.cpp
8870538f7c8d32187255707bc3217bd3625d397e 15-Jun-2013 Victoria Lease <violets@google.com> make setHinting(HINTING_ON) kNormal_Hinting

Previously, the default hinting mode for a freshly-constructed Paint
object is equivalent to Skia's kNormal_Hinting mode, in which font
hints are respected if available. Calling
Paint.setHinting(HINTING_ON), however, is equivalent to setting
Skia's kSlight_Hinting mode, in which font hints are ignored in
favour of freetype-generated autohints.

This discrepancy is bad for a variety of reasons:
- Once Paint.setHinting() has been called, it is impossible to return
to the default hinting level.
- Calling paint.setHinting(otherPaint.getHinting()) can result in
paint having a different hinting level than otherPaint.
- Paint.setHinting(HINTING_ON) actually results in font hints being
ignored, which is perhaps the opposite of the intended behaviour.

This commit resolves these discrepancies by making HINTING_ON
correspond to Skia's kNormal_Hinting setting.

Change-Id: Iefb8e051ef53bea783e6f3be37748985ec397bc5
Bug: 9466164
ndroid/graphics/Paint.cpp
aa5fe3d206f72c4e7ff6632e169de2d0df6672e2 17-Jun-2013 Vladimir Marko <vmarko@google.com> Avoid unnecessary FindClass("java/lang/String").

Use previously retrieved global reference instead.
Check for NULL after creating the global reference.

Change-Id: I21670d2ef0f63ddb5801dd21e7e56359e5519479
ndroid_util_AssetManager.cpp
d1f9aaa5d776a94907f9e5b632125648043c47b3 14-Jun-2013 Chris Craik <ccraik@google.com> Merge "Fix various draw ops that may incorrectly not scissor"
39a908c1df89e1073627b0dcbce922d826b67055 13-Jun-2013 Chris Craik <ccraik@google.com> Fix various draw ops that may incorrectly not scissor

bug:8965976

Also consolidates quickReject scissor-ing and scissor-less paths.
Renamed plain 'quickReject' method, as it has sideEffects beyond what
the java and skia canvases do.

Change-Id: I4bdf874d3c8f469d283eae1e71c5e7ea53d47016
ndroid_view_GLES20Canvas.cpp
34761a3abf127d6ef559bf68a32c5d62756d1054 13-Jun-2013 buzbee <buzbee@google.com> Merge "Process new system property for max JIT cache size"
405436021da156fbe3c5d4de48bdefa564cf7fc0 13-Jun-2013 Romain Guy <romainguy@google.com> Restore buildLayer()'s old behavior; it's synchronous again
Bug #9193833

Change-Id: I4ee07e65c0a8967f0b55da030ecaad6dfc46136f
ndroid_view_GLES20Canvas.cpp
34bff87b32a10f6267e76a7de0b287eb6a4633f9 06-Jun-2013 Chris Craik <ccraik@google.com> Merge "Add support for post-decode density scaling with reuse"
1e97ceb46991183a9286bb5ed8308e718e346c1f 06-Jun-2013 Chris Craik <ccraik@google.com> Merge "Support all formats for BitmapFactory.Options.inBitmap"
905e8246ef0bd20ee28d81ce3da0c5e5fc8e3913 05-Jun-2013 Chris Craik <ccraik@google.com> Add support for post-decode density scaling with reuse

Also, simplifies scaling path, removing java variant - we always do
the scaling in native, which has the benefit of avoiding non-native
temporary allocations

Change-Id: I39c2219f5d77a267719629704e65611cf4388a82
ndroid/graphics/BitmapFactory.cpp
7e8c03c0fed64c73a4f0cfb96a2c6905b348a143 03-Jun-2013 Chris Craik <ccraik@google.com> Support all formats for BitmapFactory.Options.inBitmap

bug:9194265

Instead of using custom code in skia to avoid allocations, use a
custom allocator that reuses the allocations from the inBitmap.

In order to avoid inconsistent state, the decode is done in a
separate bitmap and swapped into the existing native bitmap.

Eventually, we'd like to support inScaled=true completely avoiding
java allocations.

Change-Id: Ic4a2f2373b100a80a32c1cdebb7bcb726711c8a7
ndroid/graphics/BitmapFactory.cpp
e659f12f0f7cdd5ad3feec8ec65be9b14d78cd5a 30-May-2013 Dmitry Shmidt <dimitrysh@google.com> Merge "wifi: Match function prototype from libhardware_legacy"
c648ed7303c7a0cfc8ad9c2f7eb16370d57f804a 30-May-2013 Derek Sollenberger <djsollen@google.com> Merge "Modifications needed for updating Skia to r9286."
ec3d44cc7e5308cbfb166166da939a5b5ad216bc 21-Dec-2012 Sungmin Choi <sungmin.choi@lge.com> fix possible buffer overrun and memory leak

Use snprintf instead of sprintf and fclose() before return.

Change-Id: I3ed193464cc0dc90e9935ae19162667ad367628b
ndroid_util_Binder.cpp
ffa0242dd40b2d73d269d2427651dacbf3a819d7 29-May-2013 Dmitry Shmidt <dimitrysh@google.com> wifi: Match function prototype from libhardware_legacy

Change-Id: Ibfffd347e22f71753b085d16f185407308b9be36
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ndroid_net_wifi_Wifi.cpp
80b12fcaaec458377d966803c3a61504f0897ea1 30-May-2013 Romain Guy <romainguy@google.com> Disable the AssetAtlas when running under valgrind
Bug #9191438

When running under valgrind, the ppid will be different from the ppid
of the system server (which always gets forked from zygote.)

Change-Id: I42cbf99fd0084aeab76c30de9beb7c49ed1fc7d8
ndroid_util_Process.cpp
9f58361e98be7386a4eadd3aa254e9b7d09d0a3b 21-May-2013 Chris Craik <ccraik@google.com> Support larger bitmaps in BitmapFactory.Options.inBitmap

bug:8121994

Adds a new distiction between bitmap size and the allocation
(pixel ref/buffer) used to store its data.

BitmapFactory.inBitmap will allow a bitmap to be reinitialized with
new data if the bitmap being decoded is (after sampleSize) equal or
smaller.

Change-Id: I747750a735c858882df3af74fca6cdc46f2a9f81
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
d7a80774f0a2175f9ee81a7741f9a171c78e0b8b 28-May-2013 Derek Sollenberger <djsollen@google.com> Modifications needed for updating Skia to r9286.

bug: 8719528
Change-Id: I260fefb93c5a8c5dec86acdec66cbe55a2ee8a92
ndroid.mk
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
b63de6de026b8ebe0b7d7b7f188afc30fff42411 24-May-2013 buzbee <buzbee@google.com> Process new system property for max JIT cache size

To allow low-memory devices to reduce (or eliminate entirely)
the RAM used by the JIT, dalvikvm has a new command-line
option to set the max size of the JIT's translation cache.
In this CL, we pass that new option based on a system property.

Change-Id: I2a01da4d19c1922b6ed52791ee513efef9caf3d4
ndroidRuntime.cpp
64770d16b0907a8e1ee81ef6c8fa398a6bdbee79 24-May-2013 Dianne Hackborn <hackbod@google.com> Some improvements to meminfo output.

- Rename "Swappable PSS" to "PSS Clean" which I think is what it
means and is consistent with the other memory metrics.
- Split at the top level the dalvik heap from other dalvik allocations,
so when you look on the dalvik allocations line things are consistent
with the allocator's data and it is clear what are app allocations vs.
other data in dalvik.
- Don't print lines that are all 0.
- Don't print the detailed Dalvik allocation data by default; add a new
option to have it printed.

Here's what a typical system process dump now looks like:

** MEMINFO in pid 6358 [system] **
Pss Pss Shared Private Shared Private Heap Heap Heap
Total Clean Dirty Dirty Clean Clean Size Alloc Free
------ ------ ------ ------ ------ ------ ------ ------ ------
Native Heap 0 0 0 0 0 0 6964 3599 2048
Dalvik Heap 7541 0 4344 7356 0 0 11768 11194 574
Dalvik Other 3553 0 2792 3448 0 0
Stack 28 0 8 28 0 0
Cursor 4 0 0 4 0 0
Ashmem 5 0 12 0 0 0
Other dev 4004 0 24 4000 0 4
.so mmap 3959 684 2500 2280 5468 684
.apk mmap 173 68 0 0 692 68
.dex mmap 4358 3068 0 0 9276 3068
Other mmap 60 0 8 8 244 36
Unknown 4387 0 508 4380 0 0
TOTAL 28072 3820 10196 21504 15680 3860 18732 14793 2622

Objects
Views: 10 ViewRootImpl: 1
AppContexts: 8 Activities: 0
Assets: 3 AssetManagers: 3
Local Binders: 176 Proxy Binders: 341
Death Recipients: 141
OpenSSL Sockets: 0

SQL
MEMORY_USED: 473
PAGECACHE_OVERFLOW: 98 MALLOC_SIZE: 62

DATABASES
pgsz dbsz Lookaside(b) cache Dbname
4 68 49 7/21/7 /data/data/com.android.providers.settings/databases/settings.db
4 20 17 0/13/1 /data/system/locksettings.db
4 20 21 96/14/2 /data/system/locksettings.db (1)
4 20 21 75/13/2 /data/system/locksettings.db (2)
4 80 29 4/17/3 /data/system/users/0/accounts.db

Change-Id: Ifd511a7baaa8808f82f39509a5a15c71c41d1bac
ndroid_os_Debug.cpp
dadfb9c9bfe17eb99a4891af0fe4eed7166f0b86 24-May-2013 Anwar Ghuloum <anwarg@google.com> Merge "Add more memory usage stats"
27ff7ba3940297b97299b382183f717af1244068 24-May-2013 Anwar Ghuloum <anwarg@google.com> Merge "More stats for meminfo"
9a78222df21931018ad950565ab56cbf455c29a3 24-May-2013 Anwar Ghuloum <anwarg@google.com> Merge "break out boot.art"
17082e0452d885428b787ce1e1edcebdd79afc97 24-May-2013 Anwar Ghuloum <anwarg@google.com> Merge "Break out Oat footprint for ram"
608094041177193dcce7a91e8dc96a2556d29bfd 23-May-2013 Romain Guy <romainguy@google.com> Merge "Add PerfHUD ES profiling capabilities"
e9bc11f7121dbe373b0cbe5779ee6a12d824492c 23-May-2013 Romain Guy <romainguy@google.com> Add PerfHUD ES profiling capabilities

The eglGetSystemTimeNV extension can be used to enable profiling
in PerfHUD ES. When the delta of two calls to eglGetSystemTimeNV
equals 0, we now cancels display lists updates. This allows the
tool to redraw the same frame several times in a row to run its
analysis.

For better results profiling should only be attempted after
setting viewroot.profile_rendering to true using adb shell
setprop.

Change-Id: I02e3c237418004cff8d6cb0b9a37126efae44c90
ndroid_view_HardwareRenderer.cpp
3c61506b7147e13b9d39fc07fb189504fcab4541 13-May-2013 Anwar Ghuloum <anwarg@google.com> Add more memory usage stats

Added support for teasing apart different parts of the dalvik heap.

Note this adds more public api and we should talk to hackbod before going into master with this.

(cherry picked from commit 73407daf3f6110e933d8614605b21586c4c5fde2)

Change-Id: If4431f50e67e18bcc42e00694c97805477bd6815
ndroid_os_Debug.cpp
3a8ce1bec819c9b104880493a6862fd2a9546132 27-Apr-2013 Anwar Ghuloum <anwarg@google.com> More stats for meminfo

Added shared clean tracking (for pageable stuff). Renamed .oat and .art mmap.

(cherry picked from commit 967d53b17b6010c3a675ca9c3bbd0e9dd2f2f092)

Change-Id: I741e0dbe0d3f9aee6975c6fad8af9905942962d4
ndroid_os_Debug.cpp
88887d0a53f866e61a7524b0edfc95e6dde57d72 19-Mar-2013 Anwar Ghuloum <anwarg@google.com> break out boot.art

breaking out boot.art mapped pages

(cherry picked from commit eaa3f2d59adaeb87cd8d1726b696521f984659c4)

Change-Id: Ie89477bd3a93a15de3a4db76ef5eae497c3087e3
ndroid_os_Debug.cpp
8884ef4fe80505bc6e41c167b67efbb93e43475d 15-Mar-2013 Anwar Ghuloum <anwarg@google.com> Break out Oat footprint for ram

Breaking out oat footprint in meminfo.

(cherry picked from commit c92f177d96b5952e0bfde01597972fc607aed93a)

Change-Id: I7b0452045c265b7544c41d3a5953e10a081c5315
ndroid_os_Debug.cpp
4418bed617e3474a0b3dc34c0f74ab7bdb2b878a 23-May-2013 Jeff Brown <jeffbrown@google.com> am e20fbc6f: am d6619ed8: Merge "Add a queue of pending finished input events." into jb-mr2-dev

* commit 'e20fbc6feb6709c01bf0afdf86a75882c9a0e663':
Add a queue of pending finished input events.
e20fbc6feb6709c01bf0afdf86a75882c9a0e663 23-May-2013 Jeff Brown <jeffbrown@google.com> am d6619ed8: Merge "Add a queue of pending finished input events." into jb-mr2-dev

* commit 'd6619ed89ff7e10b0b66aadc353cfea171929344':
Add a queue of pending finished input events.
8bae56e278646436038f0c2899103c3fbc05cc0c 22-May-2013 Geremy Condra <gcondra@google.com> am 8acde57d: am 1b12ab00: am 9c759e39: Merge "Fix SELinux get.. methods aborting on invalid address"

* commit '8acde57d23d7e85b493d4d9502e834509f1c46ba':
Fix SELinux get.. methods aborting on invalid address
1b12ab00998b96046ef617a8d109fadcf29a1b39 22-May-2013 Geremy Condra <gcondra@google.com> am 9c759e39: Merge "Fix SELinux get.. methods aborting on invalid address"

* commit '9c759e3968015c0d30a1a049754e4514adfdb565':
Fix SELinux get.. methods aborting on invalid address
56513492ea6d4a72584cbc01979f7b3fa3c2807f 22-May-2013 Jeff Brown <jeffbrown@google.com> Add a queue of pending finished input events.

Although in practice an application or IME is unlikely to fill up
the input channel with finish events, it can happen when events are
being delivered very rapidly. Handle this situation by queuing
up the pending finish events until the socket becomes writable again.

Bug: 9034301
Change-Id: I938a62a75d12106a19cff2d016ba7af0db877ecf
ndroid_view_InputEventReceiver.cpp
81ad284517dc80818cd2f3912fbcf9a7b55df119 22-May-2013 Richard Haines <richard_c_haines@btinternet.com> Fix SELinux get.. methods aborting on invalid address

SELinux get.. JNI need the 'security_context_t tmp' entries set
to NULL, otherwise on error freecon() tries to release uninitialised
memory causing apps to abort with invalid address.
Also fixed getPeerCon ALOGV call as this caused Zyote to abort when
verbose logging set.

Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
ndroid_os_SELinux.cpp
41541825bc90dac740e424cdd41a8c997e15cdb7 04-May-2013 Chris Craik <ccraik@google.com> Use individual glyph positions to determine text bounds.

bug:8766924

Previously text bounds were calculated to be from 0 to totalAdvance in
the X, and from the font's top to bottom. These are incorrect,
especially in light of the font fallback mechanism.

Now, we calculate the bounds of the text as we layout each glyph.
Since these are much tighter bounds in the common case, this
significantly reduces the amount of clipping required (which in turn
enables more aggressive text merging).

Change-Id: I172e5466bf5975bf837af894a9964c41db538746
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid_view_GLES20Canvas.cpp
4eb3c132612d854ac0f1c8a2073b9d9730f6a8cd 17-May-2013 Romain Guy <romainguy@google.com> am 25f6f4f5: am 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev

* commit '25f6f4f5d082828fe0eb4f24be2bfaa15b71242e':
Update Canvas.getClipBounds to not account for AA clips.
25f6f4f5d082828fe0eb4f24be2bfaa15b71242e 17-May-2013 Romain Guy <romainguy@google.com> am 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev

* commit '3c1ad55fcfa54c2c30073d07917da699d156dc58':
Update Canvas.getClipBounds to not account for AA clips.
00a33a8ce8ed8863786fa3a0cd313da57aae2af1 16-May-2013 Derek Sollenberger <djsollen@google.com> Update Canvas.getClipBounds to not account for AA clips.

This preserves the existing behavior at the SDK level while skia
investigates a more comprehensive solution.

bug: 8986473
Change-Id: Ief82dcfd47f1ba08d28d43402b3c28694f94f2e4
ndroid/graphics/Canvas.cpp
6155251c7bcb75818bdc9bbf1bd863df49994a7c 11-May-2013 Brian Carlstrom <bdc@google.com> am bf7afa23: am 94f55b30: Merge "Tracking libnativehelper dependencies"

* commit 'bf7afa239e9541b3cac5a3c510bfb9b25b4a1348':
Tracking libnativehelper dependencies
bf7afa239e9541b3cac5a3c510bfb9b25b4a1348 11-May-2013 Brian Carlstrom <bdc@google.com> am 94f55b30: Merge "Tracking libnativehelper dependencies"

* commit '94f55b30e3e04dbea63836197e76c7464d8d6d37':
Tracking libnativehelper dependencies
fde1f91d9b370758f79a7eb6e14df38a9789e10a 11-May-2013 Brian Carlstrom <bdc@google.com> Tracking libnativehelper dependencies

Change-Id: I05ec62c43fbe5f8ba23256abac7271ca0b1a7242
ndroid.mk
b14e42f1211940baa76b15589bfa696611fea87f 10-May-2013 Dianne Hackborn <hackbod@google.com> Merge "Cleanup some of the thread merging."
0c8c0add4e552fe910d787c2aa9253749b1c7b48 09-May-2013 Derek Sollenberger <djsollen@google.com> am c195ef73: am bee78812: Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev

* commit 'c195ef73445c3ba605355798b9f1f9a78bc52f11':
Fix bug where we incorrectly clipped the bounds to the device size.
8987f06f9c04648fd7c0bfff97cb3ecb3b58fdaf 09-May-2013 Raph Levien <raph@google.com> resolved conflicts for merge of 7e433f10 to master

Change-Id: Ifa3a144c791c0143c62f4aa23a5db57a93c32a17
bee78812d0b3fc3d877ed0d954a0bb21ab7f2f3b 09-May-2013 Derek Sollenberger <djsollen@google.com> Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev
dde8e539c3d76c98360e4cd1151cb15cba78a6b0 09-May-2013 Raph Levien <raph@google.com> Merge "Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App" into jb-mr2-dev
708144e828b1a549567ce50cd8ed3cda62930501 09-May-2013 Derek Sollenberger <djsollen@google.com> Fix bug where we incorrectly clipped the bounds to the device size.

This CL also updates the documenation to make it clear that the API
returns in local space, not clipped to the size of the bitmap/device.

bug: 8747526
Change-Id: I389844672ce955341863f9940c3b401ab00dc1dc
ndroid/graphics/Canvas.cpp
1f5762e646bed2290934280464832782766ee68e 07-May-2013 Mathias Agopian <mathias@google.com> libutils clean-up

Change-Id: I11ee943da23a66828455a9770fc3c5ceb4bbcaa9
ndroidRuntime.cpp
ndroid_os_SystemClock.cpp
om_android_internal_content_NativeLibraryHelper.cpp
efa92b2182ab581873aa8e75d596e2e363bd5e6d 03-May-2013 Dianne Hackborn <hackbod@google.com> Cleanup some of the thread merging.

Adds an optimization for checking whether a looper is stuck,
with a new Looper method to see if its thread is currently
idle. This will allow us to put a large number of loopers
in the monitor efficiently, since we generally won't have to
do a context switch on each of them (since most looper threads
spend most of their time idle waiting for work).

Also change things so the system process's main thread
is actually running on the main thread. Because Jeff
asked for this, and who am I to argue? :)

Change-Id: I12999e6f9c4b056c22dd652cb78c2453c391061f
ndroid_os_MessageQueue.cpp
ce3fe5fd8a246b7eb96bb189fc58f63006d2e6c8 07-May-2013 Jesse Hall <jessehall@google.com> am 4d32a367: am 2787ba25: Merge "Register EGLExt JNI methods" into jb-mr2-dev

* commit '4d32a36759b619abdda9c895054f513aef3a3f03':
Register EGLExt JNI methods
9ee0999bcbe7fbd596462a7e1f4351ebf1c4cc97 07-May-2013 Jesse Hall <jessehall@google.com> resolved conflicts for merge of 78df7b5e to master

Change-Id: I27076f5e6f747a006dcac7cd334cacf56dd57bd5
dd0a91294bc6b57c701bdb85b9e920207eeae55a 07-May-2013 Raph Levien <raph@google.com> Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App

For fullwidth latin (or, more generally, a font considered as a complex
script, but not supported by the font specified), and for a font other
than a system default font, we were getting a mismatch in baseGlyphCount
between the shaping and painting fonts.

This patch preserves the original typeface in this case. In that sense,
it is a slightly more general fix for bug 8127795.

Change-Id: Ibdbfdb34eb7dc39cc8f0784a67c93c9af4ce6ab2
ndroid/graphics/TextLayoutCache.cpp
237c2b871f66e06498ad03aaa92964f4434982c5 06-May-2013 Jesse Hall <jessehall@google.com> Register EGLExt JNI methods

Bug: 8678160
Change-Id: I8ecd2e6da2aee250b3433be18fff6af927b02994
ndroid.mk
ndroidRuntime.cpp
236cc476e6792a11502ba4f40c7ab4586f40d282 06-May-2013 Dave Burke <daveburke@google.com> Temporarily revert field name change (DO NOT MERGE)

VisualOn is using hidden fields, causing HBO and Xfinity to crash.
Bug: 8549617
Bug: 8331866

Change-Id: I35a9fe66dea8d56f4fcff9b492679226a17f4acc
ndroid_view_Surface.cpp
02b7128f87ce55693cb6401ab09a5e47b5db5cb5 04-May-2013 Jesse Hall <jessehall@google.com> Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-dev
8add80211e827abe3efe08b43f6ae1bdde014f82 04-May-2013 Romain Guy <romainguy@google.com> Merge "Add an on-screen overdraw counter"
78dd96d5af20f489f0e8b288617d57774ec284f7 03-May-2013 Romain Guy <romainguy@google.com> Add an on-screen overdraw counter

The counter can be enabled by setting the system property called
debug.hwui.overdraw to the string "count". If the string is set
to "show", overdraw will be highlighted on screen instead of
printing out a simple counter.

Change-Id: I9a9c970d54bffab43138bbb7682f6c04bc2c40bd
ndroid_view_GLES20Canvas.cpp
b468877f7f4919acc5aeff0f8d168e94bb5fed4a 03-May-2013 Jeff Brown <jeffbrown@google.com> am f87d4ea7: am 17cf4e4d: Merge "Really make Surface thread-safe." into jb-mr2-dev

* commit 'f87d4ea77a6950c3d6d381347f2346c12bee25f4':
Really make Surface thread-safe.
17cf4e4d4a576009efbfce93bd64b687601b71c7 03-May-2013 Jeff Brown <jeffbrown@google.com> Merge "Really make Surface thread-safe." into jb-mr2-dev
b7446f9ddb905adb40f2befe6235a011a138ebd9 03-May-2013 Mathias Agopian <mathias@google.com> Merge "simplify Surface{View} dirty rect handling"
3b748a44c6bd2ea05fe16839caf73dbe50bd7ae9 18-Apr-2013 Romain Guy <romainguy@google.com> Pack preloaded framework assets in a texture atlas

When the Android runtime starts, the system preloads a series of assets
in the Zygote process. These assets are shared across all processes.
Unfortunately, each one of these assets is later uploaded in its own
OpenGL texture, once per process. This wastes memory and generates
unnecessary OpenGL state changes.

This CL introduces an asset server that provides an atlas to all processes.

Note: bitmaps used by skia shaders are *not* sampled from the atlas.
It's an uncommon use case and would require extra texture transforms
in the GL shaders.

WHAT IS THE ASSETS ATLAS

The "assets atlas" is a single, shareable graphic buffer that contains
all the system's preloaded bitmap drawables (this includes 9-patches.)
The atlas is made of two distinct objects: the graphic buffer that
contains the actual pixels and the map which indicates where each
preloaded bitmap can be found in the atlas (essentially a pair of
x and y coordinates.)

HOW IS THE ASSETS ATLAS GENERATED

Because we need to support a wide variety of devices and because it
is easy to change the list of preloaded drawables, the atlas is
generated at runtime, during the startup phase of the system process.

There are several steps that lead to the atlas generation:

1. If the device is booting for the first time, or if the device was
updated, we need to find the best atlas configuration. To do so,
the atlas service tries a number of width, height and algorithm
variations that allows us to pack as many assets as possible while
using as little memory as possible. Once a best configuration is found,
it gets written to disk in /data/system/framework_atlas

2. Given a best configuration (algorithm variant, dimensions and
number of bitmaps that can be packed in the atlas), the atlas service
packs all the preloaded bitmaps into a single graphic buffer object.

3. The packing is done using Skia in a temporary native bitmap. The
Skia bitmap is then copied into the graphic buffer using OpenGL ES
to benefit from texture swizzling.

HOW PROCESSES USE THE ATLAS

Whenever a process' hardware renderer initializes its EGL context,
it queries the atlas service for the graphic buffer and the map.

It is important to remember that both the context and the map will
be valid for the lifetime of the hardware renderer (if the system
process goes down, all apps get killed as well.)

Every time the hardware renderer needs to render a bitmap, it first
checks whether the bitmap can be found in the assets atlas. When
the bitmap is part of the atlas, texture coordinates are remapped
appropriately before rendering.

Change-Id: I8eaecf53e7f6a33d90da3d0047c5ceec89ea3af0
ndroid.mk
ndroidRuntime.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_GraphicBuffer.cpp
ndroid_view_GraphicBuffer.h
ndroid_view_TextureView.cpp
fc0ebd7d379ff63c00ebf78ca252fab5070213da 01-May-2013 Jeff Brown <jeffbrown@google.com> Really make Surface thread-safe.

There were many places where the native object was being
accessed improperly. Also some places where CloseGuard might
not be acquired or released correctly or where the generation
count might not be updated.

Fixed them all.

That said, Surface isn't intended to be used concurrently
so please don't do it. This is only intended to make
hard to find crashes less likely.

Bug: 8328715
Change-Id: I981ef33425823e0fd7ad6b64443f2ec9b0c8335e
ndroid_view_Surface.cpp
0c79d808cb66894434e78052c66a0f81e5419176 30-Apr-2013 Jesse Hall <jessehall@google.com> Add android.opengl.EGLExt class for EGL extensions

Add the ES-relevant constants from the EGL_KHR_create_context
extension. These allow apps to check which EGLConfigs (if any) support
ES3 contexts. Otherwise, the app has to create a context with an
EGLConfig and then check whether it is an ES2 or ES3 context.

Also move eglSetPresentationTimeANDROID from EGL14 to EGLExt, since it's an
extension function. It's new in API 18.

Bug: 8678160
Change-Id: I3cba6e59ebb0a3a4c4012aa54a36b940c288bcec
ndroid_opengl_EGL14.cpp
ndroid_opengl_EGLExt.cpp
fcafc3259e62de3511a531ccc128a46e98c8d2a1 01-May-2013 Jesse Hall <jessehall@google.com> am 0b30ad53: am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev

* commit '0b30ad53423a9bfab53b1632a33159be3d82e3df':
Fix GLES30 JNI registration
4225d7965657b57d34b00d47785cef3c693784f7 30-Apr-2013 Romain Guy <romainguy@google.com> Merge "Handle Surface::lock errors in TextureView Bug #8689535"
53bacf5a91a760f6c0a966ed2f50a25e7fe12aeb 30-Apr-2013 Romain Guy <romainguy@google.com> Handle Surface::lock errors in TextureView
Bug #8689535

Change-Id: I6d16e13903a58e93940160e7656147656ab79982
ndroid_view_TextureView.cpp
d877efe3b12afdd84f06c180369f9d7399858f6e 30-Apr-2013 Jesse Hall <jessehall@google.com> Fix GLES30 JNI registration

Bug: 8657863
Change-Id: I498f32480863b0716b2a8dfce467143087573cce
ndroidRuntime.cpp
ndroid_opengl_GLES30.cpp
c305745f19c3da0b7184ffbc79ae191d00ef4bed 29-Apr-2013 Andy McFadden <fadden@android.com> Merge "Regenerate GL stubs"
2b4d22cda3c44f5d731c15306b85045417071408 26-Apr-2013 Jeff Sharkey <jsharkey@android.com> Disable various sampling event logs.

They're unused at the moment.

Change-Id: Ib629b405e7b6666d38fcd0ebaa16490bfb0e95f0
ndroid_util_Binder.cpp
6a7836507277509837cda14e76c8e98bbabac441 26-Apr-2013 Matthew Xie <mattx@google.com> am 7a21c4cd: am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev

* commit '7a21c4cdb172f6353cd4166e80910893dc981196':
Added flush() for bluetooth output stream
cee5198e7199fcbb131ff0d30165fb1d5c0107cf 26-Apr-2013 Andy McFadden <fadden@android.com> Regenerate GL stubs

The primary motivation was to pick up changes to getarray(), but it
appears a few other tweaks were made since the last time the code
was generated.

Bug 8713753

Change-Id: I4fa2276bc28afaf0e1450e63498a8690028808ee
ndroid_opengl_EGL14.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
ndroid_opengl_GLES30.cpp
om_google_android_gles_jni_GLImpl.cpp
71bfafc84af4b820748b12e1a1010b0dfa7bdea6 17-Apr-2013 zzy <zhenye@broadcom.com> Added flush() for bluetooth output stream

Bug 8498784

Zebra QL420 Plus Bluetooth printer fails on Android 4.2.2
ndroid_net_LocalSocketImpl.cpp
41f7f9c5bc1dbdefc819fc36dcdb0bb3ccc21135 24-Apr-2013 Raph Levien <raph@google.com> am fdd40823: am 22a3344c: Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev

* commit 'fdd408233db5bd70cb43ddf2a49a85bd748da5b9':
Fix for bug 8695466 GPOS combining mark positioning broken before space
22a3344cda1a3dcf4f719e0685c5d06155922c29 23-Apr-2013 Raph Levien <raph@google.com> Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev
9d47db23ff0f943dd959a9a8501563b6975c4781 23-Apr-2013 Raph Levien <raph@google.com> Fix for bug 8695466 GPOS combining mark positioning broken before space

This patch makes segmentation into script runs behave the same in RTL
as in LTR modes - so that inherited script characters are always
associated with the preceding run. Otherwise, for a sequence such as
u+0631 u+064d u+0020, it would get split after the first character,
which would lose the ability to correctly position the u+064d mark.

Change-Id: I3c12ba1b77d18334f55e707f518be1046e6b339b
ndroid/graphics/TextLayoutCache.cpp
058feb4e1d18bc1fcedac019d2364ebfd9a4c383 23-Apr-2013 Michael Wright <michaelwr@google.com> am 58500051: am 5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-mr2-dev

* commit '585000515faacc02736f920425ae6c323223ee58':
Rewrite input handling for native applications
5fe6e4c4c9de523fa9e74902473996ce5ee8b298 23-Apr-2013 Michael Wright <michaelwr@google.com> Merge "Rewrite input handling for native applications" into jb-mr2-dev
a44dd26a75e24cc021802288fb81f4761e47be6b 11-Apr-2013 Michael Wright <michaelwr@google.com> Rewrite input handling for native applications

Bug: 8473020
Change-Id: Ic4353d8924ab877bec21aff8c2dba9fe725bf906
ndroid.mk
ndroidRuntime.cpp
ndroid_app_NativeActivity.cpp
ndroid_view_InputQueue.cpp
684634144b15e4da0ed04baa2c4531ef538652a6 21-Apr-2013 Chet Haase <chet@google.com> am 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev

* commit '371d4cccde56ec4d26e51f8e82ef68f196169a3d':
Fix quickReject logic to account for setClipChildren() setting
dd671599bed9d3ca28e2c744e8c224e1e15bc914 19-Apr-2013 Chet Haase <chet@google.com> Fix quickReject logic to account for setClipChildren() setting

The rendering code optimizes by rejecting drawing operations that
lie outside of the bounds of their views. This works in most
situations, but breaks down when containers have called
setClipChildren(false), because we reject drawing that is outside
of that container, but which should be drawn anyway.

Fix is to pass in the value of that flag to the DisplayList drawing
routines which take that flag into account when deciding whether
to quickReject any particular operation.

Issue #8659277 animation clipping

Change-Id: Ief568e4db01b533a97b3c5ea5ad777c03c0eea71
ndroid_view_GLES20DisplayList.cpp
667809ef5d2d1fe3796cdc9bdd09503a70d2ba6c 17-Apr-2013 Mathias Agopian <mathias@google.com> simplify Surface{View} dirty rect handling

Change-Id: Ia4595fc1a8a62ca3f3db0f1e47e7e877d73fbfa0
ndroid_view_Surface.cpp
2661bbd2196dd7aa3b07488943344b5d865e42ef 19-Apr-2013 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Add hidden camera preview to renderscript allocation API"
7005b67c127d229017840925d2bc1bd84c43aaf5 03-Apr-2013 Eino-Ville Talvala <etalvala@google.com> Camera: Add hidden camera preview to renderscript allocation API

- Camera.createPreviewAllocation() creates YUV allocations for use as
a preview buffer destination.

- Camera.setPreviewCallbackAllocation() sets such an allocation as the
target for preview data from camera.

Bug: 8563840
Change-Id: Ie42033976fed825d396550bbc033d434c8206b6b
ndroid_hardware_Camera.cpp
af1653a851eefb2302d2cb1c7ef3c7325103f2dd 17-Apr-2013 Victoria Lease <violets@google.com> resolved conflicts for merge of 6c18e2c8 to master

Change-Id: Idb4679247b201a1f453c63fee5b45b12b03a67a1
25df1a82a846cbdbdd2de0ce3d6741dfcfdf31fd 17-Apr-2013 Victoria Lease <violets@google.com> Merge "use appropriate fallback chain for style" into jb-mr2-dev
a720a87fded1704d1a7490956bc5ec682b67a4fb 17-Apr-2013 Jamie Gennis <jgennis@google.com> am a0b28ca7: am 95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev

* commit 'a0b28ca74806dcf46300d82ebb689b002bd36955':
Disable tracing from Zygote
6ad0452e6301c0650f58f3991f7c523f6f279ddb 16-Apr-2013 Jamie Gennis <jgennis@google.com> Disable tracing from Zygote

This change disables all atrace tracing in Zygote immediately after it is
initialized. This is necessary because Zygote has no way to receive
notifications that the enabled trace tags have been changed. Tracing is
re-enabled when other processes fork from Zygote.

Change-Id: If2983858fb0c4890ba9ab041849b1c4d98f66c13
ndroid_os_Trace.cpp
80658046538fdf0e6e92037fbe5794ef0e225036 16-Apr-2013 Jesse Hall <jessehall@google.com> am f454b52e: am 811d3734: Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev

* commit 'f454b52ee7d7bdd2fe207860921ca58eeed19017':
Add android.opengl.GLES30, hidden for now
811d373444822b1a81cd6fb4f8ef87f6d49559b1 16-Apr-2013 Jesse Hall <jessehall@google.com> Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev
cc0f9d8469ac0aa39ca2c2c6e6afe309ab6e69a7 16-Apr-2013 Victoria Lease <violets@google.com> use appropriate fallback chain for style

TextLayoutShaper was defaulting to the Regular-style fallback chain
for all unknown scripts. This became problematic in that the
codepoint->glyphID enumeration stage of shaping was always using the
Regular-style fallback chain for unknown scripts, and there's no
guarantee that glyph indices are compatible between fallback chains.

Defaulting to a style-appropriate fallback chain addresses this
issue, and probably unreported but related issues, as well.

Bug: 8189208
Change-Id: I6ecf531c74d71a8e4a5359d23439ccc950b0cf80
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
d830e74ff4bc9aa015f746e54f6922bf5221f1ba 29-Mar-2013 Jesse Hall <jessehall@google.com> Add android.opengl.GLES30, hidden for now

Bug: 8566953
Change-Id: Ia5a01d5e857b4fce12a451e2dcab0359758ad648
ndroid.mk
ndroid_opengl_GLES30.cpp
11dc37686fa284f3c6c63b911febd4547d5bb92b 13-Apr-2013 Dianne Hackborn <hackbod@google.com> am 18e99d1d: am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev

* commit '18e99d1d5f7bb2e35fb9f5c3edbb4265d66e3d93':
Add new resources trace, also trace apk dex loading.
15fed390c44972932f6dd7ce3bef1004e8b98b61 13-Apr-2013 Dianne Hackborn <hackbod@google.com> Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev
f7be4800df28d7cb6a96003046bf90245e7054ab 12-Apr-2013 Dianne Hackborn <hackbod@google.com> Add new resources trace, also trace apk dex loading.

Change-Id: Ia48566efb21ee018659bd976ddb3a0f4997b9a3a
ndroid_util_AssetManager.cpp
190a0f24dbba2fde41a77faf555da30bf2b1b79c 12-Apr-2013 Romain Guy <romainguy@google.com> am a378bab7: am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev

* commit 'a378bab7a7ea4f748c72b0d14acbdf9359dbebfb':
Add async events tracing to android.os.Trace
50b68bf8364fd728553cb8066ece8f7905885625 12-Apr-2013 Romain Guy <romainguy@google.com> Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev
339d05195757aec32c51771741c2553469efe6a6 11-Apr-2013 Jaikumar Ganesh <jaikumar@google.com> am 380043de: am 9a8df4dc: Add new sensor types.

* commit '380043deb0607262505baa2d3c8a46a8277697e5':
Add new sensor types.
9a8df4dcf9f83c1cf0cd8dedeb51d1ff8a52a2b5 13-Feb-2013 Jaikumar Ganesh <jaikumar@google.com> Add new sensor types.

1. Add uncalibrated gyros and magnetic field sensor.
2. Change max number of events from 3 to 16.
3. Add new APIs for trigger sensors.

Change-Id: Ifac5c0024c8e5f88b721e5cd97ff26afaaa36717
ndroid_hardware_SensorManager.cpp
9425f923fae8977d09d924436148d3808032ea98 11-Apr-2013 Romain Guy <romainguy@google.com> Add async events tracing to android.os.Trace

Change-Id: I106a50732a88c03a00602c328f8b46626bf66e08
ndroid_os_Trace.cpp
7a5583fe36f0686daecd961d4b2de090a000deac 10-Apr-2013 Derek Sollenberger <djsollen@google.com> am 8225c5b3: am c37b63d6: Merge "Ensure that a canvas is always backed by some form of SkDevice." into jb-mr2-dev

* commit '8225c5b3d925324dac7703fba0fd5a0f126afed6':
Ensure that a canvas is always backed by some form of SkDevice.
c37b63d6e777748d17ff177b128e30504fbd6c71 10-Apr-2013 Derek Sollenberger <djsollen@google.com> Merge "Ensure that a canvas is always backed by some form of SkDevice." into jb-mr2-dev
28af35e8cdc601c7ab9c7287d9e72fdc331e8a9d 10-Apr-2013 Ying Wang <wangying@google.com> resolved conflicts for merge of a976bddd to master

Change-Id: I64e1cbfb0eee891ce4d1eee40eefdcedcc501f7f
d8b26d6c424741dd09cf70ee88fd237807aaf301 10-Apr-2013 Ying Wang <wangying@google.com> Merge "Add liblog" into jb-mr2-dev
d685894212e6dbeac1fda4996903c1da115d49a6 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: I746aa8258866508c3a725d0773faf4518096548f
ndroid.mk
097fc7ef72ea8a005028d7315ca7cca2f1aa1972 10-Apr-2013 Jamie Gennis <jgennis@google.com> am bb2e031a: am 65b08486: Merge "Add APIs for application-generated systrace events" into jb-mr2-dev

* commit 'bb2e031ace9072a0bd71f6316269f3060f04aa27':
Add APIs for application-generated systrace events
45fa0cbc54f46a2c55b7db9501ff74f539190bd1 09-Apr-2013 Derek Sollenberger <djsollen@google.com> Ensure that a canvas is always backed by some form of SkDevice.

bug: 8518884
Change-Id: Id6c597179878ce5b938c00422e88bef5f12e2e1f
ndroid/graphics/Canvas.cpp
f9c7d6bc15b68393c1f0aa85c3c023c31244c3f2 25-Mar-2013 Jamie Gennis <jgennis@google.com> Add APIs for application-generated systrace events

This change adds new APIs to enable applications to generate custom Systrace
begin/end events. Application-generated events use the ATRACE_APP_TAG tag,
which is enabled only if either the application has declared itself debuggable
in its manifest or ro.debuggable is set to 1 on the device.

Change-Id: I311d09e2e6ed1a30f5ffa84907f250e11cc0d48d
ndroid_os_Trace.cpp
8c7d0f01d5b5e1691a16a3e127dc76593ec94d98 08-Apr-2013 Derek Sollenberger <djsollen@google.com> Merge "Refactoring code to support r8352 of Skia."
bdb706e48d71af498156efbb10d0f0c1fcef8878 05-Apr-2013 Michael Wright <michaelwr@google.com> Merge "Pipe through device resolution information" into jb-mr2-dev
1951ce86c21445ac191e4d2d95233f4f5c096b56 05-Apr-2013 Jeff Brown <jeffbrown@google.com> Correctly manage the lifecycle of IME InputChannels.

InputChannels are normally duplicated when sent to a remote process
over Binder but this does not happen if the recipient is running within
the system server process. This causes problems for KeyGuard because the
InputMethodManagerService may accidentally dispose the channel
that KeyGuard is using.

Fixed the lifecycle of InputChannels that are managed by the IME
framework. We now return a duplicate of the channel to the application
and then take care to dispose of the duplicate when necessary.
In particular, InputBindResult disposes its InputChannel automatically
when returned through Binder (using PARCELABLE_WRITE_RETURN_VALUE).

Bug: 8493879
Change-Id: I08ec3d13268c76f3b56706b4523508bcefa3be79
ndroid_view_InputChannel.cpp
c6091c64c90e9557ea58e0d7cf75915aea7c6c3e 02-Apr-2013 Michael Wright <michaelwr@google.com> Pipe through device resolution information

Bug: 8424494
Change-Id: Iafeeee0d5cd29342c1cdc86b9616222aaa5d1b94
ndroid_view_InputDevice.cpp
109109cdd5004789d5caf6da743986f26cb54e7b 03-Apr-2013 Derek Sollenberger <djsollen@google.com> Refactoring code to support r8352 of Skia.

Change-Id: Ica1463c84edaf7a46566d1ff792f7f73cef31997
ndroid/graphics/Graphics.cpp
ndroid/graphics/HarfBuzzNGFaceSkia.cpp
ndroid/graphics/TextLayoutCache.cpp
a4ca8ea0ad14c509d1ced46482e83c1b8a518982 03-Apr-2013 Jeff Brown <jeffbrown@google.com> Fix reference cycle in InputEventReceiver and Sender.

If the receiver or sender was not properly disposed, then
the underlying input channel might be leaked because the
native peer was holding a strong reference to the object.

Switched to using a weak reference.

Also updated Binder to use a new helper created for this purpose.

Change-Id: I19680bf96d0548777bff02aa1d91874d1e8e41da
ndroid_util_Binder.cpp
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputEventSender.cpp
10f9b0997e0bde39fa153060db022a3982b78399 01-Apr-2013 Michael Wright <michaelwr@google.com> Start input event sequence numbers at 1

Change-Id: Ia69574cb25bfced8bbeefbc23350706bacdfee12
ndroid_view_InputEventSender.cpp
a4b68908bdfefdf6c79a8b2c3d7bda00c543532f 29-Mar-2013 Victoria Lease <violets@google.com> Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev
626d3c228116103e95d4429b06dad70f9812561a 27-Mar-2013 Victoria Lease <violets@google.com> bidiFlags != SkPaint::Flags

We've a number of native functions in the text layout path that take
a bidiFlags argument. We've a number of callers of those functions
passing in SkPaint::Flags in that slot. This completely breaks text
directionality for the affected functions, as
SkPaint::kAntiAlias_Flag happens to share values with kBidi_RTL,
resulting in anti-aliased SkPaints measuring text as if it were RTL,
and non-anti-aliased SkPaints measuring text as if it were LTR,
regardless of the actual text directionality. Oops!

To address the issue, this commit replaces erroneous calls to
SkPaint.getFlags() with the value of Paint.mBidiFlags, and includes
the necessary plumbing to get that value where it needs to be.

Bug: 8471481
Change-Id: I2d04b70defed3130fc1ad13f4c9098f5fce4ffde
ndroid/graphics/Paint.cpp
6c81a93ef3c9d949b6f0b3e192feafebc96a5d91 28-Mar-2013 Jeff Brown <jeffbrown@google.com> Support specifying buffer start offset for USB requests.

Deprecated existing API which only supported passing buffer
and length in favor of a new one that also supports passing
the start.

Being able to pass a start index is very important because
the kernel imposes size limits on how much data can be transferred
at a time so we often need to transmit large buffers in chunks.

Change-Id: I3484b5e68f1ece61d4645ea04be8ee6a3b79169d
ndroid_hardware_UsbDeviceConnection.cpp
44e13ef1a1aee36b4ce667670345de8ce4e6bb7b 27-Mar-2013 Jeff Brown <jeffbrown@google.com> Disable some noisy error logs.

Disabled some error logs that occur when an input channel is
closed remotely by its peer. These can happen during normal
course of operations because the act of removing windows or
finishing IME sessions is asynchronous so both peers may react
to the change independently at different times.

The coordination with the input dispatcher is designed to
avoid logging these errors. However it's not possible to achieve
the same coordination with the IME so we might as well silence
the errors since they don't tell us anything useful.

If something truly bad happens then one of two things will occur:

1. The system will realize that the process crashed because
of a DeadObjectException or other error, so it will take
measures to clean up.

2. If the error was spurious and non-fatal (how?) then at worst
an ANR may occur because the consumer stopped reading from
the input channel. However this has never been observed
and I doubt it's even possible.

Change-Id: I11a05d6d75e63e91be003971a544069b3a0d77f4
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputEventSender.cpp
ca3d655d20c13c71972a4475cec3b98efa7dbdd0 27-Mar-2013 Jeff Brown <jeffbrown@google.com> Merge "Use input transport for communications between app and IME." into jb-mr2-dev
c28867a1d67121ce5963de135e3ae2b1dbd9a33d 26-Mar-2013 Jeff Brown <jeffbrown@google.com> Use input transport for communications between app and IME.

The input method manager service now supplies an input channel for
communication while creating an IME session on behalf of the
application.

This change significanly reduces the overhead of IME event dispatch
by using a standard input channel to send input events rather than
using binder. This results in fewer thread context switches
and fewer object allocations.

What's more, the IME may perform additional batching of the motion
events that it receives which may help it catch up if it is
getting behind while processing them.

Bug: 7984576
Bug: 8473020
Change-Id: Ibe26311edd0060cdcae80194f1753482e635786f
ndroid.mk
ndroidRuntime.cpp
ndroid_view_InputEventSender.cpp
c5f790f3ba6981c0ddf0046fffeaea1ee04b008d 26-Mar-2013 Elliott Hughes <enh@google.com> am 145e60b3: am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."

* commit '145e60b3e31f8daaf8e12dba0668c12e47968dd1':
Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
a480dafbf2f0c7e526ba44dcbb0d603470df2199 26-Mar-2013 Elliott Hughes <enh@google.com> Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.

It was possible to overrun this buffer, and even if you did fill
the buffer in a single read and exit the loop, the "string" still
wouldn't be terminated.

Bug: 8468088
Change-Id: Ia19f4d26dfd79e7b63807a7ec9540b932163d246
ndroid_ddm_DdmHandleNativeHeap.cpp
a4e16c58c9e3c983251e0475125a2a6f5bec2dbf 22-Mar-2013 Chris Craik <ccraik@google.com> Restore final canvas state after deferred flush

bug:8450062

- Fixes overdraw indication with DeferredDisplayList
- Fixes drawHardwareLayer called after flush

Additionally changes drawLayer to pass its paint to native via setLayerPaint

Wrap flush in save/restore so that reordering doesn't affect final
transform

Change-Id: I08befa42c28500da6387699eefd4be28aedf9f4c
ndroid_view_GLES20Canvas.cpp
afd10322f598abfda973ad78117dd297e09de212 21-Mar-2013 Kenny Root <kroot@google.com> am d9520336: am 20345bd8: Merge "Update SELinux JNI to use helpers"

* commit 'd9520336a74560cdd983c9480b2e6a317dd8a193':
Update SELinux JNI to use helpers
19eceaadd764ca84f386300aafd9a31c270886e9 20-Mar-2013 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #8437358 Clean any ICU related code from TextLayout / Paint and their dependencies" into jb-mr2-dev
cd19e3f2db333afcf84e2d66d9811e6ccae733a2 19-Oct-2012 Kenny Root <kroot@google.com> Update SELinux JNI to use helpers

Change-Id: Ifc707eafd1ecbba64c93fa2250c4334d0ce40005
ndroid_os_SELinux.cpp
4494599e5a4931426d5649e1d1c4f9db83824ae8 20-Mar-2013 Chris Craik <ccraik@google.com> Merge "Use snapshot alpha for layers" into jb-mr2-dev
665f02c66702b77db25e950ff433230186bc3243 20-Mar-2013 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #8437358 Clean any ICU related code from TextLayout / Paint and their dependencies

- remove the ICU related methods and update the methods using the "reserved" argument
- update to CTS in another CL too

Change-Id: I5509736568c342d9d17bfeafc17951117ab5d3cc
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
7c116b54b743cc3e92ac42abdbbe324d63b50a81 19-Mar-2013 Mathias Agopian <mathias@google.com> make Surface.java internal state thread-safe

it's still incorrect to use Surface from different
threads, however this shouldn't result to native crashes
anymore.

Bug: 8328715
Change-Id: I89ac5cc1218dc5aa0e35f8e6d4737879a442f0c6
ndroid_view_Surface.cpp
a08f95cfeca7217f9c533b03663bf0dceedd259a 16-Mar-2013 Chris Craik <ccraik@google.com> Use snapshot alpha for layers

Removes mMultipliedAlpha, using the snapshot alpha for all
non-overlapping display list alpha control.

Additionally, fixes opacity issues where children of
hasOverlappingRendering=false displaylists (both hw layer sublists and
other sublists with hasOverlappingRendering=false)

Change-Id: I6adc16da855835f9f518f8967628e5d0135c789b
ndroid_view_GLES20Canvas.cpp
261f82ca996a4b192b56350dd2eda6016f9d5203 15-Mar-2013 Fabrice Di Meglio <fdimeglio@google.com> Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev
2d93475c693dd2ac8555a19e0d8e7a689d3a22c3 15-Mar-2013 Fabrice Di Meglio <fdimeglio@google.com> Merge "Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"" into jb-mr2-dev
fe099074c49b795c2ea8cf3ae9da8799bd0c6b09 15-Mar-2013 Fabrice Di Meglio <fdimeglio@google.com> Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev
da12f389eb4be0c08ca3fa9ca7663f4977858df5 15-Mar-2013 Fabrice Di Meglio <fdimeglio@google.com> Revert "Clean Paint.mBidiFlags as it is no longer used"

This reverts commit 6d9fe5bd22b531bfce69b146254a4791c76acddc.
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid_view_GLES20Canvas.cpp
19f46b0d7a1cdba362bc3d6fc8e9251307e96bd4 15-Mar-2013 Fabrice Di Meglio <fdimeglio@google.com> Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"

This reverts commit ebcacc785b0883c9435a3e850f790785fba93370.
ndroid/graphics/Canvas.cpp
a4bf8114a73371b51a0eba9d5d61dfeb597a1abb 15-Mar-2013 Fabrice Di Meglio <fdimeglio@google.com> Revert "fix argument mismatches in Paint JNI"

This reverts commit b61fb10fe435b74a761e82f517abd0320f22193e.
ndroid/graphics/Paint.cpp
28cdf1dc222e27b11902bfb15a49331fd800cd87 15-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Don't update routes if Dhcp fails.

bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
ndroid_net_NetUtils.cpp
b1fa4f92dcd6380b14cbff9cb8aec9e175d7d60d 14-Mar-2013 Mathias Agopian <mathias@google.com> Merge "fix CloseGuard usage in Surface" into jb-mr2-dev
86e1bc730570765355dc8789b5c6de6962a053cc 14-Mar-2013 Mathias Agopian <mathias@google.com> fix CloseGuard usage in Surface

Bug: 8375415
Change-Id: I03e9f318c2ad586f4bd93b280557ada66121d275
ndroid_view_Surface.cpp
065a118e0e389dc785cda2e20fdb957361db89a0 14-Mar-2013 Mathias Agopian <mathias@google.com> Merge "Try to keep the same native Surface object when reading a parcel" into jb-mr2-dev
c3b9cd635163ae48a9151fc6e1650388c5d716be 14-Mar-2013 Mathias Agopian <mathias@google.com> Try to keep the same native Surface object when reading a parcel

If the IGraphicBufferProducers are the same, it's really the same
window, so we keep the same native object.

Bug: 8322406
Change-Id: I96d55a90e6656a05d4e32ae22945226c350b5747
ndroid_view_Surface.cpp
1aab1dbca5cf7386797ce609c768249247233186 13-Mar-2013 Jaikumar Ganesh <jaikumar@google.com> Revert "Add new sensor types."

This reverts commit bc03a348d78326dee779a8ecc325799c9fceac98.
ndroid_hardware_SensorManager.cpp
2530b32de5c609fc6738b292baaf540e4ac10cd7 13-Mar-2013 Mathias Agopian <mathias@google.com> Merge "remove uses of Surface in favor of IGraphicBufferProducer" into jb-mr2-dev
4a05f436989a49e06ec762aac9507ad13fcc5e23 13-Mar-2013 Mathias Agopian <mathias@google.com> remove uses of Surface in favor of IGraphicBufferProducer

Change-Id: I2ec590eed03c76a084ee6b0af362a3ca6476bf9f
ndroid_hardware_Camera.cpp
ndroid_view_Surface.cpp
bc03a348d78326dee779a8ecc325799c9fceac98 13-Feb-2013 Jaikumar Ganesh <jaikumar@google.com> Add new sensor types.

1. Add uncalibrated gyros and magnetic field sensor.
2. Change max number of events from 3 to 16.
3. Add new APIs for trigger sensors.

Change-Id: I1957d723de2b65c31dadaee7386fd8d51ea2f7e5
ndroid_hardware_SensorManager.cpp
b1d90c8f60f71422196c337f1d078b68867f5710 07-Mar-2013 Mathias Agopian <mathias@google.com> fix JNI use of incStrong/decStrong

Change-Id: Ia11b404dea483dc19bbc30f4d7bcff516655e180
ndroid/graphics/SurfaceTexture.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_SensorManager.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_util_Binder.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_SurfaceSession.cpp
ndroid_view_TextureView.cpp
bf49422197c81578cc3c0519143714f5006e9d38 05-Mar-2013 Elliott Hughes <enh@google.com> am 582c5b85: am 690d3435: Merge "jni: remove obsolete flag from makefile"

* commit '582c5b85c5653d93afc63b00ac1efff94d0853ab':
jni: remove obsolete flag from makefile
d625127db9ed801a23e7026e9f5a199c92eab932 24-May-2012 Bruce Beare <bruce.j.beare@intel.com> jni: remove obsolete flag from makefile

Change-Id: Ia7e67694a736745333e9d36396b8cb6194fd26ec
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ndroid.mk
0c361e9d3c93b3890fbae82b2f937bb4b3a42f70 02-Mar-2013 Andy McFadden <fadden@android.com> Add eglPresentationTimeANDROID

Added EGL extension to set a timestamp on a surface.

Bug 8191230

Change-Id: Ie73bd7d1217348c9c64b8c68da38d671d48355f7
ndroid_opengl_EGL14.cpp
0449a40586b45ee05f760802020dc2f8a6e0506b 02-Mar-2013 Mathias Agopian <mathias@google.com> screenshots can now go into a Surface from java

A Surface can trivially be created from a SurfaceTexture.
Update ElectronBeam to use this new API.

Bug: 6940974
Change-Id: I20459443d0d853e3f8ae23104c08d185c336abea
ndroid_view_SurfaceControl.cpp
62f16bfc5e90f0320ab68b66b5b5b125cada1867 02-Mar-2013 JP Abgrall <jpa@google.com> jni: net.TrafficStats: fix getIfaceStat, have it use the iface.

Missing iface8 in call to parseIfaceStats().

Bug: 8304054
Change-Id: Ibb01d86a0f7241cdd8f23401973840673f847efb
ndroid_net_TrafficStats.cpp
e606757966175e6f287e18ed2e458050f7da3731 01-Mar-2013 Nick Kralevich <nnk@google.com> am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files."

* commit 'edb95c3f3ca4e51ef0432af925b8f4330e6dae81':
ZygoteInit: use correct header files.
8b5aa4846939975adacd6ea1d2a57a2493ac0216 01-Mar-2013 Romain Guy <romainguy@google.com> Restore the ability to track native Surface changes
Bug #8230990

ViewRootImpl needs to know when the native Surface objects changes
to recreate the EGL surface. A recent refactoring in Surface broke
the behavior of getGenerationId(). This simply restores the old
behavior (every change increments the generation ID by 1.)

Change-Id: Ife1df1ffb2ee7a373b8ebf2431192702ba10f344
ndroid_view_Surface.cpp
b3c4a0bb5c95417ae6761d5df775f90da6c80fed 01-Mar-2013 Nick Kralevich <nnk@google.com> ZygoteInit: use correct header files.

Don't define capget / capset when we already have definitions
of it in our header files.

Change-Id: Ia2d7e408879bd09019f99aef52acb63a7a243d48
om_android_internal_os_ZygoteInit.cpp
5b6591c1d058a2c8008ba6f77ee0e978a84b78e9 28-Feb-2013 Derek Sollenberger <djsollen@google.com> fix issue when replacement bitmap is larger than original.

getTotalClip() returns the canvas bounds even if no explicit clip
was set. This CL fixes that issue by only transfering clips that
were explicitly set to the new canvas.

bug: 8255582
Change-Id: I0144d430e7718151ad93d988fcf20b412f74b256
ndroid/graphics/Canvas.cpp
7e112d51c4d203e4e3b2b875dc7c8457e1d9e056 27-Feb-2013 Ian Rogers <irogers@google.com> am 14d0ab55: am de3c20bc: Merge "Track stack memory in MemoryInfo."

* commit '14d0ab55e983d314128bb7b3293023f4a237d991':
Track stack memory in MemoryInfo.
7c9f30bfb361ccb864e6d130e0f4f2af53fc1c32 27-Feb-2013 Ian Rogers <irogers@google.com> Track stack memory in MemoryInfo.

In /proc/pid/maps the main stack is identified as "[stack]". In Linux 3.4
thread stacks are identified as "[stack:<tid>]" where <tid> is the thread ID of
the thread using that stack. Add support in MemInfo's otherStats to track
memory being used by the stack.

Add sanity check on the length of the otherStats array.
Add detail messages to two null pointer exceptions.

Bug: 8265251

Change-Id: I2b228b147da9bdc5c7a4d825dfc628fcc7923927
ndroid_os_Debug.cpp
c0e55bd3cfe1d7be2276e4f528fee2231763a5c1 26-Feb-2013 Eino-Ville Talvala <etalvala@google.com> Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev
19a38f6f408d8672ca8d253fb7a6039a7f25c96f 26-Feb-2013 Mathias Agopian <mathias@google.com> Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface" into jb-mr2-dev
ffddc9b8045235a493ec506965ae4892601eb23d 26-Feb-2013 Mathias Agopian <mathias@google.com> Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface

also fix a typo that made us call the wrong Surface ctor

Bug: 8225509
Change-Id: I23f92179b6003d4c3e0febb35166c1caeafa27f5
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
15284dee8efe6b4d1441ab040962077614b5061a 23-Feb-2013 Mathias Agopian <mathias@google.com> regenerate GLES java bindings

- added most missing validation checks
- glGet* validation reimplement from khronos documentation

Bug: 7402895

Change-Id: I92a805bb1aba1600d3372dc2db22eab08c975d7f
ndroid_opengl_EGL14.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
om_google_android_gles_jni_GLImpl.cpp
fec1178bbf7a2222d15a9710db58a248ec85eca2 25-Feb-2013 Ian Rogers <irogers@google.com> am 92f3e9a1: am e88c0d9e: Merge "Recognize odex files in memory accounting."

* commit '92f3e9a1fba2873c00d1d89179c051a82e924d76':
Recognize odex files in memory accounting.
788717ca599c714d58b2cb5deea1d37b4a711c07 16-Feb-2013 Eino-Ville Talvala <etalvala@google.com> Camera and MediaRecorder: Support AppOps

- Allow media processes to update AppOps state
- Pass package name to media services

Bug: 8181262
Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
ndroid_hardware_Camera.cpp
9f8589c31f8910a9c3c33a81675822da9f0cf2df 23-Feb-2013 Ian Rogers <irogers@google.com> Recognize odex files in memory accounting.

Give odex files the same heap category as dex files.

Change-Id: I82539e20ac20a2b80c63c0cfceb266d9c59e22b7
ndroid_os_Debug.cpp
0d1ab1db229ffc1d776df466b02e2b51c004df9c 23-Feb-2013 Mathias Agopian <mathias@google.com> Merge "regenerate egl/gles stubs from glgen"
89be00bcda2b5965757e83bdf70a650b64373045 23-Feb-2013 Mathias Agopian <mathias@google.com> regenerate egl/gles stubs from glgen

those are minor cosmetic changes.

Change-Id: I84ee5383577f0ca33ed7cc32d03e53c1475f068d
ndroid_opengl_EGL14.cpp
ndroid_opengl_GLES20.cpp
7508039d66a2c1a3d19d3710f0d68e2cca0d872b 22-Feb-2013 Ian Rogers <irogers@google.com> am 631bc614: am 08a92a33: Merge "Account malloc mmaped pages as native heap."

* commit '631bc614f52015a2f068c2e66030e9aa47508fb5':
Account malloc mmaped pages as native heap.
afc10e174d73363185f42cb67ec429a64549f2c7 22-Feb-2013 Ian Rogers <irogers@google.com> Account malloc mmaped pages as native heap.

Currently when malloc uses a page rather than brk the heap gets accounted as
ashmem memory. Previously the memory would be accounted as unknown but since
[1] it gets accounted as ashmem. This change makes the accounting see this
memory as being native, ie the same kind of memory we associate with brk.

[1] https://android-review.googlesource.com/#/c/49583/3

Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
ndroid_os_Debug.cpp
cbd3789801af806b07ed54fb0a7b41f46b29e076 22-Feb-2013 Jesse Hall <jessehall@google.com> am ab10f3c5: Merge "Restore a mistakenly-removed null check"

* commit 'ab10f3c5b939f3d7afe6d5561d761fc5299572bc':
Restore a mistakenly-removed null check
ab10f3c5b939f3d7afe6d5561d761fc5299572bc 22-Feb-2013 Jesse Hall <jessehall@google.com> Merge "Restore a mistakenly-removed null check"
51eb127a1735c4b6f5983e455c8a1d15ffdecda1 22-Feb-2013 Mathias Agopian <mathias@google.com> am e4d3b06b: Merge "get rid of uses of getISurfaceTexture"

* commit 'e4d3b06b6ddb055739b8b2aa82ffc7840588253a':
get rid of uses of getISurfaceTexture
aa70f2217cd01e4f09e35c3bf450b20682563378 22-Feb-2013 Jesse Hall <jessehall@google.com> Restore a mistakenly-removed null check

Passing null to camera.setPreviewDisplay() needs to work; this
restores the behavior from before the Surface/SurfaceControl
refactoring.

Bug: 8225538
Change-Id: Ib73bfa9fe53457a41a69b7fe5dfff3a3aa260f52
ndroid_hardware_Camera.cpp
1b63e60abd3082f539b4e1f4562eec2005383ba5 21-Feb-2013 Derek Sollenberger <djsollen@google.com> Fix use case where the Java Canvas is reused.

When provided with a new bitmap device the canvas will retain
certain information such as it's matrix and clip.

bug: 8167188
Change-Id: I20ac8a24eebc85fb7c147504a103ce9a95b530b3
ndroid/graphics/Canvas.cpp
f3d3b4d80618d498fb669c8bfdc492ce9ea25691 20-Feb-2013 Mathias Agopian <mathias@google.com> get rid of uses of getISurfaceTexture

Change-Id: Ibb14327a2b7217994adaa91cc977b163a5509e4a
ndroid_view_Surface.cpp
846f5f238fd96a14197022baad86eab8882fe3bc 19-Feb-2013 Romain Guy <romainguy@google.com> am e91efaba: Merge "Expose display list APIs"

* commit 'e91efabaf2c51d017bf4c5bc4e06491c3511f4e5':
Expose display list APIs
52036b19a5f82bc4d75cfcbff99c65df8d25a99b 15-Feb-2013 Romain Guy <romainguy@google.com> Expose display list APIs

The exposed APIs are slightly simpler than the full APIs used internally.
Only APIs useful to applications are exposed.

Change-Id: Ie03014628d40ad5ef63dedbc52ce3def84429d54
ndroid_view_GLES20Canvas.cpp
ndroid_view_GLES20DisplayList.cpp
4078559a1f2afcdf1e158a93c8952acb4c938ac6 16-Feb-2013 Mathias Agopian <mathias@google.com> am 8d1a6af4: Merge "fix typo introduced in SurfaceTextureClient to Surface renaming"

* commit '8d1a6af408d798dec46a8b1230b7327551fb8051':
fix typo introduced in SurfaceTextureClient to Surface renaming
f798a8e8d4f09cb1273964a48d2af1d5635d7d87 16-Feb-2013 Mathias Agopian <mathias@google.com> fix typo introduced in SurfaceTextureClient to Surface renaming

Change-Id: Iaf1ecc9f5b83a029067b278bc15180d68a113587
ndroid_view_Surface.cpp
76f56dd598045dadae6dee5e8547bd077b980d5c 15-Feb-2013 Mathias Agopian <mathias@google.com> am ceec31b7: Merge changes I5a218ca1,I853a76d9

* commit 'ceec31b7dab6a23e443d5dcbcfac4a23b720cfde':
Refactoring: Rename SurfaceTextureClient to Surface
clean-up following Surface split
df93fdb6c0d00bcbf548c4f1fa16be8bc3b15334 15-Feb-2013 Romain Guy <romainguy@google.com> am aa8307b9: Merge "Remove obsolete header file"

* commit 'aa8307b991b9fca5403b5d7f43659b92527af4fd':
Remove obsolete header file
ceec31b7dab6a23e443d5dcbcfac4a23b720cfde 15-Feb-2013 Mathias Agopian <mathias@google.com> Merge changes I5a218ca1,I853a76d9

* changes:
Refactoring: Rename SurfaceTextureClient to Surface
clean-up following Surface split
52800617946c456e78ed010c82d0ec4358368164 15-Feb-2013 Mathias Agopian <mathias@google.com> Refactoring: Rename SurfaceTextureClient to Surface

Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
ndroid/graphics/SurfaceTexture.cpp
ndroid_opengl_EGL14.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
ndroid_view_TextureView.cpp
om_google_android_gles_jni_EGLImpl.cpp
29479ebe1007361222bf6ab4d5e2a27927d4b8e8 14-Feb-2013 Mathias Agopian <mathias@google.com> clean-up following Surface split

Change-Id: I853a76d92d957ee38a36fcdd280d6407ec316987
ndroid_media_RemoteDisplay.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
13ba0054846ce630ca31e8f26169fd9388faee02 15-Feb-2013 Romain Guy <romainguy@google.com> Remove obsolete header file

We now use the same mechanism to compare keys everywhere in libhwui.

Change-Id: I8b3cb25b13f4f38eb6f12aed0356f796a773617c
ndroid/graphics/TextLayoutCache.h
88e4b3ff90b86de6e358c717dbd0959e8b1b8267 15-Feb-2013 Kristian Monsen <kristianm@google.com> Final merge fix

Fixing a crash on reboot. After this it builds and cts tests passes
as before. I don't have a device locally so can't see if it
actually works.

Change-Id: I56cd09d5f83f8096ba0fe8aa8e93ca4286f42e3a
ndroid_view_Surface.cpp
e32e2b343dca94086badfe34080fb24b4215db27 15-Feb-2013 Kristian Monsen <kristianm@google.com> Fixup from merge, and compile fix due to different skia version

Change-Id: I644c5148904893a2854207f4d566395d973d4aff
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
c85637f0e60964af101a9c43a1ae92ee2d1be168 15-Feb-2013 Victoria Lease <violets@google.com> am c69bce2e: Merge "fix argument mismatches in Paint JNI"

# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit 'c69bce2e41c70da35e1b6a2ab5ec44469ab14c80':
fix argument mismatches in Paint JNI
14567588028d0d70f7313251bda86ace2090f2ba 15-Feb-2013 Kristian Monsen <kristianm@google.com> resolved conflicts for merge of 58a1ca66 to master-chromium

Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e
c69bce2e41c70da35e1b6a2ab5ec44469ab14c80 15-Feb-2013 Victoria Lease <violets@google.com> Merge "fix argument mismatches in Paint JNI"
b61fb10fe435b74a761e82f517abd0320f22193e 15-Feb-2013 Victoria Lease <violets@google.com> fix argument mismatches in Paint JNI

Paint.getTextRunCursor() no longer has a "flags" argument on the Java
side. The native side, however, still had the argument, and was being
called with misaligned arguments, causing all manner of madcap fun.

Also, the version of Paint.getTextRunCursor() that took String as an
argument needed to lose the "flags" argument, as well, to prevent an
infinite loop in the CharSequence version of the function, which was
supposed to be calling the String version but was actually calling
itself.

Bug: 8201224
Change-Id: Iad0dabaf81185f29a082566cc64590f2ba9bc31c
ndroid/graphics/Paint.cpp
58a1ca6642d404b67e5c9e75076b9bbe08e4076b 14-Feb-2013 Mathias Agopian <mathias@google.com> Merge "split Surface in two classes: SurfaceControl and Surface"
ab31d3574997eb3a628e80929e13c4d8d7d9c2cc 14-Feb-2013 Mathias Agopian <mathias@google.com> am a41b23d5: Merge "get rid of Surface.getIdentity()"

# Via Android (Google) Code Review (1) and Mathias Agopian (1)
* commit 'a41b23d55da1bd8e68eb784f28e2c3fe9ded080e':
get rid of Surface.getIdentity()
a41b23d55da1bd8e68eb784f28e2c3fe9ded080e 14-Feb-2013 Mathias Agopian <mathias@google.com> Merge "get rid of Surface.getIdentity()"
3866f0d581ceaa165710feeee9f37fe1b0d7067d 12-Feb-2013 Mathias Agopian <mathias@google.com> split Surface in two classes: SurfaceControl and Surface

SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.

Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_Camera.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceControl.cpp
221badd071079fb3426b26a59afb6962f7c165f2 14-Feb-2013 Jeff Sharkey <jsharkey@android.com> am 7e72a693: Merge "Remove sscanf() warnings when parsing stats."

# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '7e72a693cfe2facc701d7202d91c211d212ce20e':
Remove sscanf() warnings when parsing stats.
1f6692f1f964bc315822eb29654a2318bb2983d4 14-Feb-2013 Jeff Sharkey <jsharkey@android.com> am aec6bcfb: Merge "Parse network stats using native code."

# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit 'aec6bcfb767a4b9dfd391bff338a8ff284b29549':
Parse network stats using native code.
9de56d220e6fee092e6bc70b3649939f3c0bbda4 09-Feb-2013 Jeff Sharkey <jsharkey@android.com> Remove sscanf() warnings when parsing stats.

Change-Id: I15b7ba93d7ec121f9a7e19926f7436f2117b3b1a
ndroid_net_TrafficStats.cpp
9a2c2a6da90abbcc9a064c20e93ed885651f4ae1 15-Jan-2013 Jeff Sharkey <jsharkey@android.com> Parse network stats using native code.

Switch to parsing detailed network stats with native code, which
is 71% faster than ProcFileReader.

Change-Id: I2525aaee74d227ce187ba3a74dd08a2b06514deb
ndroid.mk
ndroidRuntime.cpp
om_android_internal_net_NetworkStatsFactory.cpp
c504c4e51d93108e60ffe5a5e6c89e2ab7bb0511 14-Feb-2013 Fabrice Di Meglio <fdimeglio@google.com> am 336fcac3: Merge "Fix bug #8194572 Chrome SIGBUS\'es on launch around TextLayoutCacheKey"

# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '336fcac31ddccc7e7a6773d03e7cb17967ebb898':
Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey
ebcacc785b0883c9435a3e850f790785fba93370 14-Feb-2013 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey

- remove remaining dirFlags
- clean method names

Change-Id: I404b643cd10321e977530528168d1d415b3f2eca
ndroid/graphics/Canvas.cpp
f9136fd9692158574d187af8d4031fa4b1e2b6e6 12-Feb-2013 Mathias Agopian <mathias@google.com> get rid of Surface.getIdentity()

Change-Id: I8b70d77cc1b38009ad71d92025c3beb481a18866
ndroid_view_Surface.cpp
c932760f667cf56ca7a1aeffde505745dc3632e1 14-Feb-2013 Chris Craik <ccraik@google.com> Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE"
0c33ecd209d884a9a2b9ad807cb798583b890a08 13-Feb-2013 Fabrice Di Meglio <fdimeglio@google.com> Merge "Clean Paint.mBidiFlags as it is no longer used"
9cabb366917ec91d3dc1329ff7ea7c98c89399bb 13-Feb-2013 Victoria Lease <violets@google.com> Merge "Count baseGlyphCount once for scripts without typefaces"
7c1a49f5f5ed6613d736464bf5001b777e89ced2 13-Feb-2013 Chris Craik <ccraik@google.com> Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE

This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.

Conflicts:
packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/Typeface.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
ded5ed963c3939a2668ce1152ab60efb7bbbb2bd 12-Feb-2013 Victoria Lease <violets@google.com> Count baseGlyphCount once for scripts without typefaces

Characters from complex scripts without dedicated typefaces were
getting baseGlyphCount counted twice: once in shapeFontRun() and
then a second time during SkScalerContext::getNextContext()
chaining.

This was a problem for text runs beginning with full-width Latn
characters - shapeFontRun() would get the base glyph count for
the typeface containing those characters, then realise it had no
typeface specified for the Latn script, resetting the typeface
to default without resetting the base glyph count along with it.
Mojibake full-width Latn characters, ho!

The same issue also affected Cherokee text, which this fix also
addresses.

Bug: 8127795
Bug: 8034351
Change-Id: I058d81cffbbf86426cc3c5aafcc91a76f4fe6b62
ndroid/graphics/TextLayoutCache.cpp
6d9fe5bd22b531bfce69b146254a4791c76acddc 12-Feb-2013 Fabrice Di Meglio <fdimeglio@google.com> Clean Paint.mBidiFlags as it is no longer used

See bug #7623824

Change-Id: Ie2f9422821f6dcc73c99e8695f448e966b587b1d
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid_view_GLES20Canvas.cpp
1f7d30770abf0c243e7f577df785ad256b8bfcb0 12-Feb-2013 Dianne Hackborn <hackbod@google.com> Fix build.

Change-Id: Iaace063eaa65af842effa3e0b481a0629db58e42
ndroid_util_AssetManager.cpp
681533e0005200a3e55782f7ffe8ef516c7099c3 12-Feb-2013 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #8176917: Stabillity : Native Crash :"
e5b50a65ad26a32f6e58588ffdcbc0389eac9257 12-Feb-2013 Dianne Hackborn <hackbod@google.com> Fix issue #8176917: Stabillity : Native Crash :

/system/lib/libandroidfw.so

Change-Id: I235470fac7ad0f5a5d3432006f4dfa69620e30d8
ndroid_util_AssetManager.cpp
679d5046f245ea8b39f9b5596195f3468808dd54 05-Feb-2013 Jean-Michel Trivi <jmtrivi@google.com> Add support for querying whether the music stream is active remotely

Bug 7485803

Change-Id: I554b44bd35b017fa4030a0d89779066c96594f2b
ndroid_media_AudioSystem.cpp
8669a1669487d5974c77ffda833c6111f316861c 08-Feb-2013 Jeff Sharkey <jsharkey@android.com> Use safe buffer sizes when parsing network stats.

Change-Id: I1733c1ddc48f9410136aee7af7889fdc7be8cc10
ndroid_net_TrafficStats.cpp
62af9551c90cde9107a3a705e1b495901bcb88f9 19-Nov-2012 Jesse Hall <jessehall@google.com> Process all display events in order

Display events in each batch received from IPC were being processed in
reverse order, and stopped after the first vsync event (latest
chronologically) was handled. This makes perfect sense for vsync
events, but is broken for hotplug events.

Now we process them all in order, handling all except vsync as we see
them. For vsync events, only the last is reported.

Bug: 7491120
Change-Id: I448d139d21dc27128d75ca1d661de666fff51bcb
ndroid_view_DisplayEventReceiver.cpp
92be93a94edafb5906e8bc48e6fee9dd07f5049e 16-Jan-2013 Jeff Sharkey <jsharkey@android.com> Improve TrafficStats UID APIs.

Deprecate transport layer statistics, leaving only the summarized
network layer statistics.

Improve documentation to be clear about layers where measurements
occur, and their behavior since boot. Under the hood, move to using
xt_qtaguid UID statistics.

Bug: 6818637, 7013662
Change-Id: I9f26992e5fcdebd88c671e5765bd91229e7b0016
ndroid_net_TrafficStats.cpp
8180bcee87e0888359d6ad5b58c57ca15ace554a 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> am 3d33806a: am 1950d2e6: am af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."

# By Jangwon Lee
# Via Android Git Automerger (2) and others
* commit '3d33806af0726487badc33d8b5ed6281b3c49bef':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
af595a0f37643f12f32860fdea43fb67b74654b4 07-Feb-2013 Jeffrey Brown <jeffbrown@android.com> Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
154be52ae785a00ed091175e3eeed36d8ad14999 07-Feb-2013 Jeff Sharkey <jsharkey@android.com> Merge "Offer parsed TCP interface statistics."
4b17a1321db24b1a59c29b580aed7482a43febee 06-Feb-2013 Jeff Sharkey <jsharkey@android.com> Offer parsed TCP interface statistics.

Also switch to newer iface_stat_fmt numbers, which are measured at
XT level instead of dev.

Bug: 7903145, 6569689
Change-Id: Ibeb742966b8c89916ea31a49388a5dbe25a5f67f
ndroid_net_TrafficStats.cpp
ed77dce854ee6741ef9b276f642cdc79c981298f 07-Feb-2013 Mathias Agopian <mathias@google.com> Merge "rework SystemSensorManager.java"
f5db9b8ed42cace00d4e84b4a7e2e63a7c654b35 05-Feb-2013 Derek Sollenberger <djsollen@google.com> Merge "Changes needed to roll Skia to r7527." into master-chromium
db772d813492517dce2bd7e6e9fbc88e42b30c02 01-Feb-2013 Mathias Agopian <mathias@google.com> rework SystemSensorManager.java

- it doesn't need a dedicated thread to pull events out
- events are now sent directly to the proper looper by
the sensorservice

this simplifies things a lot.

Change-Id: Ifa32fed3eff9007a2ee03aaaa837412cb4c15e52
ndroid_hardware_SensorManager.cpp
d81ec456bb097a712bcbc093c5a1e0075434158e 04-Feb-2013 Derek Sollenberger <djsollen@google.com> Changes needed to roll Skia to r7527.

Change-Id: I84aef3f8a733c869fade06021816646001532758
ndroid.mk
7f2e4efa96c6e3ab636c5e70b5fc09b0153d30e8 04-Feb-2013 Michael Jurka <mikejurka@google.com> am c24b1448: Merge "Don\'t mark recycled bitmaps as immutable"

# Via Android (Google) Code Review (1) and Michael Jurka (1)
* commit 'c24b14481527e2f87ddb3a156b8217d32c645b10':
Don't mark recycled bitmaps as immutable
c24b14481527e2f87ddb3a156b8217d32c645b10 04-Feb-2013 Michael Jurka <mikejurka@google.com> Merge "Don't mark recycled bitmaps as immutable"
afce5a4008c494f6384e1b6b2fb4f13d33e917cb 04-Feb-2013 Michael Jurka <mikejurka@google.com> Don't mark recycled bitmaps as immutable

Helps avoid Bitmap allocations in apps that use a
pool of bitmaps and recycle them

Change-Id: I787455a5207bf90d6ed9f1622e0f7f7e1a4a6704
ndroid/graphics/BitmapFactory.cpp
d0351a67f17d93038c17955381c5eff3d0679268 04-Feb-2013 Derek Sollenberger <djsollen@google.com> am 1bce2db3: Merge "Fix return type mismatch in Region\'s JNI code."

# Via Android (Google) Code Review (1) and Derek Sollenberger (1)
* commit '1bce2db3b4ac17156066646171c82731c87aa4d1':
Fix return type mismatch in Region's JNI code.
1bce2db3b4ac17156066646171c82731c87aa4d1 04-Feb-2013 Derek Sollenberger <djsollen@google.com> Merge "Fix return type mismatch in Region's JNI code."
250f8ef24830498c2e1753d3a562ae50e609815b 01-Feb-2013 Derek Sollenberger <djsollen@google.com> Fix return type mismatch in Region's JNI code.

bug: 7620006
Change-Id: Iddca9b3739b0c116a80a900e06cede338b868e17
ndroid/graphics/Region.cpp
da805b149fde3f7f8ef404c39ef74b2fbbf7af7f 01-Feb-2013 Romain Guy <romainguy@google.com> am c5801680: Merge "Tag HardwareRenderers with a name to help debugging"

# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit 'c580168011334db756f5e68aa005d20bace69171':
Tag HardwareRenderers with a name to help debugging
ef35927abcd089652f87a985dd6dde7afde58b92 01-Feb-2013 Romain Guy <romainguy@google.com> Tag HardwareRenderers with a name to help debugging

The name of the renderer is the same as the window it belongs to.

Change-Id: Ie9adc0a1978afa026923ea41f5540eda6ba65a92
ndroid_view_GLES20Canvas.cpp
2dbd185fd0e5dfe9addb677f42716c442b7e62bd 30-Jan-2013 Derek Sollenberger <djsollen@google.com> resolved conflicts for merge of c93c6aa5 to master-chromium

Change-Id: I51429ed5359355025f873ccab11bfabbbe772a46
c93c6aa5553203f05df871804517885fcc071cfd 30-Jan-2013 Chris Craik <ccraik@google.com> Merge "Object-based DisplayList recording"
c90616616118430306f524c42cc2c9ffa2c5aa21 30-Jan-2013 Nick Kralevich <nnk@google.com> am 4ec799d4: Merge "Remove dead code."

# Via Android (Google) Code Review (1) and Nick Kralevich (1)
* commit '4ec799d4c6de7e626363659508f21ee5c3c173aa':
Remove dead code.
40779e50f04b0d03b49836c640308061f88ff0be 30-Jan-2013 Nick Kralevich <nnk@google.com> Remove dead code.

Setting capabiltities is handled by dalvik. This code
is never called.

Change-Id: I903952c43cf60ea59ec954c9168a7604d05ccaf7
om_android_internal_os_ZygoteInit.cpp
8dd68d794c43cb8a9313eb523103706aff7b4a58 29-Jan-2013 Jeff Brown <jeffbrown@google.com> am 5988335a: Merge "Optimize Looper JNI code."

# Via Android (Google) Code Review (1) and Jeff Brown (1)
* commit '5988335aacdbea5b60b597fa2c52583bc655e30f':
Optimize Looper JNI code.
864693461b6223a995038847591b17abe2de647e 28-Jan-2013 Jeff Brown <jeffbrown@google.com> Optimize Looper JNI code.

Use static native methods.

Release the native looper objects as soon as the Looper quits
instead of waiting until the GC finalizer to take care of it.

Change-Id: I02783e48782a8f972ec2138862f700ade33d8e78
ndroid_os_MessageQueue.cpp
2af4635e4a9e448a65ff541252f8f94bc6ac48e0 27-Nov-2012 Chris Craik <ccraik@google.com> Object-based DisplayList recording

bug:8037003

Changes the DisplayList from using stream read/write commands to use an array of
objects manually allocated on a linear buffer.

Depends on frameworks/native change https://googleplex-android-review.googlesource.com/#/c/257695/ which adds LinearAllocator

Also changes drawRects to use float count instead of rect count, to be more like drawLines/drawPoints

Change-Id: Ia2e4a11acd8f0a757042a05cbc9e7563cb73ee47
ndroid_view_GLES20Canvas.cpp
37afa4a4edc36444d1b26a1510182d96a093c8d6 18-Jan-2013 Jeff Sharkey <jsharkey@android.com> am 5a0252da: Merge changes Ib8b18f1b,I0d799d82,Ia6222322

* commit '5a0252da779a98b98c0ef5053c2d20b7bd66de34':
Always give ContentResolver a valid Context.
Define failed connections column, and reset.
Add method to get process group.
9e57c414f39e1a31349bc215635fdcfaf1902cee 17-Jan-2013 Jeff Sharkey <jsharkey@android.com> Add method to get process group.

Change-Id: Ia62223228a54a6a4e3cdfc5c2e8c73ee194e77ef
ndroid_util_Process.cpp
8c02c724758b3587ae5d5ffbb970070368940c7d 17-Jan-2013 Jeff Sharkey <jsharkey@android.com> am 54298652: Merge "Reduce TextLayoutCache logging."

* commit '5429865241f1e63f52fbbcf5d97fcca0ec68e793':
Reduce TextLayoutCache logging.
3f32a313db6f765e743bee0693febfff6eb95c75 17-Jan-2013 Jeff Sharkey <jsharkey@android.com> Reduce TextLayoutCache logging.

Change-Id: I09ae49b0a9708de219b18b00ce5b82ee4a0b2bcd
ndroid/graphics/HarfBuzzNGFaceSkia.cpp
7d73eb049fef6abdba3e2dd30dc4a5c10b4a6588 17-Jan-2013 Junichi Monma <monma@google.com> am 6d191ed9: Added the necessary Harfbuzz scripts for rendering Japanese text correctly.

* commit '6d191ed99491f209168e88f3d570e89c6836285b':
Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
6d191ed99491f209168e88f3d570e89c6836285b 17-Jan-2013 Junichi Monma <monma@google.com> Added the necessary Harfbuzz scripts for rendering Japanese text correctly.

bug id : b/8023135

Change-Id: Ie9a69f480026302ff949fdf2b4089e4d95a38fb0
ndroid/graphics/TextLayoutCache.cpp
1893d443ebdacfc2782c6ebbebf4b6df2036dd3f 16-Jan-2013 Kristian Monsen <kristianm@google.com> am 2d76d4f3: Fix build break in master-chromium

* commit '2d76d4f35ca8d0bcb45159555aa7715b7070a751':
Fix build break in master-chromium
2d76d4f35ca8d0bcb45159555aa7715b7070a751 16-Jan-2013 Kristian Monsen <kristianm@google.com> Fix build break in master-chromium

Include needed headers and sort them correctly.

Change-Id: I8557c98234d86f4d0b105182f4f191a826c9aeb5
ndroid/graphics/TextLayoutCache.h
0728441b932ab806f3616367554fb0618e49d93a 16-Jan-2013 Raph Levien <raph@google.com> am e45113a1: Merge "Attempt to resolve build breakage on x86"

* commit 'e45113a1564c6e701fcc076813bee276d501c576':
Attempt to resolve build breakage on x86
77b74d4f937a9ef959dbee494888ea7860a6a6d0 15-Jan-2013 Raph Levien <raph@google.com> Attempt to resolve build breakage on x86

If the scalblnf function is not available but scalbnf is, this patch
should fix the build.

Change-Id: Id83faba3298a44d57f4c924862a15c5d2bef3ca0
ndroid/graphics/HarfBuzzNGFaceSkia.h
49a7e454d1c775ded9ebe1308fd6f51861a2ed0b 15-Jan-2013 Raph Levien <raph@google.com> am 7cd0859a: Merge "Update framework text layout to use Harfbuzz NG"

* commit '7cd0859a735c0c6a489d70d5d96e44e9d1a27be8':
Update framework text layout to use Harfbuzz NG
7cd0859a735c0c6a489d70d5d96e44e9d1a27be8 15-Jan-2013 Raph Levien <raph@google.com> Merge "Update framework text layout to use Harfbuzz NG"
616a87736d819a7fe4e1d60d4703aabc7b888cd7 15-Jan-2013 Romain Guy <romainguy@google.com> am 61840eb0: Merge "Preliminary Support for region clipping"

* commit '61840eb03882e1a964ae971725bd21229c3db42c':
Preliminary Support for region clipping
aaedde51b76901ff05f2a2348eb41f0f5323d954 30-Oct-2012 Raph Levien <raph@google.com> Update framework text layout to use Harfbuzz NG

These are the frameworks changes to use the new version of Harfbuzz.

Change-Id: Idbef325e8fc1c27a9f2296414ddb1f79b778a00e
ndroid.mk
ndroid/graphics/HarfBuzzNGFaceSkia.cpp
ndroid/graphics/HarfBuzzNGFaceSkia.h
ndroid/graphics/HarfbuzzSkia.cpp
ndroid/graphics/HarfbuzzSkia.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
735738c4ddf3229caa5f6e634bf591953ac29944 03-Dec-2012 Romain Guy <romainguy@google.com> Preliminary Support for region clipping

Region clipping, using Canvas.clipPath or Canvas.clipRegion, requires
a stencil buffer to be always present. In addition, extra wiring is
required in JNI and display lists.

This change only adds the necessary JNI/C++ APIs and some extra
plumbing to start the real work on properly supporting region
clipping.

A new debug define called DEBUG_CLIP_REGIONS can be used to draw
the current clip region. It is off by default, as is region
clipping.

The default implementation of clipPath() and clipRegion(), now
in native, mimics the previous Dalvik implementation to prevent
regressions.

Change-Id: I7903e7cfd7412b9b9b622566d4dbfce7bdcec00c
ndroid_view_GLES20Canvas.cpp
66900f1d17a264e2ad1d8b36be4ac38eee6617b1 12-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> am a268ba51: Merge "Up our DNS server support from 2 > 4"

* commit 'a268ba51f77527585363e48aec1be45b9ec97061':
Up our DNS server support from 2 > 4
a268ba51f77527585363e48aec1be45b9ec97061 12-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Up our DNS server support from 2 > 4"
3c97f944eb08a2720b43382d94a56383c2cd6b9b 10-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Up our DNS server support from 2 > 4

bug:5958524
Change-Id: I81a9d9293049bcfc16c15ee856887aa7ed076638
ndroid_net_NetUtils.cpp
fc615a0f643408956fc0dc1b997871e2b27cee7e 20-Dec-2012 Derek Sollenberger <djsollen@google.com> Remove calls to SkCanvas::setBitmapDevice()

Change-Id: Ib0aa2f65b77802b105c0e8a9d7cdde2e863d3673
ndroid/graphics/Canvas.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
7bac55434caa9de7fc31f6fd8b0384042c700b4c 05-Jan-2013 Romain Guy <romainguy@google.com> am 9acd1b4f: Merge "Add visual profiling feature"

* commit '9acd1b4fa897f3a007dd23dc1f0471b151fa03ad':
Add visual profiling feature
672433d90fab7383cd28beac9d4485b566a90940 05-Jan-2013 Romain Guy <romainguy@google.com> Add visual profiling feature

When profiling is enabled with debug.hwui.profile set to true,
setting debug.hwui.profile_visualizer to true will display the
profiling data directly on screen.

Change-Id: I3d5fe3f0347090815087b1cbfce66b8e76d9347b
ndroid_view_GLES20Canvas.cpp
360b4d9418efc245e47c2241d867a7acdd5c0f61 02-Jan-2013 Siva Velusamy <vsiva@google.com> am af80cdd7: Merge "DdmServer: add controls for OpenGL tracing"

* commit 'af80cdd7dfa28158fa91ab374d8e6d2500de66b1':
DdmServer: add controls for OpenGL tracing
af80cdd7dfa28158fa91ab374d8e6d2500de66b1 02-Jan-2013 Siva Velusamy <vsiva@google.com> Merge "DdmServer: add controls for OpenGL tracing"
616e19ff51d9d573c7e605293e3ddc104c16c3ab 28-Dec-2012 Elliott Hughes <enh@google.com> am e2d3156b: am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak"

* commit 'e2d3156badd95ecb1b4f6e4b07f4e3acf2f5dffa':
StringBlock_nativeCreate: Possible Leak
e2d3156badd95ecb1b4f6e4b07f4e3acf2f5dffa 28-Dec-2012 Elliott Hughes <enh@google.com> am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak"

* commit '2fbc67abb9c79df942e0bbff118017d6d2476cbf':
StringBlock_nativeCreate: Possible Leak
52403160a2e668c465caec00e0ecbc247388890f 20-Dec-2012 Victoria Lease <violets@android.com> am d07d7fd0: am 5ddfa247: am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance"

* commit 'd07d7fd0166a8bfecbf6fc0db81a75eedd997f1e':
Possible leak in android_emoji_EmojiFactory_newInstance
d07d7fd0166a8bfecbf6fc0db81a75eedd997f1e 20-Dec-2012 Victoria Lease <violets@android.com> am 5ddfa247: am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance"

* commit '5ddfa24776f971d45e5fc80189abb3edd715818d':
Possible leak in android_emoji_EmojiFactory_newInstance
218a313bb051e9dc1c774425d698b0832cb3de16 20-Dec-2012 You Kim <you.kim72@gmail.com> StringBlock_nativeCreate: Possible Leak

osb can be leaked when osb->getError() != NO_ERROR

Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
ndroid_util_StringBlock.cpp
fc56015bd3d86e470fdf3ac8449776809124875e 20-Dec-2012 Victoria Lease <violets@android.com> Merge "Possible leak in android_emoji_EmojiFactory_newInstance"
541752cb4c947bd047afadb57181827506a6012a 20-Dec-2012 Glenn Kasten <gkasten@android.com> am 85487494: am 2326be4f: am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"

* commit '8548749404a4ddad26afbaba9f4efa6a05378046':
Leak in ToneGenerator_native_setup
8548749404a4ddad26afbaba9f4efa6a05378046 20-Dec-2012 Glenn Kasten <gkasten@android.com> am 2326be4f: am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"

* commit '2326be4fa9cb3b523a3ea13875e91bdc437da33d':
Leak in ToneGenerator_native_setup
2a3b91846e73cf6917b50050206e10fafd0302b1 20-Dec-2012 Jangwon Lee <jangwon.lee@lge.com> Fix bugs regarding IllegalStateException during moving position in cursorwindow.

"startPos + addedRows < requiredPos" could miss a row in boundary position.
Because of the fluctuating row size, "startPos + addedRows < requiredPos" expression could miss a row in boundary position.
For example, simply speaking,
if window capacity = 120 and requiredPos = 120,
"fillWindow" needs to be newly called and "starPos" is 80 for the window.
Unfortunately 120th row is bigger than the rest size of the window,
the row for requiredPos is not in the window.
Then, startPos has to be newly set and the 120th row has to be included in the window.
But by the expression above "startPos + addedRows < requiredPos",
the row for requiredPos is regarded as included in the window.
In that case, by "mCurrentRowID = Long.valueOf(getLong(mRowIdColumnIndex));" statment in AbstractCursor,
IllegalStateException is thrown.

This patch contains modification of the expression as "startPos + addedRows <= requiredPos".

Change-Id: Iaee75241e495949b0a624b836843da18d0bcb98d
ndroid_database_SQLiteConnection.cpp
0c1761bd37815c3776608a19c8e11d862b3e910c 15-Dec-2012 Siva Velusamy <vsiva@google.com> DdmServer: add controls for OpenGL tracing

Add a new JDWP packet to allow control of OpenGL tracing.

Change-Id: Ic89e2f6299238a612df2f914581049f2cbba088c
ndroid/opengl/util.cpp
ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf 19-Dec-2012 Glenn Kasten <gkasten@android.com> Merge "Leak in ToneGenerator_native_setup"
2fa54cef47887808d006f473a7d4f8dd5fb76704 19-Dec-2012 Derek Sollenberger <djsollen@google.com> Merge "Update framework to support r5967 of Skia." into master-chromium
d47f7d8b5fe3a3861d7cbdc5f912235407823c8e 18-Dec-2012 Andy McFadden <fadden@android.com> Rename ISurfaceTexture and SurfaceTexture

The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50
ndroid/graphics/SurfaceTexture.cpp
ndroid_hardware_Camera.cpp
ndroid_media_RemoteDisplay.cpp
ndroid_opengl_EGL14.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_Surface.cpp
ndroid_view_TextureView.cpp
om_google_android_gles_jni_EGLImpl.cpp
53e621f2f326b9d782b17434316c3eb2593e1fe9 16-Dec-2012 Elliott Hughes <enh@google.com> am 898d8048: am 2eca1b53: Merge "Add return after NULL check in JetPlayer"

* commit '898d8048b69124e919935903da97757ad2ebea4c':
Add return after NULL check in JetPlayer
ca79cf69d09efa0c327e9b1237d86a119aea5da7 14-Aug-2012 Derek Sollenberger <djsollen@google.com> Update framework to support r5967 of Skia.

bug: 6906025
Change-Id: Iefdb830ec3aa2ab3472c1c142484a7aa21788a15
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/Typeface.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_Surface.cpp
82bb813f112d9565faa990e32dbe833f96461892 12-Dec-2012 Jamie Gennis <jgennis@google.com> stop using a deprecated SurfaceTextureClient ctor

Change-Id: Ie6196ba4896c0ab37b9aed3d1a4ffd04c99c5f80
ndroid/graphics/SurfaceTexture.cpp
ndroid_opengl_EGL14.cpp
ndroid_view_TextureView.cpp
om_google_android_gles_jni_EGLImpl.cpp
8f5691fd92c29c1dbe9e35f39e9550ab525add07 11-Dec-2012 You Kim <you.kim72@gmail.com> Add return after NULL check in JetPlayer

When pointer lpJet is NULL, it should return.

Change-Id: Ia0471173b57da8f9bf22b3a19479aa5b3c4a5acb
ndroid_media_JetPlayer.cpp
092eb8d43baffd7723bc7847c180a32fb5269481 03-Dec-2012 You Kim <you.kim72@gmail.com> Remove possible leak when exception occurred.

nameUtf8 is not released after exception.
In addtion, Fix code going down after ThrowException.

Change-Id: Id46e8ed55acd98e982ae532f7da2c0c48847f010
ndroid_net_LocalSocketImpl.cpp
b6ac9e50cf1263979dfbab0430fb0e26d32224cd 10-Dec-2012 You Kim <you.kim72@gmail.com> Possible leak in android_emoji_EmojiFactory_newInstance

jchars is not released correctly if factory is NULL.
In addition, unnecessary string conversion removed.

Change-Id: I3ea58391dfe7a96ea6d6ae61bb0867a2d8d49fb0
ndroid_emoji_EmojiFactory.cpp
efafb775007e76bf50e7a3ce5b63c81c7965d6ab 10-Dec-2012 Nick Kralevich <nnk@google.com> am c0ffba90: am 261bc704: Merge "convert jint to uint32_t."

* commit 'c0ffba907f6ab539ced94e089ccb4abbf7c2808f':
convert jint to uint32_t.
7353cf305e9bbb2c5968358d34ead9ca9df970b1 08-Dec-2012 Nick Kralevich <nnk@google.com> convert jint to uint32_t.

This works around a compiler bug, and is probably more
correct anyway.

Change-Id: I1c49064bd64c31dafae560e416c665de0449f245
ndroid_util_EventLog.cpp
8a5f9c19b65aebd1972355faf0c8bb90500c7596 06-Dec-2012 You Kim <you.kim72@gmail.com> Leak in ToneGenerator_native_setup

Failure in ToneGenerator::isInit causes a leak.
lpToneGen should be deleted.

Change-Id: I48df7a328fed01be8412d5449ee0753dad3c101f
ndroid_media_ToneGenerator.cpp
2b0b6596e4300350a84bbe917fd87f3b79bd2888 06-Dec-2012 Glenn Kasten <gkasten@google.com> Merge "Replace run-time modes by compile-time constants"
8a18043436c39eb40f1147482afb4cf854168d95 05-Dec-2012 Glenn Kasten <gkasten@google.com> Merge "new can't fail on Android"
1adb715bc6d088ed31f211bfdceded7c205a7d98 29-Nov-2012 Glenn Kasten <gkasten@google.com> new can't fail on Android

Change-Id: I0e048d3d8ba1ec34d13684b9fd898035d3381db8
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_ToneGenerator.cpp
5bb3c730f5ebd2a0db1b02a8981c6fdbea6c1a2e 30-Nov-2012 Romain Guy <romainguy@google.com> Apply dev. settings at runtime
Bug #7434649

Change-Id: I16f00eaa8a5eefd9f9849e196cf2cb1659215390
ndroid_view_HardwareRenderer.cpp
3d301cb2b1d9e61c3af8a8b0b9db370d3d7abf77 16-Jan-2012 Glenn Kasten <gkasten@google.com> Replace run-time modes by compile-time constants

Simplify the code to use the constant values of MODE_STATIC and
MODE_STREAM from AudioTrack.java.

There is already a comment in AudioTrack.java saying that these symbols
need to be kept in sync with this file, and they are public static final
so they can never be changed.

Change-Id: I6cb10ac511df4845610454d1659e64d9195d67cd
ndroid_media_AudioTrack.cpp
b8dca777caafe1fd8c6ff6a1cc9e1bdd55f8e4c1 29-Nov-2012 Romain Guy <romainguy@google.com> Merge "Use LruCache instead of GenerationCache in libhwui"
a4caee0115b94c2803f155d850fc507db124891a 29-Nov-2012 Romain Guy <romainguy@google.com> Merge "Cleanup: remove unused property"
1741d73441d554812654ae0893a0140c2678c7d7 29-Nov-2012 Romain Guy <romainguy@google.com> Cleanup: remove unused property

Change-Id: I09b418ef8888c42a876cb9014b22231ec31ca7eb
ndroid_view_HardwareRenderer.cpp
059e12ccd20f5c249724a8362d6bac325334ea76 29-Nov-2012 Romain Guy <romainguy@google.com> Use LruCache instead of GenerationCache in libhwui

Change-Id: Ic26ddc7151eb5462bcd243b21daf7187ed6d3bec
ndroid/graphics/Paint.cpp
8a6787b1c7f5192388436373465c35655cc8ef7c 15-Nov-2012 Alex Ray <aray@google.com> core: Update Java wrappers for atrace.

Atrace functionality moved to cutils. Add ATRACE_TAG_HAL.

Change-Id: I80e1c9438bfd2436559b64e94e4009cb9c5dbc09
ndroid_os_Trace.cpp
16823bd611689e9b5c0e1b675fee43579f85612a 19-Nov-2012 Jesse Hall <jessehall@google.com> Process all display events in order

Display events in each batch received from IPC were being processed in
reverse order, and stopped after the first vsync event (latest
chronologically) was handled. This makes perfect sense for vsync
events, but is broken for hotplug events.

Now we process them all in order, handling all except vsync as we see
them. For vsync events, only the last is reported.

Bug: 7491120
Change-Id: I04528fea8f38c1013734d4aa92fb1955ac24d7cc
ndroid_view_DisplayEventReceiver.cpp
60bfacd8ef765f7f8ee43224a9d85960dea2b1c8 16-Nov-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Support for dns domain."
8058f621891b41c6864b6004c1c47647436a0ac1 09-Nov-2012 Robert Greenwalt <rgreenwalt@google.com> Support for dns domain.

bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
ndroid_net_NetUtils.cpp
fd1e3dfde2a70906c50144a7b1b53593ec1f7891 14-Nov-2012 Glenn Kasten <gkasten@google.com> Use size_t for frame count

Change-Id: Idd364443715a920ece2cc54acc95b395b6ed2c6c
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
85fbc871ded0f71f9638f85e7d2f03a35bf39dda 14-Nov-2012 Glenn Kasten <gkasten@google.com> Use uint32_t for sample rate

Change-Id: If6d4f53254b630dc479af22b77b59555b43eeab4
ndroid_media_AudioTrack.cpp
321020b7e08215b813f15caaad1c59ac215831c6 09-Nov-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove DhcpInfoInternal"
4717c261b2c670d5c0925e3527a864aa52db6ac0 31-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Remove DhcpInfoInternal

First step in accepting a set of patches.
bug:6799630

Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
ndroid_net_NetUtils.cpp
8449bb0378973987bfef56a9ce49e6d12aa7cace 08-Nov-2012 Irfan Sheriff <isheriff@google.com> am 37794c20: am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev

* commit '37794c200fa24e622d842d420b49a2a2a87a38bb':
Stop supplicant and dhcp before start
37794c200fa24e622d842d420b49a2a2a87a38bb 08-Nov-2012 Irfan Sheriff <isheriff@google.com> am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev

* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
Stop supplicant and dhcp before start
e4d08f11c49ff4c554df80c12fa2b5b04831e2f5 07-Nov-2012 Elliott Hughes <enh@google.com> am 9197d170: am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT."

* commit '9197d170b770f2b87abd0cd0e13dcf71e5a181c2':
It's 2012. We're always WITH_JIT.
9197d170b770f2b87abd0cd0e13dcf71e5a181c2 07-Nov-2012 Elliott Hughes <enh@google.com> am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT."

* commit 'fec5f611fef4fc3b7afa5d7194f4f40d156157ac':
It's 2012. We're always WITH_JIT.
f264e8e34e32bfb8e7e75b61b9da9b6f219690b0 07-Nov-2012 Irfan Sheriff <isheriff@google.com> am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev

* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
Stop supplicant and dhcp before start
be8b47f6ce739739caa2e2b36d7b0b336ca9eebb 07-Nov-2012 Elliott Hughes <enh@google.com> It's 2012. We're always WITH_JIT.

Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
ndroid.mk
ndroidRuntime.cpp
511d5346ced4b37e4ba68e0bd089d4dad8b3bff7 04-Nov-2012 Irfan Sheriff <isheriff@google.com> Stop supplicant and dhcp before start

Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
ndroid_net_wifi_Wifi.cpp
1a94c7db9fc78e8e7a9d48546622776d27a79a6a 05-Nov-2012 Igor Murashkin <iam@google.com> Merge "Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListener"
c99db2bc460cc795947d99076da380e22a21e493 29-Oct-2012 Igor Murashkin <iam@google.com> Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListener

Bug: 7425644
Change-Id: I7ccdc0ef421df7240d6cff9222c37411b1ecaf01
ndroid/graphics/SurfaceTexture.cpp
ndroid_hardware_Camera.cpp
b24a1b7f99c4ada2fe45a670962afdf1ddd7f67b 30-Oct-2012 Glenn Kasten <gkasten@google.com> Remove obsolete references to libmedia_native

Bug: 6654403
Change-Id: I05d8e81fd31617b587fd1228a303c40db83e7f2d
ndroid.mk
178705f45d6334d1f64185172068d95b31f208ec 29-Oct-2012 Raph Levien <raph@google.com> Merge "Modify TextLayoutCache to use new LRU cache"
d98efca7383f5f3cdae438a8a8a18f78451a95ba 26-Oct-2012 Raph Levien <raph@google.com> Modify TextLayoutCache to use new LRU cache

This patch modifies TextLayoutCache to use the new hash-based LRU
caching mechanism, which should be significantly faster than the
old GenerationCache implementation.

Change-Id: I6170462ad93a56156a731a2927680164d62b5cfc
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
8b9750c1bba490fad6e3d296ffdc006a4a0f8b70 24-Oct-2012 Jamie Gennis <jgennis@google.com> am fec93f67: am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

* commit 'fec93f67190f7ced8578130e2340dee0e4010a33':
Surface: add the PhysicalDisplayInfo#secure field
fec93f67190f7ced8578130e2340dee0e4010a33 24-Oct-2012 Jamie Gennis <jgennis@google.com> am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

* commit '39c68da57b443c869378263b8063da6e821a1b6d':
Surface: add the PhysicalDisplayInfo#secure field
39c68da57b443c869378263b8063da6e821a1b6d 24-Oct-2012 Jamie Gennis <jgennis@google.com> am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

* commit 'cd79b35c3828e0ebf4c9e68da75f9d857ccf01db':
Surface: add the PhysicalDisplayInfo#secure field
cd79b35c3828e0ebf4c9e68da75f9d857ccf01db 24-Oct-2012 Jamie Gennis <jgennis@google.com> Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
95429c3d1b8113c23b0aad3b74d724dccfad7fa9 23-Oct-2012 Jamie Gennis <jgennis@google.com> Surface: add the PhysicalDisplayInfo#secure field

Bug: 7368436
Change-Id: I38bf7bbfca354380c30da7516f628cf40416d350
ndroid_view_Surface.cpp
aaee13176efb494d28531ae3e2e7ae71c4627dcf 23-Oct-2012 Chet Haase <chet@google.com> am 85c1aef9: am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev

* commit '85c1aef929b40f6fae31938b9c71160865d67f81':
Don't null the reference to Bitmap pixels until we're really ready
85c1aef929b40f6fae31938b9c71160865d67f81 23-Oct-2012 Chet Haase <chet@google.com> am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev

* commit '6534dd0275c8d01de7e7400ba239d203c37c8164':
Don't null the reference to Bitmap pixels until we're really ready
6534dd0275c8d01de7e7400ba239d203c37c8164 23-Oct-2012 Chet Haase <chet@google.com> am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev

* commit '74261d847f64ccfeba0a7f08f6c59473a3b6647d':
Don't null the reference to Bitmap pixels until we're really ready
74261d847f64ccfeba0a7f08f6c59473a3b6647d 23-Oct-2012 Chet Haase <chet@google.com> Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev
547e66531d521eb1eadac87edb0f79f8c2f1bbe0 23-Oct-2012 Chet Haase <chet@google.com> Don't null the reference to Bitmap pixels until we're really ready

A change in the VM triggers a native memory error more aggressively than before,
showing that there's a bug in the logic of recycling bitmaps. Since the pixel
memory is allocated on the Java heap, nulling out the reference to that memory
in the Java level Bitmap object can cause that memory to get collected at any time.
Meanwhile, we may have a reference to that memory at the native level for rendering
purposes, causing an error if/when we access that memory after it has been collected
by the VM.

The fix is to avoid setting the reference to the pixels to null unless we are
not referring to it in native code. This is determined at the time we call
recycle() - we return a boolean to indicate whether the native code is still
using the memory. if not, the Java code can null out the reference and allow the
VM to collect it. Otherwise, it will get collected later when the encompassing
Bitmap object is collected.

Issue #7339156 HTML5 tests crash the app (Vellamo)

Change-Id: I3a0d6b9a6c5dd3b86cc2b0ff7719007e774b5e3c
ndroid/graphics/Bitmap.cpp
e8c18cb36b6e7ddd7db7a13553fa69ef6167ae54 22-Oct-2012 Jamie Gennis <jgennis@google.com> am 5bbfcd3e: am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev

* commit '5bbfcd3e15048f94310da6cba85be8ab047c0e8b':
Set the secureness when creating displays
5bbfcd3e15048f94310da6cba85be8ab047c0e8b 22-Oct-2012 Jamie Gennis <jgennis@google.com> am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev

* commit '9fee7bd73d1231172267cde99d2374cf072c2dca':
Set the secureness when creating displays
9fee7bd73d1231172267cde99d2374cf072c2dca 22-Oct-2012 Jamie Gennis <jgennis@google.com> am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev

* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
Set the secureness when creating displays
7bbf8163fb83afc54b353a8def52bfb87ecce047 20-Oct-2012 Jamie Gennis <jgennis@google.com> Set the secureness when creating displays

This change makes use of the new 'secure' argument to the
ISurfaceComposer::createDisplay method. In this change both the overlay and
wifi displays are hard-coded to be non-secure displays.

Bug: 7368436
Change-Id: Ib65312f2adab5104d8deefbfc32af9dc106a9129
ndroid_view_Surface.cpp
05606be8580071ed8b245753e72fa24e31e29dc1 18-Oct-2012 Romain Guy <romainguy@google.com> am 3786a9b9: am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev

* commit '3786a9b97a5a149c7f8a68a0f6c4cc4c063be7ac':
Take into account the texture layer's transform for clipping Bug #7370212
3786a9b97a5a149c7f8a68a0f6c4cc4c063be7ac 18-Oct-2012 Romain Guy <romainguy@google.com> am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev

* commit '07a9ebd1a01bc2819a90ddc98263a24bd6459768':
Take into account the texture layer's transform for clipping Bug #7370212
07a9ebd1a01bc2819a90ddc98263a24bd6459768 18-Oct-2012 Romain Guy <romainguy@google.com> am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev

* commit 'b8460d153a1e6dfc6a02ab127d4b5b5e82386137':
Take into account the texture layer's transform for clipping Bug #7370212
b2e2f2470693e78baed20617f989d9a166864ed4 18-Oct-2012 Romain Guy <romainguy@google.com> Take into account the texture layer's transform for clipping
Bug #7370212

Change-Id: Ibdc3161306f54a1cfe66e08458f05ee01a13b1df
ndroid_view_GLES20Canvas.cpp
7dbf63665b2ea0db304b84439613f047c856e6ea 17-Oct-2012 Bart Sears <bsears@google.com> am ae232842: am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev

* commit 'ae232842c86f108da5a73c047eff5a09e9c9c222':
Fix native crash while saving a panorama.
ae232842c86f108da5a73c047eff5a09e9c9c222 17-Oct-2012 Bart Sears <bsears@google.com> am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev

* commit 'b112bb6684b336dc4f3287af65708e0934933d3d':
Fix native crash while saving a panorama.
b112bb6684b336dc4f3287af65708e0934933d3d 17-Oct-2012 Bart Sears <bsears@google.com> am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev

* commit '0ee71adde01298784a2cbb667c4c1570bdbf0af0':
Fix native crash while saving a panorama.
0ee71adde01298784a2cbb667c4c1570bdbf0af0 17-Oct-2012 Bart Sears <bsears@google.com> Merge "Fix native crash while saving a panorama." into jb-mr1-dev
21dc0aa5a4e54d00bfe7adcc0517871931abd1e6 17-Oct-2012 Kenny Root <kroot@google.com> am ad0090e7: resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp

* commit 'ad0090e7b8c70cf44609aafbfea8c3946e2802a9':
Remove HAVE_SELINUX guards
ad0090e7b8c70cf44609aafbfea8c3946e2802a9 17-Oct-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp

Change-Id: I9ae49075935f0e9ec432ce9d828ee26a4fcdb44c
4b63f14c96841d02b6bffce987f7705b6aa8e2a9 16-Oct-2012 Wu-cheng Li <wuchengli@google.com> Fix native crash while saving a panorama.

YuvToJpegEncoder should handle the case when the height is not
multiples of 16.

bug:7165606

Change-Id: I02f142b233c4f5c0cd8df5e3d1eaebbf62d28052
ndroid/graphics/YuvToJpegEncoder.cpp
ndroid/graphics/YuvToJpegEncoder.h
c9a1aabc49d31370e3bf41f85b805499640230b1 17-Oct-2012 Kenny Root <kroot@google.com> Remove HAVE_SELINUX guards

Change-Id: I6c2161471f657aa1645695ffd56ff434b0c2b426
ndroid.mk
ndroid_os_SELinux.cpp
ef9f40f11e252d67cede28fea3a3df4880531dcd 17-Oct-2012 Romain Guy <romainguy@google.com> am b7b30eb0: am fa71ba2c: am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev

* commit 'b7b30eb0577e794c744a1e3e3079325f73081c3d':
Add API to enable mipmaps on Bitmap Bug #7353771
b7b30eb0577e794c744a1e3e3079325f73081c3d 17-Oct-2012 Romain Guy <romainguy@google.com> am fa71ba2c: am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev

* commit 'fa71ba2c847622c0b23321477b3914f4a4cdd536':
Add API to enable mipmaps on Bitmap Bug #7353771
fa71ba2c847622c0b23321477b3914f4a4cdd536 17-Oct-2012 Romain Guy <romainguy@google.com> am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev

* commit '1b85122bd22c4528679ae8bd67077dfc2fdf1847':
Add API to enable mipmaps on Bitmap Bug #7353771
713e1bb9df6bdfc21bd5c40d1a6ecf6c822a4be5 17-Oct-2012 Romain Guy <romainguy@google.com> Add API to enable mipmaps on Bitmap
Bug #7353771

This API can be used when scaling large images down to a small size
to get nicer looking results.

Change-Id: If09087eed36077eee5355f6047a3ca67747d7d9e
ndroid/graphics/Bitmap.cpp
0d4f45d9421ac5c80edeef8e838c2b874e548157 16-Oct-2012 Jamie Gennis <jgennis@google.com> am b312f115: am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev

* commit 'b312f1155caa1b323f482b92564cd07f3151c66b':
Flag window animation transactions as animations.
b312f1155caa1b323f482b92564cd07f3151c66b 16-Oct-2012 Jamie Gennis <jgennis@google.com> am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev

* commit '38041d6b3c3d838d99f70f9b1195d69487edf689':
Flag window animation transactions as animations.
38041d6b3c3d838d99f70f9b1195d69487edf689 16-Oct-2012 Jamie Gennis <jgennis@google.com> am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev

* commit '809bb404da66498f1723279542d2a7d1f4512052':
Flag window animation transactions as animations.
b6ce6e42cc89864354c7ecb9ae80504a6c9dddcf 16-Oct-2012 Jamie Gennis <jgennis@google.com> Flag window animation transactions as animations.

This change makes WindowManager use the new eAnimation flag when animating
windows. This prevents some of the window updates from being combined with
updates from prior animation frames.

Bug: 7353840
Change-Id: I5a9f8fa2c1a2f5f08363a45cd9f28bb97cd77080
ndroid_view_Surface.cpp
7a6dca427bc21b90f2dc8396c1074e0a1aa3ed24 12-Oct-2012 Keun young Park <keunyoung@google.com> am 09ff8a6f: am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev

* commit '09ff8a6f43dad1e27524e41622392fe040b7bdab':
fix wrong read size in ToColor_S4444_Opaque
09ff8a6f43dad1e27524e41622392fe040b7bdab 12-Oct-2012 Keun young Park <keunyoung@google.com> am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev

* commit '27665148cb72cbc7d4d5941f97ae54a73fa58d3c':
fix wrong read size in ToColor_S4444_Opaque
27665148cb72cbc7d4d5941f97ae54a73fa58d3c 12-Oct-2012 Keun young Park <keunyoung@google.com> am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev

* commit 'c378656d5e0e686d806661bc271de3c7b1726430':
fix wrong read size in ToColor_S4444_Opaque
c378656d5e0e686d806661bc271de3c7b1726430 12-Oct-2012 Keun young Park <keunyoung@google.com> Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev
038953da05c641f6551134f710ac0e4f46b624b7 12-Oct-2012 Keun young Park <keunyoung@google.com> fix wrong read size in ToColor_S4444_Opaque

- S4444 takes 16bits, not 32bits
- This caused sporadic failure in CTS BitmapFactoryTest#testDecodeStream4

Bug: 7179389
Change-Id: Ib36a3a569b3149d74f36ae67a069a7b65a72e895
ndroid/graphics/Bitmap.cpp
e0d018801d1defa56f5366b151613fdf522a2095 12-Oct-2012 Jeff Brown <jeffbrown@google.com> am 7a3314cc: am af4228c1: am e8f4fa1c: Merge "Fix off-by-one." into jb-mr1-dev

* commit '7a3314cce7a3b68aac8a9dc90ce9cd8edac65669':
Fix off-by-one.
7a3314cce7a3b68aac8a9dc90ce9cd8edac65669 12-Oct-2012 Jeff Brown <jeffbrown@google.com> am af4228c1: am e8f4fa1c: Merge "Fix off-by-one." into jb-mr1-dev

* commit 'af4228c1aa48887fe6811ad8275ed11f34ba0308':
Fix off-by-one.
af4228c1aa48887fe6811ad8275ed11f34ba0308 12-Oct-2012 Jeff Brown <jeffbrown@google.com> am e8f4fa1c: Merge "Fix off-by-one." into jb-mr1-dev

* commit 'e8f4fa1cb3bfd68de235949080f09f9631976275':
Fix off-by-one.
c51cb89dd64cf366c162cf0fed4ba893f5c3e985 12-Oct-2012 Jeff Brown <jeffbrown@google.com> Fix off-by-one.

Bug: 7330567
Change-Id: I8653435c77daefa24991595f68b9f23dd930f14a
ndroid_os_UEventObserver.cpp
f02070ca7d535bbbeb49cbdca37c88d068b80eca 11-Oct-2012 Jeff Brown <jeffbrown@google.com> am aabf7a59: am d2d7d5c8: am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev

* commit 'aabf7a5940ab917a3d2835d32707dccc418a42a9':
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
aabf7a5940ab917a3d2835d32707dccc418a42a9 11-Oct-2012 Jeff Brown <jeffbrown@google.com> am d2d7d5c8: am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev

* commit 'd2d7d5c8903c7fd6078b16492ee7b21347fce5f2':
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
d2d7d5c8903c7fd6078b16492ee7b21347fce5f2 11-Oct-2012 Jeff Brown <jeffbrown@google.com> am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev

* commit '60fa4617bc4be292a9e0ae10cf259153dec07aa9':
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
9cf36b7a77bb8e821f9e593fdbb200f8a1742ff0 11-Oct-2012 Jeff Brown <jeffbrown@google.com> Don't process UEvents in Dalvik unless they match a pattern.

On some devices, vsync is delivered from the kernel to userspace
over a netlink socket via UEvent. The result is that a thread wakes
up, reads a message, creates a new String then searches it for matches
against a pattern on every single frame.

Reduce the overhead by performing the initial pattern matching in
native code.

Bug: 7326329
Change-Id: Icb22db1c38330694207bec1153840e0c06f502d6
ndroid_os_UEventObserver.cpp
7e04bd1cc175b62c4036ba3dffb8ebc49fca91a3 11-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> am afb19545: am 7e466e89: am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev

* commit 'afb195453a40ba41ee4a08a1d920110c5b8af58e':
Don't play notifications during speech recognition
afb195453a40ba41ee4a08a1d920110c5b8af58e 11-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> am 7e466e89: am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev

* commit '7e466e894ad4738a76c94c871cfc2f900518aea8':
Don't play notifications during speech recognition
7e466e894ad4738a76c94c871cfc2f900518aea8 11-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev

* commit 'bcfc1ca8ab8bf057e20d9369af3d007d80ca83e4':
Don't play notifications during speech recognition
d677054ca63f55abaa1c478ea3c50f6be665a979 10-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Don't play notifications during speech recognition

Add support for querying AudioManager to know whether speech
recognition is currently underway.

Don't play a notification if speech recognition is underway.

Bug 7314859

Change-Id: I1bd013a3168cfe1a6b6dcfd28565e1c3c512eb6a
ndroid_media_AudioSystem.cpp
d6c0c114b9878406008c8cb98107087487ddf39f 10-Oct-2012 Eino-Ville Talvala <etalvala@google.com> am c2b90f77: am 685a5128: am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev

* commit 'c2b90f77bd9c79e9437a1799140b1da215c949c6':
Camera: Query AudioService for shutter sound enforcement.
c2b90f77bd9c79e9437a1799140b1da215c949c6 10-Oct-2012 Eino-Ville Talvala <etalvala@google.com> am 685a5128: am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev

* commit '685a512868a7da11f7097282fd1a4a2af070d816':
Camera: Query AudioService for shutter sound enforcement.
685a512868a7da11f7097282fd1a4a2af070d816 10-Oct-2012 Eino-Ville Talvala <etalvala@google.com> am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev

* commit 'cbdb21364653910179da1eddd43f4b932420b75b':
Camera: Query AudioService for shutter sound enforcement.
cbdb21364653910179da1eddd43f4b932420b75b 10-Oct-2012 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev
131c791954bc37a519e97db46f5f1d073e5d0e04 09-Oct-2012 Jeff Brown <jeffbrown@google.com> am 33c30e36: am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev

* commit '33c30e36a5f2630cf7f3b2bced899009fead3460':
Blank or unblank all displays as need.
33c30e36a5f2630cf7f3b2bced899009fead3460 09-Oct-2012 Jeff Brown <jeffbrown@google.com> am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev

* commit '102e97bb6dda1b211acbc4e6e3d3ae58039c9a0d':
Blank or unblank all displays as need.
102e97bb6dda1b211acbc4e6e3d3ae58039c9a0d 09-Oct-2012 Jeff Brown <jeffbrown@google.com> am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev

* commit '8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
Blank or unblank all displays as need.
4f8e5ce21df881796d05a1b2117dd8868570a57b 09-Oct-2012 Eino-Ville Talvala <etalvala@google.com> Camera: Query AudioService for shutter sound enforcement.

The AudioService now tracks the shutter sound enforcement status, in
addition to the existing approach. Check with it when doing shutter
sound operations.

Bug: 7032634
Change-Id: Ief855d3a36ca5679832cf439f5638b10f70b8636
ndroid_hardware_Camera.cpp
9e316a1a2a8d734315bbd56a85308f9657a92913 09-Oct-2012 Jeff Brown <jeffbrown@google.com> Blank or unblank all displays as need.

Ensures that both the internal display and HDMI are blanked
or unblanked in tandem.

Bug: 7309812
Change-Id: Ie8b96d393e8bb20d23c92f3320142d9f7cf42aff
ndroid_view_Surface.cpp
85e25c478a84521f131a9d3781724dcc0b4dab5c 05-Oct-2012 Raph Levien <raph@google.com> am 44d21eb5: am 6f3f7c68: am 9dc11eb8: Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev

* commit '44d21eb5fcfd8f25920ccc3abccf3aedbf01f5df':
Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
44d21eb5fcfd8f25920ccc3abccf3aedbf01f5df 05-Oct-2012 Raph Levien <raph@google.com> am 6f3f7c68: am 9dc11eb8: Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev

* commit '6f3f7c681fa824c35b09ebf2978ff853f5a270e3':
Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
6f3f7c681fa824c35b09ebf2978ff853f5a270e3 05-Oct-2012 Raph Levien <raph@google.com> am 9dc11eb8: Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev

* commit '9dc11eb848bfcd463e504133e4e356c7e6497842':
Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
577b07197b1bf1b3903e0bc0f3d48fabfd927b2a 05-Oct-2012 Raph Levien <raph@google.com> Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures

The failures were caused by the implementation of doTextRunCursor
passing a too-small value for contextCount into the underlying
getTextRunAdvances call (it wasn't accounting for the start offset).
Thus, when getTextRunAdvances made a copy of the text for its cache key,
it was getting a partial copy.

This patch fixes the size so the cache key always has a full copy of the
text.

Change-Id: I57e3ac6de7aef0e1f1c7000dc3d653f9b0d623d2
ndroid/graphics/Paint.cpp
997d4283c038646c412d949226975cfc99411675 04-Oct-2012 Raph Levien <raph@google.com> am d8c6c6f5: am 1ca8d35f: am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev

* commit 'd8c6c6f56630fa466b96dd5359d39a659a1e42f8':
Fix for testPaintFlagsDrawFilter CTS test
d8c6c6f56630fa466b96dd5359d39a659a1e42f8 04-Oct-2012 Raph Levien <raph@google.com> am 1ca8d35f: am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev

* commit '1ca8d35f4d05a4dcd0d0cc202a3e4a51f35e8655':
Fix for testPaintFlagsDrawFilter CTS test
1ca8d35f4d05a4dcd0d0cc202a3e4a51f35e8655 04-Oct-2012 Raph Levien <raph@google.com> am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev

* commit '5a829cbf5862d6c41f709b86ed5fc1085fea95ee':
Fix for testPaintFlagsDrawFilter CTS test
e174ae210e4756985c17da5bf4457e2009ec5b61 04-Oct-2012 Raph Levien <raph@google.com> Fix for testPaintFlagsDrawFilter CTS test

This fixes bug 6948776
android.graphics.cts.PaintFlagsDrawFilterTest#testPaintFlagsDrawFilter
failures on JO

When we moved the drawing of text decorations (underline, strikethrough)
from Skia to our own drawing (so we could take into account the metrics
computed by TextLayoutEngine), we just used the raw flags from the
paint, which ignored the overrides that a DrawFilter can effect.

The patch simply checks for the existence of a DrawFilter in the canvas,
and applies it to a copy of the paint where present. This will be one
extra paint copy where the filter exists, but that's expected to be rare
(other than running this CTS test, of course).

Change-Id: I664c478b73a3a1cc43599ee11bbc02c69b7a96c2
ndroid/graphics/Canvas.cpp
5472070c4a0ec23c8cf870320c408e270be774c4 02-Oct-2012 Raph Levien <raph@google.com> am 912c3780: am ad3cc4bb: am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev

* commit '912c37802cd2e3e10495ea4b7c9dc3ccdd1702e5':
Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
912c37802cd2e3e10495ea4b7c9dc3ccdd1702e5 02-Oct-2012 Raph Levien <raph@google.com> am ad3cc4bb: am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev

* commit 'ad3cc4bb5eda9b5c56a82e8da0ff3e286bd30cfe':
Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
ad3cc4bb5eda9b5c56a82e8da0ff3e286bd30cfe 02-Oct-2012 Raph Levien <raph@google.com> am 217ca3b0: Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev

* commit '217ca3b0d310472e4df1aa4af72769d7c7a5becb':
Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
217ca3b0d310472e4df1aa4af72769d7c7a5becb 02-Oct-2012 Raph Levien <raph@google.com> Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev
832815cb53e951485ff5a0e6c705446d0bfb5883 02-Oct-2012 Raph Levien <raph@google.com> Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...

This bug was triggered by user code concurrently mutating the character
array while calling into a drawText method in another thread. When the
value of the array changed, it caused inconsistent state, leading to
assert failures.

This is arguably bad behavior by the user code, but it shouldn't cause a
native crash. The fix is to do a defensive copy of the text into the
key, so the value is guaranteed to remain constant throughout the text
layout process. The change is mostly deletion of code, because there was
an optimization to try to avoid such a copy. That optimization was not
actually effective, however, because the indexOfKey() operation in the
KeyedVector underlying the TextLayoutCache did the copy anyway. Thus,
even though this change looks like it's introducing a copy where there
wasn't one before, the actual performance impact should be nil.

Note that the ability to handle a mutating argument is now part of the
contract for TextLayoutEngine::getValue(), and is now documented. That
contract may change, as the result of future optimization. Also, care
was taken to only use the value after the copy.

Other performance issues with TextLayoutCache are tracked in bug
7271109.

Change-Id: I9c90e8e4d501f3f37e2f22a7851f032808d46fbe
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
1645620bd778d48af5732967d472b7b1cb8d57a4 02-Oct-2012 Ian Rogers <irogers@google.com> am bc8c3c05: am 7fef2b8a: Fix target utilization property_get.

* commit 'bc8c3c05a324bd8bb51301d6b51e6d6c419a86a3':
Fix target utilization property_get.
bc8c3c05a324bd8bb51301d6b51e6d6c419a86a3 02-Oct-2012 Ian Rogers <irogers@google.com> am 7fef2b8a: Fix target utilization property_get.

* commit '7fef2b8a3782a94e1ad6bfef98807167db300aab':
Fix target utilization property_get.
7fef2b8a3782a94e1ad6bfef98807167db300aab 01-Oct-2012 Ian Rogers <irogers@google.com> Fix target utilization property_get.

Copy and paste error where wrong compare meant the code thought a target
utilization option was specified even if there wasn't one.

b/7062303

Change-Id: Ibf1c6cf72743c5fbec7618a719d12d0373184754
ndroidRuntime.cpp
e983008863c3f0706af95e0e601808e60eb0dbf2 01-Oct-2012 Ian Rogers <irogers@google.com> Fix target utilization property_get.

Copy and paste error where wrong compare meant the code thought a target
utilization option was specified even if there wasn't one.

b/7062303

Change-Id: Ibf1c6cf72743c5fbec7618a719d12d0373184754
ndroidRuntime.cpp
d2e74f34003c38111c974dfa187cae6c331f2841 01-Oct-2012 Chet Haase <chet@google.com> am 1dd00221: am bcdaf8cb: am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev

* commit '1dd002214e9734aa862db9b7e7092aacd737e46d':
Fix texture corruption
1dd002214e9734aa862db9b7e7092aacd737e46d 01-Oct-2012 Chet Haase <chet@google.com> am bcdaf8cb: am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev

* commit 'bcdaf8cb6d75d721507739504732e0e3dc7f437c':
Fix texture corruption
bcdaf8cb6d75d721507739504732e0e3dc7f437c 01-Oct-2012 Chet Haase <chet@google.com> am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev

* commit '62ea4363362526d32b48f920601d3b4e27a117bb':
Fix texture corruption
6a2d17f71342f981c9df1dc5beff33e30eb3ae2b 30-Sep-2012 Chet Haase <chet@google.com> Fix texture corruption

When memory gets low on a device, activities flush everything they can.
Hardware-accelerated activites, such as Launcher, flush GL resources and destroy
the GL context. However, some resources were still hanging around, due to deferred
destruction policies (we don't delete layers until the DisplayLists they are in
are finalized, to ensure we don't deref deleted objects). This meant that we were
referring to obsolete GL data in these objects. in particular, it meant that we might
come around later, after a new GL context was created, and delete a texture object
that was incorrect. We use the layer's "texture id" to refer to the texture underlying the
layer. But if there's a new GL context, then this texture ID is no longer valid, and
we may be deleting the texture that a different object (layer, icon, whatever) is referring
to, because the driver may return that same ID under the new GL context.

The fix is to more aggressively delete things that we know will not be used again
when the GL context is destroyed. In particular, we delete all resources being used
by all DisplayLists at GL context destruction time.

Issue #7195815 Textures corruption on all devices, in many apps

Change-Id: I52d2d208173690dbb794a83402d38f14ea4c6c22
ndroid/graphics/Canvas.cpp
ndroid_view_GLES20DisplayList.cpp
5827b5f7b07bbdd53b53ba1494b93dad3761851e 28-Sep-2012 Raph Levien <raph@google.com> am 34614e63: am 54801e12: Merge "Fix for bug 6936752 Tamil text gets truncated on right-hand side" into jb-mr1-dev

* commit '34614e63dced2b0479ab721494fd867604023619':
Fix for bug 6936752 Tamil text gets truncated on right-hand side
25cd09344fbe4b4ee86a4d2a453d683f5a2f2e8a 28-Sep-2012 Raph Levien <raph@google.com> am 54801e12: Merge "Fix for bug 6936752 Tamil text gets truncated on right-hand side" into jb-mr1-dev

* commit '54801e120a2275037e37f065926b81d9f6e4b3d5':
Fix for bug 6936752 Tamil text gets truncated on right-hand side
54801e120a2275037e37f065926b81d9f6e4b3d5 28-Sep-2012 Raph Levien <raph@google.com> Merge "Fix for bug 6936752 Tamil text gets truncated on right-hand side" into jb-mr1-dev
de6a028a3e6e0530cab24441452dc85e3587ea89 27-Sep-2012 Jeff Sharkey <jsharkey@android.com> am 40642722: am dd78d462: Fix JNI method signature.

* commit '406427225b43ea63940c7b32b5ff91eeffd6d64d':
Fix JNI method signature.
f32fad0fe77972bddc51d7a8d7ced1280b946fc2 27-Sep-2012 Jeff Sharkey <jsharkey@android.com> am dd78d462: Fix JNI method signature.

* commit 'dd78d462f6dceac71f9d1cbb723bb38a3b5bdc2e':
Fix JNI method signature.
dd78d462f6dceac71f9d1cbb723bb38a3b5bdc2e 27-Sep-2012 Jeff Sharkey <jsharkey@android.com> Fix JNI method signature.

Change-Id: I156624e0ac55330f43d9c4d7f15d59f6c529aa0a
ndroid_os_SystemClock.cpp
573028be3b9d9a5911203e235bf6bd524204223e 26-Sep-2012 Glenn Kasten <gkasten@google.com> am 59860362: am 2832136b: Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev

* commit '59860362a4ff99d3e7bc7ca95a266915b35d2af6':
Implement android.media.AudioManager.getProperty()
6931f5529d9acdf25883f7c2b71f6fab1c8968c5 26-Sep-2012 Glenn Kasten <gkasten@google.com> am 2832136b: Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev

* commit '2832136bb6fcace61ef078051e94aa0a841aac15':
Implement android.media.AudioManager.getProperty()
c6c4365ddb0213c548b055f257dc8077389224fb 25-Sep-2012 Glenn Kasten <gkasten@google.com> Implement android.media.AudioManager.getProperty()

Bug: 6635041
Change-Id: I0e7d53b99559cdc89f2f107f23048e4b1a8dd383
ndroid_media_AudioSystem.cpp
f5481b7332375b32438e9638e436c8ed8f3393bb 25-Sep-2012 Romain Guy <romainguy@google.com> am 9e309c2f: am 64339168: Merge "Don\'t destroy the same texture twice Bug #7221449" into jb-mr1-dev

* commit '9e309c2f5b747dbbac4ac2c1fe8452c8e22f3132':
Don't destroy the same texture twice Bug #7221449
6ec13912f9055758d159938553cff6fa99052627 25-Sep-2012 Ian Rogers <irogers@google.com> am ce431c3d: am a8a7e714: Merge "Extra GC heap configuration parameters." into jb-mr1-dev

* commit 'ce431c3dbfd98a7f9e57a9e9f0ffbcf89954257a':
Extra GC heap configuration parameters.
5efef2a2823d43b7a0950a40e7f9005ae2fcc595 25-Sep-2012 Romain Guy <romainguy@google.com> am 64339168: Merge "Don\'t destroy the same texture twice Bug #7221449" into jb-mr1-dev

* commit '64339168c4ff0b3ac249398811db7c88eca8f95c':
Don't destroy the same texture twice Bug #7221449
ae592bf4b7cb0d8114937a469d6d0f292c3c5b27 25-Sep-2012 Ian Rogers <irogers@google.com> am a8a7e714: Merge "Extra GC heap configuration parameters." into jb-mr1-dev

* commit 'a8a7e7140d8d2f231707712d329a24cf32184299':
Extra GC heap configuration parameters.
3142c96e891d4e7e2f179e713c8a0d2d1b93c141 25-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 908a4323: Merge into jb-mr1-dev

* commit '908a43234aca51af5021249c03030cec6b36417f':
Add a property to disable libhwui's scissor optimization Bug #7158326
ef09a210dd6ea481158b7028ec2424a7f5769ed2 25-Sep-2012 Romain Guy <romainguy@google.com> Don't destroy the same texture twice
Bug #7221449

SurfaceTexture already deletes the GL texture when detachFromContext
is invoked. The newly introduced refcount would casue the Layer
object to be destroyed later and attempt to delete the GL texture
again. By the time the second cleanup occurs, the texture name
might have been reused by somebody else, resulting in erroneous
behaviors.

Change-Id: I257c589fea64b34c00f46fbfaa7732e6854a5e41
ndroid_view_GLES20Canvas.cpp
a8a7e7140d8d2f231707712d329a24cf32184299 25-Sep-2012 Ian Rogers <irogers@google.com> Merge "Extra GC heap configuration parameters." into jb-mr1-dev
1b10241a8f0affab9f46719e46c6fedff9e69b8b 25-Sep-2012 Raph Levien <raph@google.com> Fix for bug 6936752 Tamil text gets truncated on right-hand side

The getTextRunAdvances() method wasn't accounting for the true width of
the text. On closer examination, in Tamil the clusters consist of a
number of glyphs each of which has a nonzero advance (in some other
scripts, the first glyph in the cluster has an advance, and others are
effectively zero). Previously, we were just using the advance of the
first glyph in the cluster. This patch changes the behavior to sum the
advances of all the glyphs within the cluster.

Change-Id: I77a51235f4bb0dfaa72cbb920a8c3b217ad25404
ndroid/graphics/TextLayoutCache.cpp
da42438cf7dbcdd364337b1046f78411401a388b 25-Sep-2012 Romain Guy <romainguy@google.com> Merge "Add a property to disable libhwui's scissor optimization Bug #7158326" into jb-mr1-dev
87e2f757be9b24d369bab354e37c276e851b1fc7 24-Sep-2012 Romain Guy <romainguy@google.com> Add a property to disable libhwui's scissor optimization
Bug #7158326

When scissor optimization is enabled, OpenGLRenderer will attempt to
minimize the use of scissor by selectively enabling and disabling the
GL scissor test.
When the optimization is disabled, OpenGLRenderer will keep the GL
scissor test enabled and change the scissor rect as needed.
Some GPUs (for instance the SGX 540) perform better when changing
the scissor rect often than when enabling/disabling the scissor test
often.

Change-Id: Idb68862e287a23358f9188d577ae0f86161902fd
ndroid_view_GLES20Canvas.cpp
5d0c5079ce34b33afd0d54273f11c862ba1a6224 24-Sep-2012 Eino-Ville Talvala <etalvala@google.com> am eace371e: am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev

* commit 'eace371ee01f8e61731d86110ec84258994eeded':
NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
d571122db5b3dabf135a7cfb78f1a8e385e4e5c4 24-Sep-2012 Jeff Brown <jeffbrown@google.com> am 1022a785: am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev

* commit '1022a785e52384dc8503127df1ceaababcd88a1a':
Support HDMI hotplug.
5325010486a13553a8597aab92f90abc141a25e8 24-Sep-2012 Ian Rogers <irogers@google.com> Extra GC heap configuration parameters.

Allows parameters to increase the maximum free size. b/6606849

Change-Id: Ia74ccdbb8e32954820e3bd26f441b2c2fac889f4
ndroidRuntime.cpp
09a792c7fd4db900758a72de86641c6a0c173257 22-Sep-2012 Eino-Ville Talvala <etalvala@google.com> am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev

* commit '5ce25d717059c9c37618aa349314077f99ac34c7':
NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
919a4cdfe24ef4c1bdc9e6b87b0ee7604f2893f6 22-Sep-2012 Jeff Brown <jeffbrown@google.com> am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev

* commit '3ca5971339c7eba61388aa3e26a1b3d02c5ccdf6':
Support HDMI hotplug.
18c166bcd68a141d932717b8d3abd863093d7c50 22-Sep-2012 Romain Guy <romainguy@google.com> am 3f7c246f: Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev

* commit '3f7c246f3ea85af9fb98cba37387bb55658d4614':
Update layers in a single batch at the beginning of a frame Bug #7186819
73d2c347cb8ec31912d2a006154eacc46aac0c68 22-Sep-2012 Raph Levien <raph@google.com> am 3034d451: Merge "Fix for native crash on image decode OOM" into jb-mr1-dev

* commit '3034d45104f954eb15937e03ec74d86ca37894dc':
Fix for native crash on image decode OOM
5ce25d717059c9c37618aa349314077f99ac34c7 22-Sep-2012 Eino-Ville Talvala <etalvala@google.com> Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
e87bf030766198bf5e1fe846167dba766e27fb3f 21-Sep-2012 Jeff Brown <jeffbrown@google.com> Support HDMI hotplug.

Bug: 7206678
Change-Id: Ia5212b16658a5f5a2ccf8528eca7bebd45ca857a
ndroid_view_DisplayEventReceiver.cpp
ad577aae75acb56978382e2aa1775a45c05f780c 21-Sep-2012 Zhihai Xu <zhihaixu@google.com> am 77f6677b: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev

* commit '77f6677bcddad7c626ef5432eead4031c24f4685':
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
7fdf367d7ad63c90c13ddf553d05f58030454191 21-Sep-2012 Romain Guy <romainguy@google.com> am 0b697061: am 3f7c246f: Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev

* commit '0b69706103dc6ddf765fa2e86265a6428f6728bb':
Update layers in a single batch at the beginning of a frame Bug #7186819
3f7c246f3ea85af9fb98cba37387bb55658d4614 21-Sep-2012 Romain Guy <romainguy@google.com> Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev
11cb642756093a4af901b1525375b1eb2b5c3e2b 21-Sep-2012 Romain Guy <romainguy@google.com> Update layers in a single batch at the beginning of a frame
Bug #7186819

Change-Id: Ice5926dfedfb3be3a3064e65008dafa2852407da
ndroid_view_GLES20Canvas.cpp
8cba91d0d1d900fe9cba2bfc73c4458016b4ff04 21-Sep-2012 Raph Levien <raph@google.com> am 8b0851ca: am 3034d451: Merge "Fix for native crash on image decode OOM" into jb-mr1-dev

* commit '8b0851caf26dfd5e1cc7798e5ff6c6adc3a5e92c':
Fix for native crash on image decode OOM
3034d45104f954eb15937e03ec74d86ca37894dc 21-Sep-2012 Raph Levien <raph@google.com> Merge "Fix for native crash on image decode OOM" into jb-mr1-dev
005bfc694d167b7da4b565a1c4de03592fdbe86e 21-Sep-2012 Raph Levien <raph@google.com> Fix for native crash on image decode OOM

When decoding an image with scaling, if the allocation of the bitmap
data for the scaled bitmap failed, we were just ignoring it and going
on. This was yielding strange native crashes (bug 7196860 and bug
7175536). This patch checks whether the allocation succeeds, and returns
a null bitmap if not.

Of course, if the app really is OOM because it's allocated too many
bitmaps, it'll still get the OOME, but that's a lot nicer than a native
crash or memory corruption.

Change-Id: I8384059ab11c2ab9e93e283b9438d79e6709b7b1
ndroid/graphics/BitmapFactory.cpp
8bd9e0cdc157d063310206bea828484d1d45f2b2 21-Sep-2012 Zhihai Xu <zhihaixu@google.com> am 03a896b6: am 77f6677b: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev

* commit '03a896b6d8971e54a72e90d9373d162f6a4d8f40':
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
77f6677bcddad7c626ef5432eead4031c24f4685 21-Sep-2012 Zhihai Xu <zhihaixu@google.com> Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
a3ae43942586e1f2b08fdc46963c73826ad6648c 19-Sep-2012 Zhihai Xu <zhihaixu@google.com> ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

remove system/bluetooth stuff.

bug 6849488
Change-Id: I9ea87c9cd60d5ecfa0d58d28301554e716cd2893
ndroid.mk
f7c6c5ad64c8e5d20e1806cc98b9919334c69614 19-Sep-2012 Eino-Ville Talvala <etalvala@google.com> NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound

Allow applications to check if the camera shutter sound can be
disabled.

Bug: 7172643
Change-Id: I3e9184325d3676b24830cc5418ebca8dcade8697
ndroid_hardware_Camera.cpp
2a6ecae93d4effa47827029d74f2136b5ae8558d 31-Aug-2012 Derek Sollenberger <djsollen@google.com> Fix Skia assertions where we were allowing immutable bitmaps to be written to.

bug: 7092330
Change-Id: I4a9d1d299244d46172562080c56c8360f5e4af02
ndroid/graphics/BitmapFactory.cpp
232746e351bb9a48f2a6d1435bd037fdca759edd 18-Sep-2012 Jamie Gennis <jgennis@google.com> am 94998c9c: Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev

* commit '94998c9c4e19d5b439228646f1b283201367b7a0':
SurfaceTexture: remove call to doGLFenceWait
94998c9c4e19d5b439228646f1b283201367b7a0 18-Sep-2012 Jamie Gennis <jgennis@google.com> Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev
e8792ce854a0af099a3f9b22f7483b9988e1507a 18-Sep-2012 Andy McFadden <fadden@android.com> am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev

* commit '923c18b1421296c2ed37a51d055283e94f99fc53':
Plumb display name into SurfaceFlinger
923c18b1421296c2ed37a51d055283e94f99fc53 18-Sep-2012 Andy McFadden <fadden@android.com> Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev
917a3b34a33f703503d05aaef4af955a09553703 18-Sep-2012 Jamie Gennis <jgennis@google.com> SurfaceTexture: remove call to doGLFenceWait

This call is no longer needed as the default behavior of the native
SurfaceTexture class is to do the wait whenever updateTexImage is called.

Change-Id: I995686a5989409e21b00fac913bd33c11f806998
ndroid/graphics/SurfaceTexture.cpp
3bcbad7bcbc4c556a3550f40a3ba85876db7e7d8 18-Sep-2012 Andy McFadden <fadden@android.com> Plumb display name into SurfaceFlinger

Pass the display name into SF's createDisplay().

Bug 7058158

Change-Id: Ia21f07063db2c2fb5a34d6526e16d4b2d3694377
ndroid_view_Surface.cpp
53615bccc4d48c37ad3a8351e019296881a2b9f1 17-Sep-2012 Chet Haase <chet@google.com> am f74d2f2f: Merge "Fix occasional crash bug with layers" into jb-mr1-dev

* commit 'f74d2f2fe8a157bee25516d2a6ae3e329507cb2c':
Fix occasional crash bug with layers
603f6de35f21d74ae242d52d501f4f5c25ff4f4c 15-Sep-2012 Chet Haase <chet@google.com> Fix occasional crash bug with layers

Launcher occasionally crashes with a stack trace indicating that the memory
of a Layer object is corrupt. It is possible for us to delete a Layer
structure and then, briefly, use it to draw a DisplayList again before
that DisplayList gets recreated (without the layer that got deleted).

When this happens, if the memory got corrupted, it's possible to crash.

The fix is to add Layer to the other objects which we currently refcount
(bitmaps, shaders, etc.). Then instead of deleting a Layer, we decrement the
refcount. We increment when creating it, then increment it again when it's
referenced from a DisplayList. Then we decrement the refcount instead of
deleting it, and decrement when we clear a DisplayList that refers to it.
Then when the refcount reaches 0, we delete it.

Issue #6994632 Native crash in launcher when trying to launch all apps screen

Change-Id: I0627be8d49bb2f9ba8d158a84b764bb4e7df934c
ndroid_view_GLES20Canvas.cpp
5f09b9f52d474eee5d3ec0288819018f81926b89 16-Sep-2012 Elliott Hughes <enh@google.com> am 08153ee0: Switch DateUtils and Time over to using the CLDR for all week and month names.

* commit '08153ee01e6aa67061f628bc3fed66c6400dfd1c':
Switch DateUtils and Time over to using the CLDR for all week and month names.
08153ee01e6aa67061f628bc3fed66c6400dfd1c 07-Aug-2012 Elliott Hughes <enh@google.com> Switch DateUtils and Time over to using the CLDR for all week and month names.

(cherry-pick of 99c406e42ba154584070ca7ec100e8be7ff8a800.)

Conflicts:

core/res/res/values-fa/donottranslate-cldr.xml
core/res/res/values/public.xml

Bug: 6811501
Change-Id: I2ad9608ae34804e02c6b0271197e96611df12b0a
ndroid_text_format_Time.cpp
600eb7a697102bab8fd545fc10b035eb8917b0b5 14-Sep-2012 Raph Levien <raph@google.com> am c1eff085: am e5905684: am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"

* commit 'c1eff0857ebc6abce48ba8c267ab32109dd45ef0':
framework: fix bug for uninitialized variable
c1eff0857ebc6abce48ba8c267ab32109dd45ef0 14-Sep-2012 Raph Levien <raph@google.com> am e5905684: am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"

* commit 'e590568417aa824e7b0e76ae727556d329cb57cf':
framework: fix bug for uninitialized variable
eceb317116d87dada85d06df8fe0e07dd4aec49d 14-Sep-2012 Raph Levien <raph@google.com> am f4afc401: Merge "framework: fix bug for uninitialized variable"

* commit 'f4afc40101c00800c4dc53f165b93f741327416d':
framework: fix bug for uninitialized variable
7927fe5963a050fcdfd68f09cde6ec4e49259ab7 13-Sep-2012 Raph Levien <raph@google.com> am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev

* commit 'eb1f5349f8ac51e12e48497bbd2ae37badfe5009':
Fix for b7155617 race condition in TextLayoutCache.cpp
eb1f5349f8ac51e12e48497bbd2ae37badfe5009 13-Sep-2012 Raph Levien <raph@google.com> Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev
13ba4e478d19001ddb6828bd1fd8fbc1e0cb208f 13-Sep-2012 Raph Levien <raph@google.com> Fix for b7155617 race condition in TextLayoutCache.cpp

There was the possibility for a race between clearing the caches and
using fonts. This patch simply protects both under the same mLock held
by the TextLayoutCache object.

Change-Id: Ib366e16a9a9ba702a46bc078d1bc0602713991e5
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
b68af8c8290eb82f33357cf7e44a2e8fe543c05e 11-Sep-2012 Eino-Ville Talvala <etalvala@google.com> am 6fc7275d: Merge "Camera: Add enableShutterSound method." into jb-mr1-dev

* commit '6fc7275d0ede6d352854db8fff95ec611bd07416':
Camera: Add enableShutterSound method.
6fc7275d0ede6d352854db8fff95ec611bd07416 11-Sep-2012 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Add enableShutterSound method." into jb-mr1-dev
4382ad1834933dbb347e16d4afd59707ed0537dd 10-Sep-2012 Jamie Gennis <jgennis@google.com> am cae2e388: Merge "SurfaceTexture: add updateTexImage synchronization" into jb-mr1-dev

* commit 'cae2e3887d826f1c50e2bdc621b824def7ab855e':
SurfaceTexture: add updateTexImage synchronization
69fe527bea12f262bfb1a5838f40e3433ad3cb78 07-Sep-2012 Eino-Ville Talvala <etalvala@google.com> Camera: Add enableShutterSound method.

Some camera apps may wish to replace the system camera shutter sound
with their own, especially if they are taking rapid bursts of
images. Add method to allow this when possible.

Hidden for now.

Change-Id: I6520f5441d28675626fafab48c6609c589fc6f7e
ndroid_hardware_Camera.cpp
f09263e957a3f132899458fc5afe859ba9d62d2e 10-Sep-2012 Jamie Gennis <jgennis@google.com> SurfaceTexture: add updateTexImage synchronization

This change makes the SurfaceTexture JNI updateTexImage call the native
SurfaceTexture's doGLFenceWait method to perform the needed synchronization.

Change-Id: Ie70a1fe6b44d439d1ffe7b97689a421ff8c02fda
ndroid/graphics/SurfaceTexture.cpp
5ea4944a202ed68acf745905a822f240bfc95317 08-Sep-2012 Jeff Brown <jeffbrown@google.com> am 7017e483: Merge "Add support for Wifi display." into jb-mr1-dev

* commit '7017e48380ab0c1be033594bb2a9331898ad5be8':
Add support for Wifi display.
7017e48380ab0c1be033594bb2a9331898ad5be8 08-Sep-2012 Jeff Brown <jeffbrown@google.com> Merge "Add support for Wifi display." into jb-mr1-dev
965e7ff4de117a9681b04e84573cb5924efdd6d9 08-Sep-2012 Raph Levien <raph@google.com> Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev
d15ebf25c595b855f6978d0600218e3ea5f31e92 05-Sep-2012 Chet Haase <chet@google.com> Enable changing properties of layer paint

Previously, to draw a layered view with a changed Paint object for the
drawLayer operation, you'd have to invalidate the parent view, to get the
native DisplayList to pick up the new Paint properties. This change adds
API and functionality so that the developer can call setLayerPaint(), which
does the proper invalidation (lightweight, doesn't cause redrawing the view).

Issue #6923810 Make it easy to efficiently animate a layer's Paint

Change-Id: I7fea79788d50f6d9c86dd5e5b2a4490cb95142bb
ndroid_view_GLES20Canvas.cpp
cbad976b2a36a0895ca94510d5208a86f66cf596 05-Sep-2012 Jeff Brown <jeffbrown@google.com> Add support for Wifi display.

Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
ndroid.mk
ndroidRuntime.cpp
ndroid_media_RemoteDisplay.cpp
ndroid_view_Surface.cpp
5ef49427b6e735ba17d96184ac2bcbcafb434d82 26-Jul-2012 Elliott Hughes <enh@google.com> Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE

Two reported by users, the other spotted by inspection.

Bug: http://code.google.com/p/android/issues/detail?id=16002
Bug: http://code.google.com/p/android/issues/detail?id=22225
Change-Id: I86fe022fda4af68e5a6fb9dc5dd2abdb75e9d966

This was committed to master, cherry-picking to jb-mr1-dev
ndroid_text_format_Time.cpp
63f1c43fbef157397869475ef30d23e631b88bbe 05-Sep-2012 Mathias Agopian <mathias@google.com> update to new SurfaceComposerClient API

Change-Id: I8f2c96df56fe3a851b8ec03bb8734db0b6bea3d5
ndroid_view_Surface.cpp
0baaac5e9adf3ee280ae1239e2e58754a9d2b099 01-Sep-2012 Romain Guy <romainguy@google.com> Revert "Revert "Add more support for transformed clip rects and paths""

This reverts commit a8557d2169e14997637f57bc897640c8882d4a46.

Change-Id: I36d4883d548fc47ba6c0b4a42012107d0d2f85a6
ndroid_view_GLES20Canvas.cpp
a8557d2169e14997637f57bc897640c8882d4a46 01-Sep-2012 Mathias Agopian <mathias@google.com> Revert "Add more support for transformed clip rects and paths"

this introduced a dead lock in GradientCache's ctor.

This reverts commit dfe082f63e94cde9aee271c94d13de5e7217e036.

Bug: 7096001
Change-Id: I57b8bbab11fb7cb502fa58e3bbf5d19864db874f
ndroid_view_GLES20Canvas.cpp
703bd32647556524fa8cadbe869c8a8d734640ef 01-Sep-2012 Romain Guy <romainguy@google.com> Merge "Add more support for transformed clip rects and paths" into jb-mr1-dev
dfe082f63e94cde9aee271c94d13de5e7217e036 01-Sep-2012 Romain Guy <romainguy@google.com> Add more support for transformed clip rects and paths

Change-Id: I41791b1e1bffef77d503dc9e52428395d2309688
ndroid_view_GLES20Canvas.cpp
4120375d46091df8527bb701882e056fbb0e6b06 31-Aug-2012 Dianne Hackborn <hackbod@google.com> Remove Binder.getOrigCallingUid().

Replaced all remaining places that used it with explicit user
specification.

While doing this, I ran into stuff that was creating PendingIntent
objects (that now need to specify the explicit user they are for),
which are also posting notifications... but have no way to specify
the user for the notification.

So the notification manager in the system process now also gets a
formal concept of a user associated with the notification, which
is passed in to all the necessary aidl calls. I also removed the
old deprecated aidl interface for posting/cancelling notifications,
since we now always need a user supplied.

There is more work that needs to be done here, though. For example
I think we need to be able to specify USER_ALL for a notification that
should be shown to all users (such as low storage or low battery).
Along with that, the PendingIntent creation needs to be tweaked to
be able to handle USER_CURRENT by evaluating the user at the point the
pending intent is sent.

That's for another change, however.

Change-Id: I468e14dce8def0e13e0870571e7c31ed32b6310c
ndroid_util_Binder.cpp
46e942d500d5ce67a58269cbac3307deca6a5c9f 27-Jul-2012 Zhou Chang <chang.zhou@intel.com> framework: fix bug for uninitialized variable

Some application display error due to uninitialized varibale.
This patch fix the bug

Change-Id: I660169e325ffae60d95c7774aaaeaebf693adf3d
Author: Chang Zhou <chang.zhou@intel.com>
Signed-off-by: Chang Zhou <chang.zhou@intel.com>
Signed-off-by: Chong Xing <chong.xing@intel.com>
Signed-off-by: Hongyu Zhang <hongyu.zhang@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 45356
ndroid/graphics/Paint.cpp
38f197863a07cd600b45d752fdfa949d8b2e6fa6 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"

* commit '14c0c989d21531056a5d0a0739c3ffdd1b04b295':
Fix SkBitmap::fPixels not being locked correctly
14c0c989d21531056a5d0a0739c3ffdd1b04b295 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"

* commit '4ba4caede125ff602b0d93f577f9054a07791ff7':
Fix SkBitmap::fPixels not being locked correctly
35ef567140e42f354be4a98cce6a7666ac085c13 08-Jul-2012 Michal Stawinski <michal.stawinski@sonymobile.com> Fix SkBitmap::fPixels not being locked correctly

In some cases bitmap's pixels where freed during encoding, which
caused a null pointer dereference.
This fix makes sure that underlaying buffer is locked for the whole
process of compression.

Change-Id: I0ac56821f5d333072271dc2670fa30f1562adfa3
ndroid/graphics/Bitmap.cpp
64a55af0ac700baecb0877235eb42caac59a3560 26-Aug-2012 Jeff Brown <jeffbrown@google.com> Add plumbing for new surface flinger display API.

Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.

Added JNI for all of the new surface flinger display API calls.

Enforced the requirement that all Surfaces created by
the window manager be named.

Updated the display manager service to use the new methods.

Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
ndroid.mk
ndroidRuntime.cpp
ndroid_app_NativeActivity.cpp
ndroid_opengl_EGL14.cpp
ndroid_view_Surface.cpp
ndroid_view_SurfaceSession.cpp
om_google_android_gles_jni_EGLImpl.cpp
0b722fe9ce98d97dbcb6fefd170b85ab7037e528 25-Aug-2012 Jeff Brown <jeffbrown@google.com> Use new surface flinger API.

Change-Id: Ic888577408a59a36481a48010e19c5e77c24e211
ndroid_view_Surface.cpp
572a0859dd258d2d72588bfd22b750a4322d3b23 22-Aug-2012 Jeff Brown <jeffbrown@google.com> Merge "Add FloatMath.pow." into jb-mr1-dev
e2c279e8a1abc2cc7bc87b94a514a563b814cdc1 22-Aug-2012 Jeff Brown <jeffbrown@google.com> Add FloatMath.pow.

Change-Id: I5c584f4894caba47fccfa22ba95f8665990d516c
ndroid_util_FloatMath.cpp
6fb73ab83f9c1b745ccff4fb92babb429b9215ee 20-Aug-2012 Victoria Lease <violets@google.com> Merge "DO NOT MERGE Han Preference" into jb-mr1-dev
80618d66b02d8cce325cdaa184435f43818a062b 20-Aug-2012 Kenny Root <kroot@google.com> am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask"

* commit '7d5b22afae8525cdf80ba1bf8e18b87d597f830d':
Use Libcore.os.umask for setting umask
7d5b22afae8525cdf80ba1bf8e18b87d597f830d 20-Aug-2012 Kenny Root <kroot@google.com> am f029c22f: Merge "Use Libcore.os.umask for setting umask"

* commit 'f029c22f82573e7fee7c7e0cca4439fe78300bac':
Use Libcore.os.umask for setting umask
4c74f8c1713fa82904b10beec4da9ad8ebb97375 17-Aug-2012 Kenny Root <kroot@google.com> Use Libcore.os.umask for setting umask

Libcore.os now provides a umask method call, so just use that since it's
available.

Change-Id: I8826fa40bcab3d61a424ff98a8050d3e44f7ec34
ndroid_os_FileUtils.cpp
ac1cbaf2e5575ac75a0160e13089d51a0bb232fa 18-Jul-2012 Billy Hewlett <billyh@google.com> DO NOT MERGE Han Preference

Cherry-pick Ib5dd86950156c5a438f25c289acb839206bb455a from master.

Data: label MTLmr3m with "ja" locale attribute, fallback_fonts-ja.xml removed,
as we only need a single fallback font file
Code: Add locale and variant to TextLayoutCache. Paint.java sets textLocale as
the language (for example, "ja") rather than the language/locale concatenated
(for example "ja_JP")

This checkin, along with Change-Id: Id8c91ae0be6cad8a7ef77a0cd5803676290986c1,
allows text view objects to set their locale dynamically and skia will use the
correct font for the locale.

Change-Id: Ieb60b0d7a39fcfef4f8ce90cd4f6065d33673710
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
98365d7663cbd82979a5700faf0050220b01084d 20-Aug-2012 Jeff Brown <jeffbrown@google.com> Refactor for multi-display support.

Split WindowManagerImpl into two parts, the WindowManager
interface implementation remains where it is but the global
communications with the window manager are now handled by
the WindowManagerGlobal class. This change greatly simplifies
the challenge of having separate WindowManager instances
for each Context.

Removed WindowManagerImpl.getDefault(). This represents the
bulk of this change. Most of the usages of this method were
either to perform global functions (now handled by WindowManagerGlobal)
or to obtain the default display (now handled by DisplayManager).

Explicitly associate each new window with a display and make
the Display object available to the View hierarchy.

Add stubs for some new display manager API features.

Start to split apart the concepts of display id and layer stack.
since they operate at different layers of abstraction.
While it's true that each logical display uniquely corresponds to a
surface flinger layer stack, it is not necessarily the case that
they must use the same ids. Added Display.getLayerStack()
and started using it in places where it was relatively easy to do.

Change-Id: I29ed909114dec86807c4d3a5059c3fa0358bea61
ndroid_view_Surface.cpp
9a994b5350731b8169a9b25463f57266ee2988fb 17-Aug-2012 Kenny Root <kroot@google.com> am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd

* commit '050c87f87e2a48c7bc90f5b15fb6e4e37e667286':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
050c87f87e2a48c7bc90f5b15fb6e4e37e667286 17-Aug-2012 Kenny Root <kroot@google.com> am a950daf5: Merge changes Ieb566a2a,I953057cd

* commit 'a950daf5c14a0009c2c62e9c3e0e8d51eb0cf7d9':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
520ee7bcadafdc5768fa8fc8890199ebe29886da 17-Aug-2012 Kenny Root <kroot@android.com> am a2e8365c: am 9b0da58e: Merge "Introduce a restorecon JNI binding."

* commit 'a2e8365cc883de0d3e56e9f4af350ecfe1b8fc4c':
Introduce a restorecon JNI binding.
a2e8365cc883de0d3e56e9f4af350ecfe1b8fc4c 17-Aug-2012 Kenny Root <kroot@android.com> am 9b0da58e: Merge "Introduce a restorecon JNI binding."

* commit '9b0da58e3a30b760de37138cdd51d20f269c383e':
Introduce a restorecon JNI binding.
617ccc081f18f563aa953556c22ace10a1998f34 17-Aug-2012 Kenny Root <kroot@google.com> am 1090f702: Merge "Remove StatFs from AndroidRuntime JNI"

* commit '1090f7023abefc448a492e143f76f9e0925fd6ee':
Remove StatFs from AndroidRuntime JNI
98e15e78934a00cf46f2be55472b7fd7a39ac0de 16-Aug-2012 Kenny Root <kroot@google.com> Use Libcore's stat instead of FileUtils#getFileStatus

Remove the last user of FileUtils#getFileStatus and move it to
Libcore.os.stat instead. Then we can remove the JNI code that does the
equivalent of a stat.

Change-Id: Ieb566a2a8a17c2dd0150724b4eb3ac1cc41c823d
ndroid_os_FileUtils.cpp
786cbcacd2efbd94476eb05a4d5b77211f20d434 16-Aug-2012 Kenny Root <kroot@google.com> Use Libcore.os.stat instead of FileUtils

PackageManagerService just needed to know the owner for this file, so
just use stat instead so we can remove the old JNI code.

This is the last user of FileUtils#getPermissions so just remove the
FileUtils method as well.

Change-Id: I953057cd6b9de4410f33b6f22e4bddff02fe2988
ndroid_os_FileUtils.cpp
3f1e8b90b05e0fb39240f4c8924d94d8c11f50d1 16-Aug-2012 Kenny Root <kroot@google.com> Remove StatFs from AndroidRuntime JNI

Change-Id: I88039794cf3e4a959b37c29c67f16f2dc0751a5c
ndroidRuntime.cpp
9b0da58e3a30b760de37138cdd51d20f269c383e 16-Aug-2012 Kenny Root <kroot@android.com> Merge "Introduce a restorecon JNI binding."
89db6a40afe59c30f0bcec5b08dc908cda98c594 16-Aug-2012 Kenny Root <kroot@google.com> Remove StatFs from AndroidRuntime JNI

Change-Id: I88039794cf3e4a959b37c29c67f16f2dc0751a5c
ndroidRuntime.cpp
a579f7926af72597f1c11c5df0486253d5d2c435 16-Aug-2012 Kenny Root <kroot@google.com> am d69b47c0: am 8942e5a3: Merge "Use libcore Posix class for StatFs implementation"

* commit 'd69b47c087a87355df76a5276ab18af847f64367':
Use libcore Posix class for StatFs implementation
d69b47c087a87355df76a5276ab18af847f64367 16-Aug-2012 Kenny Root <kroot@google.com> am 8942e5a3: Merge "Use libcore Posix class for StatFs implementation"

* commit '8942e5a32ae2d1a36b65efe5b26cc06227ea0ca5':
Use libcore Posix class for StatFs implementation
bdd23ae9f5ea2b3e0720e76711345cad0fa8d6dd 16-Aug-2012 Kenny Root <kroot@google.com> Use libcore Posix class for StatFs implementation

Remove some JNI and duplicated functionality and use libcore's Posix
class for the statfs function instead.

Change-Id: Ic1e161dc10c18c2c6ee81d895a0efd8910086dbf
ndroid.mk
ndroid_os_StatFs.cpp
270e3381e7053c3b15aa8f508c9df9d98032cd62 16-Aug-2012 Jeff Brown <jeffbrown@google.com> Add FloatMath.hypot.

Change-Id: I6a5a7ea2254300614dbbf540f40e39dbec2d2900
ndroid_util_FloatMath.cpp
a3665ba95d806fcb6780d29d49bd0f1032e8bc86 10-Aug-2012 mike wakerly <mikey@google.com> UsbRequest: set ByteBuffer.position() upon success.

Also clears allocated buffer before copying.

Closes http://b.android.com/28023

Bug: 5385026
Bug: 6766413
Change-Id: Icf2c1d45db4fb2a9bd1fcfdb29aa7308034faaf0
ndroid_hardware_UsbRequest.cpp
1670dc9abf60368cca64c66df038aef76c1f0675 09-Aug-2012 Jeff Brown <jeffbrown@google.com> Merge "Add FloatMath.exp." into jb-mr1-dev
5d728bb9ff8c6ad89d5a1b88b2804f954d45d763 08-Aug-2012 Jeff Brown <jeffbrown@google.com> Add FloatMath.exp.

Change-Id: I7f215e5fd4cb942ddee56eebaef04be565ac79f3
ndroid_util_FloatMath.cpp
c89b14bba0f6cc2c91629080617f7ed215f697f3 08-Aug-2012 Romain Guy <romainguy@google.com> It seems that apparently useless public APIs are actually useful
Bug #6953651

Change-Id: Ic47ce504e63262711f5d3edc76f7d2b9c12471ad
ndroid_view_GLES20Canvas.cpp
17112ad8a21a77620eb1ff14dcf8bdd6b7859712 07-Aug-2012 Romain Guy <romainguy@google.com> Cleanup of libhwui

Change-Id: Ib7f5771548462c00027a8ad57badfb68c50644f9
ndroid_view_GLES20Canvas.cpp
9de4936c99b979f6010440b043edc6d6142d1980 02-Aug-2012 Craig Mautner <cmautner@google.com> Add features to DisplayManager.

Added Surface.setDisplayId().
Added callbacks to DisplayManagerService.

Change-Id: Idd3f85f8ca1f1208962f1196efd6a3ab51c8c259
ndroid_view_Surface.cpp
42e1e0d482d774cf18a55773e434f02edb9e4462 30-Jul-2012 Romain Guy <romainguy@google.com> Improve gradients

Avoid using textures for common gradients (two stops from 0.0 to 1.0)

Change-Id: Iff55d21b126c8cfc4cfb701669f2339c8f6b131a
ndroid/graphics/Shader.cpp
c3e4f0a72baff805b434fd6b24cb29b3dc68e98d 28-Jul-2012 Romain Guy <romainguy@google.com> Merge "Rename drawGeneralText to drawText" into jb-mr1-dev
c25259519f1b74bb62a2b051b74537f073436b5c 28-Jul-2012 Romain Guy <romainguy@google.com> Rename drawGeneralText to drawText

Change-Id: I5062ea5b0605fc7af27f410fafc930d10f38e926
ndroid_view_GLES20Canvas.cpp
a0aa479c0eadd446dc9159195c175e3a5fe083c0 28-Jul-2012 Romain Guy <romainguy@android.com> am 97e27072: am dfac68ea: Merge "Corrected typo when checking InputStream methods"

* commit '97e270721bf29d25b513c1f2be71a8543d048f5d':
Corrected typo when checking InputStream methods
97e270721bf29d25b513c1f2be71a8543d048f5d 28-Jul-2012 Romain Guy <romainguy@android.com> am dfac68ea: Merge "Corrected typo when checking InputStream methods"

* commit 'dfac68eacc60c130e54345d98bd45c99573cb627':
Corrected typo when checking InputStream methods
dfac68eacc60c130e54345d98bd45c99573cb627 27-Jul-2012 Romain Guy <romainguy@android.com> Merge "Corrected typo when checking InputStream methods"
8ac41bb79e96e240e0e774ff2dff2654cb10669c 03-May-2011 Edward Savage-Jones <edward.savage-jones@sonyericsson.com> Corrected typo when checking InputStream methods

Corrected a small typo where Java InputStream methods are
incorrectly checked when creating a JNI InputStream adaptor.

Change-Id: I5f14897e0d5ddceb4b2af6be46769713f0487624
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
fa25bf5382467b1018bd9af7f1cb30a23d7d59f7 24-Jul-2012 Jeff Brown <jeffbrown@google.com> Add display manager skeleton.

The purpose of this change is to remove direct reliance on
SurfaceFlinger for describing the size and characteristics of
displays.

This patch also starts to make a distinction between logical displays
and physical display devices. Currently, the window manager owns
the concept of a logical display whereas the new display
manager owns the concept of a physical display device.

Change-Id: I7e0761f83f033be6c06fd1041280c21500bcabc0
ndroid.mk
ndroidRuntime.cpp
ndroid_view_Display.cpp
ndroid_view_Surface.cpp
554cb0c290406f5bba34908489db5382a69d0a9a 05-Jul-2012 rpcraig <rpcraig@tycho.ncsc.mil> Introduce a restorecon JNI binding.

Label the vmdl.*\.tmp files and the final .apk file differently.
Modify the WallpaperManagerService to restorecon the wallpaper file.

Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: Idfc056e9ec0508d7e11100626a7114f341f1af70
ndroid_os_SELinux.cpp
4530a50a7bb78cb4e2da7c8c229bb547b605d022 24-Jul-2012 Mathias Agopian <mathias@google.com> Merge "New bindings generated by glgen"
eba77803dccaa3f0a2260adb325bc3296d9bdc6a 24-Jul-2012 Raph Levien <raph@google.com> Merge "Hardware implementation of glyph positioning (bug 5443796)"
37c9b49ab5eb5a676370fd7081db0967c38e97a6 24-Jul-2012 Thomas Tafertshofer <tafertth@google.com> New bindings generated by glgen

Fixes crash of methods when NULL was used as a
(valid) parameter for a nio.buffer argument.

Bug: 6845189
Change-Id: Iae379d607bbca15d6d23e74e852f94c7f68637f9
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES20.cpp
om_google_android_gles_jni_GLImpl.cpp
996e57c84368058be793897ebc355b917a59abc2 24-Jul-2012 Raph Levien <raph@google.com> Hardware implementation of glyph positioning (bug 5443796)

This implementation adds a drawGeneralText() method to the OpenGL
Renderer, which supports both a global x, y position, an array of
individual glyph positions, and also a length parameter (which enables
drawing of underline and strikethrough. It also adds the method to the
display list (with marshalling and unmarshalling).

With this change, the existing drawText() method is removed entirely, as
it's subsumed by the new method. It's easy enough to revert to the old
functionality if needed by passing in a NULL positions array.

Change-Id: I8c9e6ce4309fd51cc5511db85df99f6de8f4f6f5
ndroid_view_GLES20Canvas.cpp
16a4003b11bd8fcc2b4c065f85de1464b1e21fe7 24-Jul-2012 Mathias Agopian <mathias@google.com> Merge "updated gles20 bindings, fixes broken methods"
b8acd060d409f0e81ab3510b429cb86d3f34adb8 20-Jul-2012 Nick Kralevich <nnk@google.com> am fa6e1ea7: am 2c932143: Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"

* commit 'fa6e1ea773a74aa6a996a783ff16c495ab3cc822':
s/LOG/ALOG/ in HAVE_SELINUX blocks
95f1158908d990bbf954d7cc78f3f214a6c84f1f 19-Jul-2012 Nick Pelly <npelly@google.com> Introduce SystemClock#elapsedRealtimeNano.

Change-Id: I47e1b14d45c5321f959d46e1805f86aafd72f5d4
ndroid_os_SystemClock.cpp
fa6e1ea773a74aa6a996a783ff16c495ab3cc822 20-Jul-2012 Nick Kralevich <nnk@google.com> am 2c932143: Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"

* commit '2c932143ffe865d49c741e466b425bdbabbd1f2f':
s/LOG/ALOG/ in HAVE_SELINUX blocks
dd06946252be852aa53eb6142a119b0fccc83cd1 20-Jul-2012 Thomas Tafertshofer <tafertth@google.com> updated gles20 bindings, fixes broken methods

this adds correct versions of the broken GLES20 methods
glGetShaderSource, glGetActiveAttrib and glGetActiveUniform.
the old functions are still there and need to be @hide later.

Bug: 6006380
Change-Id: I8127a77c4b89aa8a9a54bea88774077535e2139d
ndroid_opengl_GLES20.cpp
d48a84cea5458c33a93fbd0f719471ab37b531d6 19-Jul-2012 Mathias Agopian <mathias@google.com> Merge "Updated OpenGL bindings to fix nio buffer crash"
161ebab85d976320f156cb4e55140533ae15f92d 19-Jul-2012 Raph Levien <raph@google.com> Increase text layout cache size in bytes

The mark positioning changes increase the number of bytes needed per
glyph from 6 to 14. This patch compensates by allocating more total
memory for the text layout cache.

Change-Id: I3cf59547394a41779cf6e92e67688b0fdc85f1a3
ndroid/graphics/TextLayoutCache.h
4f3c8f7026d89a5d79e2621eb6428d5b9b1a25f3 19-Jul-2012 Raph Levien <raph@google.com> Fix overly verbose logging in TextLayoutCache

I meant to log certain debug values only when DEBUG_GLYPHS was set, but
I used #ifdef instead of #if (when it's not set, it's 0, rather than
undefined).

Change-Id: Ic27fee7dd355009c1873f0a2e12614849bbceebd
ndroid/graphics/TextLayoutCache.cpp
57bdd3d3782ceeba38dd862b7de73d47793bee93 18-Jul-2012 Raph Levien <raph@google.com> Merge "Software-only implementation of glyph positioning (bug 5443796)"
2301d32f7e2ba584abc31ac177dde754385d3c04 18-Jul-2012 Raph Levien <raph@google.com> Software-only implementation of glyph positioning (bug 5443796)

This patch implements glyph positioning in the Skia-based renderer. Note
that it depends on a fix for bug 6833339 being in place (correct
calculation of advance widths under skew and scale transforms),
otherwise there will be regressions.

Careful attention was paid to correct results in a wide variety of
conditions: alignments, text decorations, scale, skew, etc. Many of
these are exercised in the test app attached to bug 6833339.

Note that this patch also changes slightly the way that the total
advance is calculated - the running is accumulated and passed through to
computeRunValues(), so that the x positions of each glyph can be set
according to the total advance of all glyphs (in all runs) appearing
before (plus, of course, the offset for mark positioning).

After committing this patch, text rendering will no longer match between
the software and hardware rendering cases. Implementing positioning in
the hardware renderer will resolve that, and fully implement bug 5443796.

Change-Id: Ie0f7835d48bc120475a19afbfe159aa5304fcaa8
ndroid/graphics/Canvas.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
a0a69897dfa3f0ede5558326172fb676e5dbe359 17-Jul-2012 Matthew Xie <mattx@google.com> Merge "Remove BT references from System Server."
d4d4e715c5f4423b9fadce77b120b8488e011337 17-Jul-2012 Matthew Xie <mattx@google.com> Merge "Delete various Bluetooth files for stack integration."
ef4e817ad642303509da1cb28ce5a265e1ac3e17 17-Jul-2012 Jeff Brown <jeffbrown@google.com> Remove freeze(), unfreeze() and setFreezeTint().

This is all dead code.

Change-Id: Ia8a3068606bfe277a16cde5690f47996657863e8
ndroid_view_Surface.cpp
55e395ab33f24b009d87a4d45a5566394260fff7 16-Jul-2012 Jeff Brown <jeffbrown@google.com> Remove freezeDisplay(), which is no-op.

Change-Id: I981ee49e6e2d41a09feaee4b384392e83f7faf3d
ndroid_view_Surface.cpp
34196187365687d3f144a6de5fef811b52545ac0 18-Jan-2012 Jaikumar Ganesh <jaikumar@google.com> Remove BT references from System Server.

Change-Id: Icfdb3e140aa35174a8b70da57472a1bf2bd0143b

Conflicts:

services/java/com/android/server/SystemServer.java
ndroid.mk
313a2167098ce8498db3a50d70724f260e8169c0 18-Jan-2012 Jaikumar Ganesh <jaikumar@google.com> Delete various Bluetooth files for stack integration.
ndroid.mk
ndroidRuntime.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_bluetooth_c.c
ndroid_bluetooth_c.h
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
17045a16575ece34cfadb63da4791f115625df78 12-Jul-2012 Thomas Tafertshofer <tafertth@google.com> Updated OpenGL bindings to fix nio buffer crash

Contains the updated OpenGL bindings generated by glgen.
Fixes a bug with methods that have more then one nio buffer argument.

Bug: 6772416
Change-Id: I6d50ce79669edd43dbe414e499660cdd55eb4893
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
om_google_android_gles_jni_GLImpl.cpp
f0af1d5cb255f136d2fff773be7518ffd7ae3b93 12-Jul-2012 Romain Guy <romainguy@google.com> Remove unused View.flushLayer() API

Change-Id: I5d4c7388afb5265964ab6b769cc0abfee9745c84
ndroid_view_GLES20Canvas.cpp
4c9dfc4da992f67a86209d8b2b8539d697373ad6 12-Jul-2012 Romain Guy <romainguy@google.com> Merge "Update layers' opaque property when needed"
846a533945576e5cb1a66529ca3a52d71749f04f 12-Jul-2012 Romain Guy <romainguy@google.com> Update layers' opaque property when needed

Before this change, changing a View's opacity would not be reflected
by hardware layers. This could cause layers to retain their previous
opacity.

Change-Id: Iba2c8b4242deca021651df9324cc7c585a64653d
ndroid_view_GLES20Canvas.cpp
f16336790bca9d3e946553f2e5a16e14bb9dbc3e 12-Jul-2012 Mathias Agopian <mathias@google.com> Merge "Fixed exception caused crash in GL bindings"
73a3c0c4d783e49fd7c660b1249b97fda5e2fc61 12-Jul-2012 Mathias Agopian <mathias@google.com> Merge "EGL 1.4 bindings generated by glgen"
cae28fa0511bb526b4e94e8acfa1ba3b1745576b 11-Jul-2012 Victoria Lease <violets@google.com> Merge "Remove hardcoded typeface pointers"
d6deccb346e913d906f484d279b19e0f6ea18d94 22-Jun-2012 Billy Hewlett <billyh@google.com> Remove hardcoded typeface pointers

There were a number of extraneous typeface pointers, one per
language, in TextLayoutCache. Removing these makes adding additional
supported fonts easier. This checkin now properly
unrefs typefaces returned by SkCreateTypefaceForScript. Additionally,
all harfbuzz shaped fonts (with exceptions Greek, Cyrillic, Hangul)
should call SkCreateTypefaceForScript.

Change-Id: I7dcf603a89e5ff52c6dab8fb87ae1807a79c351c
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
6b1e838fc16d397359f82c3a4f5700f1ed7dd910 03-Jul-2012 Thomas Tafertshofer <tafertth@google.com> EGL 1.4 bindings generated by glgen

Change-Id: I1c3da57101f4ea089a12f1796f25b72d6852141e
ndroid.mk
ndroidRuntime.cpp
ndroid_opengl_EGL14.cpp
6d2999a048332c6192e66ec67835a71d59282384 10-Jul-2012 Romain Guy <romainguy@google.com> am 90752485: Properly resize paletted bitmaps when adjusting for density

* commit '907524851af0d656ba049311f7535a4ba5d2b1d2':
Properly resize paletted bitmaps when adjusting for density
907524851af0d656ba049311f7535a4ba5d2b1d2 10-Jul-2012 Romain Guy <romainguy@google.com> Properly resize paletted bitmaps when adjusting for density

If an app used a GIF file in the wrong density bucket, the auto-scaling
code would not properly resize the bitmap.

This issue affects third party applications, here is the external bug
report:

http://code.google.com/p/android/issues/detail?id=34619

DO NOT MERGE

Change-Id: I7f99b28ad6e6c28bdbcb29bbbadcb215268ff710
ndroid/graphics/BitmapFactory.cpp
053a82cc18b8ad9b6cb321b57893225411ccf146 10-Jul-2012 Romain Guy <romainguy@google.com> Properly resize paletted bitmaps when adjusting for density

If an app used a GIF file in the wrong density bucket, the auto-scaling
code would not properly resize the bitmap.

Change-Id: I28f6506a94b20d11b3ba53ac442abec2b92e093e
ndroid/graphics/BitmapFactory.cpp
365861e3aae9cccdb19b8d4ee375c57e0a431f1e 10-Jul-2012 Joshua Brindle <jbrindle@tresys.com> s/LOG/ALOG/ in HAVE_SELINUX blocks

The latest push changed LOG(E|V) to ALOG(E|V) but it was not updated in HAVE_SELINUX blocks.

Change-Id: I626588589dd00775ba29f2a256ac29e481598dc3
Signed-off-by: Joshua Brindle <jbrindle@tresys.com>
ndroid_os_SELinux.cpp
845b4712f0e4d7ca802f21fba1adae0b1d0712e7 02-Jul-2012 Glenn Kasten <gkasten@google.com> Use audio_channel_mask_t more consistently

In AudioRecord::getMinFrameCount() and AudioSystem::getInputBufferSize(),
input parameter is channel mask instead of channel count.

Change-Id: I22a1c492113f3e689173c5ab97b2567cff3abe2b
ndroid_media_AudioRecord.cpp
2545b32ced69100fe70685b95315c6adf411083b 28-Jun-2012 Thomas Tafertshofer <tafertth@google.com> Fixed exception caused crash in GL bindings

Bug: 6709865
Change-Id: Iab55a9eda2ec686710872abf0ff2ebbdf382f77c
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
om_google_android_gles_jni_GLImpl.cpp
f62034d89611fbd3e1d41413847241757acd0c10 26-Jun-2012 Raph Levien <raph@google.com> Initialize shaper offset array. Needed for bug 5443796.

Harfbuzz apparently requires the offset array to be initialized to zero,
otherwise it can report corrupt glyph positions. This change also
contains a small amount of refactoring to avoid code duplication.

Change-Id: I2553974f40bc8e0549876c7d31243960ca92a8a2
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
6212a4f2ed2a5921de08b527cd1b25e1d155e56b 25-Jun-2012 Raph Levien <raph@google.com> Fix broken build when DEBUG_GLYPHS is set

Some of the logging lines referred to the "path" variable which no
longer exists. We log the Harfbuzz script instead, which hopefully
provides enough context.

This change only affects debug builds, but we will want to be working
intensively in this space.

Change-Id: I86c3b58c9fa2a8c47812ef5f0b5ce64fd8dcdc20
ndroid/graphics/TextLayoutCache.cpp
10a9831b661f40cae1832e96f6e26a587c7eb6c3 22-Jun-2012 Glenn Kasten <gkasten@google.com> Remove AudioRecord record_flags

Change-Id: I8a3d62ea64415582c87f43e94b17aa884d7d572d
ndroid_media_AudioRecord.cpp
960511848ade732f7dab838a1625729698c7c952 21-Jun-2012 Billy Hewlett <billyh@google.com> Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""

This reverts commit 6fadccd2484233ed570218b3f97c085ef1a1ec28
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
6fadccd2484233ed570218b3f97c085ef1a1ec28 21-Jun-2012 Billy Hewlett <billyh@google.com> Revert "Use Elegant fonts for Webkit, Compact fonts for Textview"

This reverts commit ecf80965d05e44b3701b3392aeb02028daacf1b0
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ecf80965d05e44b3701b3392aeb02028daacf1b0 07-Jun-2012 Billy Hewlett <billyh@google.com> Use Elegant fonts for Webkit, Compact fonts for Textview

Fonts can be marked with elegant or compact in fallback_fonts.xml.
Webkit uses elegant fonts, Textview uses compact fonts (the default),
unmarked fonts are used by both.

Bug: 6649136

Change-Id: Ie0debcddc13350bf60fe3139cd7ae533e466f02b
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
e25071650ee4761c86a1b8323de26a07a0f6ad79 19-Jun-2012 Raph Levien <raph@google.com> Fix bug 6688060: breakage in AndroidCharacter.mirror

A code cleanup inadvertently changed the semantics of the function,
causing it to return immediately when the first character is mirrored.
This causes CTS test breakage (in
android.text.cts.AndroidCharacterTest). This change restores the earlier
behavior and causes the test to pass.

Change-Id: I68cfb75f1db16eaa72e569dc48fbd0dee06f2de8
ndroid_text_AndroidCharacter.cpp
3199209c92fd31444e179a8ea05ebdf9347b8086 15-Jun-2012 Matthew Xie <mattx@google.com> am 8607127d: am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev

* commit '8607127d8bd9bf87cce9dde5451c926a14548bfd':
Handle ENITR failure for Headset control channel.
8607127d8bd9bf87cce9dde5451c926a14548bfd 15-Jun-2012 Matthew Xie <mattx@google.com> am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev

* commit '839734bbe502c876237a0473823b606803051825':
Handle ENITR failure for Headset control channel.
be513afb62ad85b8beee310a2e6a0531eef97705 15-Jun-2012 Matthew Xie <mattx@google.com> Handle ENITR failure for Headset control channel.

Wrap poll and read with TEMP_FAILURE_RETRY
bug 6503000, 6623444

Change-Id: I2e302dc04df6b5bd5982c3d189881a687a95fb2d
ndroid_bluetooth_HeadsetBase.cpp
f69eef1b63335ce902c1c0549aee3143de1c5f4c 13-Jun-2012 Jeff Brown <jeffbrown@google.com> am b8b29fa7: am fdcac45b: Merge "Print extended SQLite error code." into jb-dev

* commit 'b8b29fa7f18dd36bacc97d6c471935cb95e4c18c':
Print extended SQLite error code.
b8b29fa7f18dd36bacc97d6c471935cb95e4c18c 13-Jun-2012 Jeff Brown <jeffbrown@google.com> am fdcac45b: Merge "Print extended SQLite error code." into jb-dev

* commit 'fdcac45b6767caaac70c30fd974dce61119f79d7':
Print extended SQLite error code.
ca309f212d560673276aec0f4168a6c56131260c 13-Jun-2012 Jeff Brown <jeffbrown@google.com> Print extended SQLite error code.

Bug: 6538393
Change-Id: I2b010c6a1127887717af67ec588c3df8bf41afe6
ndroid_database_SQLiteCommon.cpp
be782a6aa0f7c656ed0dce468b9722c3acde8358 11-Jun-2012 Dianne Hackborn <hackbod@google.com> am 3857681e: am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev

* commit '3857681e5885b64e593dcc3e28492b156d860ed3':
Include important native processes in watchdog stacks.
3857681e5885b64e593dcc3e28492b156d860ed3 11-Jun-2012 Dianne Hackborn <hackbod@google.com> am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev

* commit 'a7e3a1e0e7d308e7e78a1992038a34485d04ab29':
Include important native processes in watchdog stacks.
f72467ad9843bf5d4b75fb308386e77ebb5c3447 09-Jun-2012 Dianne Hackborn <hackbod@google.com> Include important native processes in watchdog stacks.

Helps us track down deadlocks involving native service processes.

Bug: 6615693
Change-Id: I580047550772e29586195a8cf440141574e3f40c
ndroid_os_Debug.cpp
ndroid_util_Process.cpp
450f21a97da3d12fa835ed436cab251bbc34cf89 08-Jun-2012 Kenny Root <kroot@google.com> am d26f7139: Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp

* commit 'd26f7139a7ff42ca1be470657515767f7509955b':
Add JNI bindings for some of the libselinux interfaces.
e38b1c4d156a569efc646e86a72ab3a3e3ccf6fc 08-Jun-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp

Change-Id: I012bd3b5946dedba3439285caa93739d44ebc60f
89b8838496dca5920c6cd86aef555a5e180556d2 07-Jun-2012 Chet Haase <chet@google.com> am ca43c961: am 44b2fe3f: Track canvas clearing for swap buffers logic.

* commit 'ca43c96127e9f7cdab8ee70638a2445347eebd08':
Track canvas clearing for swap buffers logic.
29b9885c258b46b00a8caf72ea1a6835d4594981 07-Jun-2012 Victoria Lease <violets@google.com> Merge "Fix hardcoded font path. Allow adding new font path thru Skia changes. Bug: 6609231"
44b2fe3fc114ee5f7273c6b0fee2cc999bf244a2 07-Jun-2012 Chet Haase <chet@google.com> Track canvas clearing for swap buffers logic.

A previous fix made it necessary for a frame to render something to GL
in order to cause a call to eglSwapBuffers(). Besides the calls being
tracked as part of issuing a DisplayList, there is also a potential call
to clear the canvas (via glClear()) on non-opaque surfaces. This call is also
good to track, since a surface that gets cleared without any other drawing operations
is worth flipping to the screen (to erase old contents on that surface).

This fix tracks the status of the pre-draw operations to find out whether
glClear() was called and then sets the drawing status appropriately.

Issue #6606422 QuickContact dismissal is janky again (Tracking)

Change-Id: I5fcaccfdc9293dd46b83f2fc279730a5d2740ebf
ndroid_view_GLES20Canvas.cpp
9d25fa67a9291d469fa4006b2a373c8429132536 05-Jun-2012 Jeff Brown <jeffbrown@google.com> Report extended error information from SQLite.

The error code number is not as informative as the SQLite error
message, in particular because the error code has been stripped
of extended error information. Make sure we ask SQLite for the
full error message whenever possible.

Bug: 6538393
Change-Id: I82457c0ff7e41659cf8195fa26e09dc2b467375e
ndroid_database_SQLiteCommon.cpp
ndroid_database_SQLiteConnection.cpp
517f67fe4b70c5a1907cb503d62b906a1eed2e1e 05-Jun-2012 Billy Hewlett <billyh@google.com> Fix hardcoded font path. Allow adding new font path thru Skia changes.
Bug: 6609231

Change-Id: I7b28c6f7ac1c227c7059b486635cadb39a6eacc3
ndroid.mk
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
6e3301dcfa4dce889fdce1db6ac6803cac11cc46 04-Jun-2012 Raph Levien <raph@google.com> Merge "Fix bug 6558006: SystemUI native heap is huge. Fix memory leak" into jb-dev
9eb7d86181729c3eb769d71123c4ce9ffc868f08 01-Jun-2012 Jeff Brown <jeffbrown@google.com> Make velocity tracker strategy configurable.

This change is very useful for testing purposes because it makes it
easy to compare different implementations to see how they behave.

There is no change to the current default strategy.

Bug: 6413587
Change-Id: I4d8567aa4160571ba9fa397ce419882cd9366749
ndroid_view_VelocityTracker.cpp
75394d6d1ba633f6bf0218f563b8876b824c6fcf 03-Jun-2012 Raph Levien <raph@google.com> Fix bug 6558006: SystemUI native heap is huge. Fix memory leak

TextLayoutCache was leaking HB_Face objects, not freeing them when
purging the mCachedHBFaces cache. More full analysis is in the bug.

Change-Id: Ie5cd8b00c36b9d31963183c601cde49cbb73fafb
ndroid/graphics/TextLayoutCache.cpp
80a1de1007ddc62e1af2a4746008f499145aeaab 01-Jun-2012 Jeff Brown <jeffbrown@google.com> Use sp<LooperCallback> to fix race causing dangling pointer.

Bug: 6559630
Change-Id: I9b9c76577779841006f9c024a80685ba8b7cd0e1
ndroid_view_DisplayEventReceiver.cpp
ndroid_view_InputEventReceiver.cpp
676c519ec4509c799049bae5f6b20748ee5210c1 31-May-2012 Jeff Brown <jeffbrown@google.com> Increase busy timeout.

Bug: 6579925
Change-Id: I110d9a98479cbfcc518deef6d59b0f956396b6da
ndroid_database_SQLiteConnection.cpp
2598a5c89fb8c0a9315097657ac688f2b28e5ae8 19-May-2012 Mathias Agopian <mathias@google.com> Merge "drop frame in case of error in updateTexImage" into jb-dev
df071486e0cf6241e7351efc786385cce38768f9 19-May-2012 Mathias Agopian <mathias@google.com> drop frame in case of error in updateTexImage

Bug: 6476587
Change-Id: I864a7d0997761150a3db2ddd5890ed820d792e56
ndroid_view_GLES20Canvas.cpp
fb5c3dba4ddac023cfd4cdcabdfdbcf343197c94 19-May-2012 Dianne Hackborn <hackbod@google.com> Fix issue #6440173: MenuItem.setIcon(Drawable) scaling incorrectly...

...when resource is aliased

We were not correctly using the final resolved configuration when
retrieving a drawable through Resources.getDrawable(). (It already
does the correct behavior when going through TypedArray.getDrawable()).

Change-Id: I9032b788b592412178e31e2e6b0181b92c20fe45
ndroid_util_AssetManager.cpp
f970c2e6de52ef0da91c3c8f3b48a44303d0eb73 25-Apr-2012 Owen Lin <owenlin@google.com> Nvidia's patch for reusing bitmap in image region decoding.

bug: 5884845
Change-Id: I43d4d86ee94591b0b53393dfba13c7cc5c4e428d
ndroid/graphics/BitmapFactory.h
ndroid/graphics/BitmapRegionDecoder.cpp
31a4cbf00c3af901f27774c9f27a20ffcabd8fed 16-May-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #6495019 Character gets garbled when locale is changed" into jb-dev
15cc68ced062a0dbd174718abfb1c783ac1aa433 15-May-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #6495019 Character gets garbled when locale is changed

- add missing cached data clearing. The Shaper was caching the HB_Face so
clear them too
- do minor code refactoring

Change-Id: Ifa86cc63815bdb4b51ce688cf16e986415b1e8c1
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
49c5fc0b9e850497233e189ff9dcc71a78ebe6e7 15-May-2012 Romain Guy <romainguy@google.com> Avoid unnecessary copy when invoking drawBitmap(int[])
Bug #6483390

Change-Id: I4d2d725ef50c9401b4bd998b6160128102b40745
ndroid_view_GLES20Canvas.cpp
7b8523aaed11a3b5ee286776023233036ac0759d 15-May-2012 Romain Guy <romainguy@google.com> Merge "Remove all Dalvik allocations from Cavnas.drawBitmap(int[], ...)" into jb-dev
e651cc6239616a202f6e96ebc2ed93b4b8b3627c 15-May-2012 Romain Guy <romainguy@google.com> Remove all Dalvik allocations from Cavnas.drawBitmap(int[], ...)

Change-Id: Ie28538a2104d21154fdc78a56525e7403f08287d
ndroid_view_GLES20Canvas.cpp
85bd0d62830a098c1bdc720dfdcf4fe1b18b657c 14-May-2012 Jeff Brown <jeffbrown@google.com> More VelocityTracker refactoring.

Bug: 6413587
Change-Id: Ida1152e7a34d5fe5caab5e6b5e1bc79f6c7a25e6
ndroid_view_VelocityTracker.cpp
58770232216cd735afdfd3dd53151070e06de5ce 12-May-2012 Jeff Brown <jeffbrown@google.com> Merge "Move power HAL interactions to PowerManagerService." into jb-dev
7304c343821309dd15f769b18f1de2fa43751573 12-May-2012 Jeff Brown <jeffbrown@google.com> Move power HAL interactions to PowerManagerService.

This refactoring sets the stage for a follow-on change that
will make use additional functions of the power HAL.

Moved functionality from android.os.Power into PowerManagerService.
None of these functions make sense being called outside of the
system server. Moving them to the PowerManagerService makes it
easier to ensure that the power HAL is initialized exactly once.

Similarly, moved ShutdownThread out of the policy package and into
the services package where it can tie into the PowerManagerService
as needed.

Bug: 6435382
Change-Id: I958241bb124fb4410d96f5d5eb00ed68d60b29e5
ndroid.mk
ndroidRuntime.cpp
ndroid_os_Power.cpp
c9e27d4ba1f46eb29aa8a794685ecb7c492d5d83 12-May-2012 Jamie Gennis <jgennis@google.com> Merge "Surface: replace active rect with window crop" into jb-dev
909c4b855a372dbc70ce6777df64d12ae93ad2d5 12-May-2012 James Dong <jdong@google.com> Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev
8a90e6e3174083f274538567d851f98478fc83e9 11-May-2012 Jeff Brown <jeffbrown@google.com> Minor refactoring before starting on velocity tracker changes.

Bug: 6413587
Change-Id: I5eba2bb57193bff78cb3740de5f87aca0b31d154
ndroid_view_VelocityTracker.cpp
78b8ef3f3ad8ab935f677d8d672db0d97bff8119 07-May-2012 Jamie Gennis <jgennis@google.com> Surface: replace active rect with window crop

This change replaces the setActiveRectCrop method on Surface, which was called
from app processes, with the setWindowCrop method that is to be called from the
window manager.

Bug: 6299171
Change-Id: Ica51efcd8c488a526e7013b83d80df4856694519
ndroid_view_Surface.cpp
2c2864f65c5cec6aebcb1b5612331f3946893042 10-May-2012 Dianne Hackborn <hackbod@google.com> Merge "Add new API to find total RAM." into jb-dev
59325eb31f25704bb88c348160bb69e7c1aa3b48 10-May-2012 Dianne Hackborn <hackbod@google.com> Add new API to find total RAM.

Change-Id: Iad2dff3c44f471515f093e7f0d0d959528881ab9
ndroid_util_Process.cpp
25c934533fb81aa08e379ffe60e390dbbd12440c 10-May-2012 Jeff Brown <jeffbrown@google.com> Fix reference to moved class.

Bug: 6468759
Change-Id: I937e824beba4571fce6d2d91cb8213989a4a0afb
ndroid_database_SQLiteCommon.cpp
8bd8d8969380e24fadca64b6977dc20b1cf4d569 10-May-2012 Jeff Brown <jeffbrown@google.com> Merge "Fix possible leak in bitmap decoding." into jb-dev
27d83834143c117cbc0d06147c4374553f26b683 10-May-2012 Jeff Brown <jeffbrown@google.com> Fix possible leak in bitmap decoding.

In one particular error case, we might exit the function without
destroying the bitmap.

Bug: 6467873 (tangentially related)
Change-Id: I3a213cc0a53023d9d0d2a080aed15774f4c4c10c
ndroid/graphics/BitmapFactory.cpp
a53de0629f3b94472c0f160f5bbe1090b020feab 09-May-2012 Dianne Hackborn <hackbod@google.com> Add callback hack to find out when to load system properties.

Use this to reload the trace and layout bounds properties.

This is ONLY for debugging.

Change-Id: I1c4bdb52c823520c352c5bac45fa9ee31160793c
ndroid_os_SystemProperties.cpp
ndroid_util_Binder.cpp
8902097bb686752ff207e3bda12713be1a8c74eb 01-May-2012 Insun Kang <insun@google.com> Improve notifying TimedText by reducing marshall/unmarshalling.

o Removes mParcel from TimedText class.
o Converts native parcel into java parcel object directly without
copying to an intermediate byte array.
o JNIMediaPlayerListener::notify checks for Java exceptions, logs them,
and clears the exception state.

related-to-bug: 6405934

Change-Id: I8b82d3cd5b9b3ef8cad27e805202a0e445a88a45
ndroid_os_Parcel.cpp
ndroid_os_Parcel.h
feecf9d7869c87dfe11d594640d0c7ad2045d1fb 09-May-2012 Dianne Hackborn <hackbod@google.com> Merge "Support for changing traces from development settings." into jb-dev
83e6eb11d7ec24e7c363beccab0806989ad89ec5 08-May-2012 Dianne Hackborn <hackbod@google.com> Support for changing traces from development settings.

Publish information needed to build UI, fix SystemProperties.getLong()
to be able to read this property, fix some issues in
MultiCheckPreference.

Change-Id: I10c8ff84a167fdb42f6c93500201b78b844cfb8b
ndroid_os_SystemProperties.cpp
c814c16b7f240d453978bf76ad0f63f9a8a2dcab 08-May-2012 Colin Cross <ccross@android.com> Don't call into power HAL if it isn't loaded.

The patch to call into libsuspend accidentally dropped the
test for sPowerModule == NULL. Put it back, and fix some
tabs too.

Change-Id: I1f934a41540f3b7be01d6399512482d87acceb94
ndroid_os_Power.cpp
92d7f9ff1c0c8a179ee935d86d3c94022980ead2 08-May-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #6408393 Character corruption is caused when locale is changed" into jb-dev
30ca5cd11a23f06f2f8eeaa587685450826f800f 08-May-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #6408393 Character corruption is caused when locale is changed

- free the TextLayoutCache on Locale change

- also free TextLayoutCache when memory is low

Change-Id: I39a37ac8ec3c292cfb1c0eea4bb41ff71897d089
ndroid/graphics/Canvas.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
faf5b16ae80b15d6c7bdb7ddaa508eaa19f8df2d 08-May-2012 Mathias Agopian <mathias@google.com> Merge "better error handling in SensorManager" into jb-dev
0b6d77bdeb99ca92709828c7c4867eec2f727f88 08-May-2012 Mathias Agopian <mathias@google.com> better error handling in SensorManager

Change-Id: Id0498e950f1407a10e3b2d88e63c2141ac95d103
ndroid_hardware_SensorManager.cpp
401d93f0dbc21673316ebccae2fdaaf84f5169cd 08-May-2012 Colin Cross <ccross@android.com> Merge "Use libsuspend to trigger suspend" into jb-dev
6162876067cbaa93b870aee6e62c682104935fde 26-Apr-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #6318791 Replace the Lohit Devanagari and Tamil with Droid versions

- take care of ttf filename changes and regular/bold versions

Change-Id: Ib71d2537df16ff954cef9619c12d611948d19efe
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
b3482ffbeee30650359e6ab8f3950a83e06963b4 07-May-2012 Marco Nelissen <marcone@google.com> Merge "Fix crash when decoding bitmap" into jb-dev
b2fe3be4fffc9ff1bfbba0c450d64ccd6e6c4011 07-May-2012 Marco Nelissen <marcone@google.com> Fix crash when decoding bitmap

Externally reported crash when decoding corrupted .wmf file.
b/5048623

Change-Id: I1df0861cd36983cb4d1460caa221c54d3fc240af
ndroid/graphics/BitmapFactory.cpp
b05b158b84b620e46d736dcaf038fa6268cbcb00 05-May-2012 Mathias Agopian <mathias@google.com> Merge "report a Sensor's version from the HAL" into jb-dev
277d1b2f49897e90a8ec9bd0f05ea4ed62d2ff28 05-May-2012 Mathias Agopian <mathias@google.com> report a Sensor's version from the HAL

Bug: 6447433
Change-Id: I0f46cb378de9bde20876608d5459689cc108c592
ndroid_hardware_SensorManager.cpp
cf4284bce11acadb1c36564b067bce3b0b26a9f9 05-May-2012 Fabrice Di Meglio <fdimeglio@google.com> Update Arabic font for SystemUI

- bug #5987379 Need an Arabic font with metrics "compatible" with Roboto
- use the Alt version with GSUB optimizations

Change-Id: I4d8c62cab37a7b010abab602c39899084d347fdc
ndroid/graphics/TextLayoutCache.cpp
e12c59491ea01417987216e2dc6a12e482982d60 04-May-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Use paint typeface for shaping when it supports the requested script." into jb-dev
e5c67bf7e14392feb54c26b7576b4d6c36b0068e 04-May-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Make Arabic script runs longer (for performance) - bug 6426451." into jb-dev
51d81f3c3e0ca2c04da68e93b7f4981843b74604 04-May-2012 Colin Cross <ccross@android.com> Use libsuspend to trigger suspend

Calling to libsuspend to trigger suspend instead of letting
the power hal do it.

Change-Id: I3cf51fea4d288f9fc19ce5aae39cdd581e8b44cb
ndroid.mk
ndroid_os_Power.cpp
1637dcd16cd314574a58602337a2c7222130b1b9 02-May-2012 Raph Levien <raph@google.com> Use paint typeface for shaping when it supports the requested script.

This is a hackish but workable fix for bug 6415796.

Change-Id: Iaba91e1e53e688a3ee05a1fdb68fd05102e369f2
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
0632b35b6828cd4324b3d218c2e38f895e819aad 02-May-2012 Jeff Brown <jeffbrown@google.com> Merge "Improve handling of built-in keyboard." into jb-dev
daa3753a04699724d2cfe824ac1f5a266d643a05 02-May-2012 Jeff Brown <jeffbrown@google.com> Improve handling of built-in keyboard.

The window manager policy made some incorrect assumptions about the
meaning of the Configuration.keyboard field. We need to be more
careful about distinguishing between built-in and external keyboards.

Most of this change is to move the determination of the parts of
the Configuration related to input devices into the WindowManagerService
leveraging new features of the InputManagerService to good effect.

Then we plumb through the flag that indicates whether a device
is internal or external so that we can be more particular about
how the lid switch effects changes to the Configuration.

Bug: 6424373
Change-Id: I36a1c22ade35e578955465a25940a33f227b9763
ndroid_view_InputDevice.cpp
b294435b5c6e0fee8c431ed3f6d77427d3d79dde 01-May-2012 Raph Levien <raph@google.com> Make Arabic script runs longer (for performance) - bug 6426451.

This change avoids selecting the incorrect font for drawing characters
when the first character in a run is a space.

Change-Id: Ibc672560d364b8de8c3e21de1c738c6dc5639395
ndroid/graphics/TextLayoutCache.cpp
6da9cf7782abefe0ba3f8c389136e06a265dfb74 01-May-2012 Jamie Gennis <jgennis@google.com> Merge "Surface: add JNI plumbing for setActiveRect." into jb-dev
b40696cc216f6a5874189fe83055ddaa7b428ce0 01-May-2012 Jamie Gennis <jgennis@google.com> Surface: add JNI plumbing for setActiveRect.

Bug: 6299171
Change-Id: If26e63ebe7def645626af251bed899ff9389f8e5
ndroid_view_Surface.cpp
76344241719384f160ee623554f66987d0fcae41 30-Apr-2012 Dianne Hackborn <hackbod@google.com> Fix scaling of layout bounds.

Change-Id: I9d8c8924900fed69030ee3e8d6decee89ca67820
ndroid/graphics/BitmapFactory.cpp
ffd6ea4523d8fa1210d2a7bb757cc65e1d18465f 28-Apr-2012 Jeff Brown <jeffbrown@google.com> Merge "Resample touch events on frame boundaries." into jb-dev
771526c88f5cc4b56a41cb12aa06a28d377a07d5 28-Apr-2012 Jeff Brown <jeffbrown@google.com> Resample touch events on frame boundaries.

Bug: 6375101
Change-Id: I8774e366306bb2b6b4e42b913525bf25b0380ec3
ndroid_app_NativeActivity.cpp
ndroid_view_InputEventReceiver.cpp
8f8d9fb52c65e50a32babf67ef764e173d2a5473 26-Apr-2012 Romain Guy <romainguy@google.com> Keep opaque bitmaps opaque after scaling
Bug #6293845

Change-Id: If9e82993f4c9702244ddedb5667421a6fcc7a0c5
ndroid/graphics/BitmapFactory.cpp
66556c730deba60288adf66ba1685a9d2c724aae 25-Apr-2012 Raph Levien <raph@google.com> Merge "Improve char mirroring in TextLayoutCache"
3632b7f3ef0c6158507724a2496b24b457f3f007 25-Apr-2012 Fabrice Di Meglio <fdimeglio@google.com> Improve char mirroring in TextLayoutCache

- now use ICU u_isMirrored() instead of a small hardcoded list of unicode points

see bug #5961254 Harfbuzz should be able to support Bidi_mirrored unicode attribute

Change-Id: I3243a58558a97930f0e7fdf5e9c1d5695d9393de
ndroid/graphics/TextLayoutCache.cpp
80193e7748a70a83ac7bd0915476eaf52240433f 25-Apr-2012 Mathias Agopian <mathias@google.com> Merge "add a (hidden) api on Surface to query if the consumer is running behind the producer"
8b97745c6a27723b1aa8aa54cf484f339d2a8d03 25-Apr-2012 Raph Levien <raph@google.com> Merge "Partial fix for bug 6132077 (incorrect line breaking of Arabic text)."
57e9723134e295c75a5aa0b20ca4764fc3959d25 25-Apr-2012 Raph Levien <raph@google.com> Partial fix for bug 6132077 (incorrect line breaking of Arabic text).

Fixed getTextRunAdvances so that advances are correctly aligned with
UTF-16 code point offices, rather than runs being reversed in RTL.

Change-Id: Ife59c0c26f745654c16656c86072e9102d8f6bc7
ndroid/graphics/TextLayoutCache.cpp
c14bacf1fb511472138eeb5dc84a9423fc003214 24-Apr-2012 Mathias Agopian <mathias@google.com> add a (hidden) api on Surface to query if the consumer is running behind the producer

Change-Id: I71ec1602f66a4850b130893fc7017b5b1ac1b647
ndroid_view_Surface.cpp
07b0465095bd9ab3412caefa4fcacbdc3825c64b 24-Apr-2012 Glenn Kasten <gkasten@google.com> Scheduling policy service

Change-Id: I6178b96896ffbb3323210f93784a65d724a3e694
ndroid_util_Process.cpp
ba6be8a62dcdb3ffd210cd36b9af4e3a658eac47 24-Apr-2012 Romain Guy <romainguy@google.com> Prevent WebView from crashing when detached from the window
Bug #6365056

WebView enqueues a functor in the hardware renderer to handle
animations and this functor is called at a later time by the
hardware renderer. However, the functor was not removed from
the queue when WebView was removed from the window. This could
cause the hardware renderer to attempt to execute an invalid
functor and lead to a crash.

Change-Id: I9d38e80f3fdc5e29d4d0cdfa1e893c251a954508
ndroid_view_GLES20Canvas.cpp
2427a4c49ec88638393d329b88162f1e709ba0e5 24-Apr-2012 Glenn Kasten <gkasten@google.com> Merge "Scheduling group cleanup"
f1b56449f58963e4f0473d5e26961f68c31759f4 16-Mar-2012 Glenn Kasten <gkasten@google.com> Scheduling group cleanup

The C++ API for scheduling groups is going away, so use the C API.

Renumber THREAD_GROUP_* constants to have the same values as SP_*.
They are @hide so this should be OK.

The old THREAD_GROUP_FG_BOOST constant is removed, and replaced by a
(private) THREAD_GROUP_FOREGROUND constant that is just a placeholder
to correspond to SP_FOREGROUND. It is not usable at this level.

Improved performance of android_os_Process_setProcessGroup:
avoid unnecessary syscall to getpriority for each tid.

Fixed error handling in android_os_Process_setThreadGroup.
It raises an exception if set_sched_policy() returns an error.

Add comments and fix typos in existing comments.

Change-Id: Ib922e92c945985c695ef0addbd2b83b8e82865f8
ndroid_util_Process.cpp
1271e2cc80b01d577e9db339459ef0222bb9320d 20-Apr-2012 Chet Haase <chet@google.com> Remove USE_DISPLAY_LIST_PROPERTIES flag

This flag was still hanging around pending any need to disable
DisplayList properties. But things seem stable, so it's time to clean up
and simplify the code.

At the same time, I reduced redundance in DisplayList dimensions. We
used to call drawDisplayList() with width/height parameters that were
used to do a clip reject. This is redundant with the DisplayList properties
that set the bounds of the DisplayList; the left/right and top/bottom properties
represent the same width/height properties formerly used in drawDisplayList().
The new approach is to not pass dimensions to drawDisplayList(), but to
instead pull those dimensions directly from the DisplayList when needed.

Change-Id: I8871beff03b1d4be95f7c6e079c31a71d31e0c56
ndroid_view_GLES20Canvas.cpp
e93cccb634b3f395ea99ada52dd6cd532b3e7723 22-Apr-2012 Eric Laurent <elaurent@google.com> Merge "Fix threading issues in AudioRecord JNI"
5bbd4b4f5fc19302fa017ad6afee6eb2d489d91a 21-Apr-2012 Jeff Brown <jeffbrown@google.com> Get alias for Bluetooth devices.

Bluetooth devices can be renamed by the user. Make the
input system aware of the user-specified name and transparently
pass it down to applications. This enables the keyboard
layout picker Settings UI to use device names that are
consistent with what the user set in the Bluetooth UI.

Bug: 6363157
Change-Id: I8eea26ce2c69c2a3f09c8de02e9e847610e0419c
ndroid_view_InputDevice.cpp
532bc1cb7da9fdbf34893fa48b2ae11f54cf6a8e 20-Apr-2012 Eric Laurent <elaurent@google.com> Fix threading issues in AudioRecord JNI

Made native AudioRecord ref based to allow use
of strong pointers in JNI and solve concurrency issues
between read() and release() in particular.

Applied the same fixes to AudioTrack JNI.

Issue 6254582.

Change-Id: I381a66cb00b6639f87f4fcd19a2e202d1a4e6704
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
330ec91e02406ba0d62e5672c6f0e2ed271f6898 20-Apr-2012 Jeff Brown <jeffbrown@google.com> Check whether db was really opened read/write.

Bug: 6176510
Change-Id: I7aeeb4340e55d554a57bb46c3c27ab37186f7e3a
ndroid_database_SQLiteConnection.cpp
1b965941713a395dc8003cf8ee29a40f92dd77aa 19-Apr-2012 Jeff Sharkey <jsharkey@android.com> Merge "Pipe DHCP vendor info towards framework."
7bc1b21a5217c3737ae82edd3ff2d901c69a51ad 18-Apr-2012 Wu-cheng Li <wuchengli@google.com> Remove new camera open API.

Applications are not resumed under the lock screen now.
This API is not needed anymore.

bug:5584464
Change-Id: I1c18efb5ba1ecd39320eb5fd252c6e1229d7b89c
ndroid_hardware_Camera.cpp
77b87ba0bc1c5de025976416b49e698ed9362814 19-Apr-2012 Jeff Sharkey <jsharkey@android.com> Pipe DHCP vendor info towards framework.

Bug: 6344821
Change-Id: Ifb9a93c995f4d70f4ae2aa03b7e21f13013ef3b6
ndroid_net_NetUtils.cpp
10536b657d306416dfec738c6538a1afcb7e078e 18-Apr-2012 Eric Laurent <elaurent@google.com> rename audio policy flags

Change-Id: Id273d1366ed2dc9ae9f38497414a68523bceae66
ndroid_media_AudioTrack.cpp
1645ee2473e6264d83122ed262e1f7485541c995 17-Apr-2012 Pannag Sanketi <psanketi@google.com> Merge "Making the setSurface non-static"
9704e78418a1ed9927ac2596a5c0084953dcb22b 17-Apr-2012 Jeff Brown <jeffbrown@google.com> Merge "Refactor SensorManager to move non-API bits into a subclass."
25157e458d6e10b027d1ba6b78b0487156c9f57a 16-Apr-2012 Jeff Brown <jeffbrown@google.com> Refactor SensorManager to move non-API bits into a subclass.

Changed the SensorManager class so that it only contains API-related
bits including what's needed to support legacy sensors. Mostly just
moved stuff around. Making the class abstract is safe because
it does not have a visible constructor in the API.

One minor change is that the cache of sensor type to sensor lists
is now per instance of SensorManager instead of being static.
We can fix this if desired.

Another small change is that we bail out early from registerListener
if the listener has already been registered for the particular
sensor. This happened for both legacy and standard listeners.
The problem is that the ListenerDelegate maintains two lists of
sensors, one is a Map and the other is a List. Adding a sensor
twice causes one entry to be added to the Map and two entries to be
added to the List, but when the sensor is removed the next time, only
one entry is removed from the List, leaving it in an inconsistent
state.

Removed Sensor.getLegacyType() since the value it provides is only
needed in LegacyListener and we don't really save any significant
computation by caching it. Removing the field makes support for
legacy sensors a little more self-contained.

Bug: 6339552
Change-Id: I50d41ac97cf535924f2bfa2026d28547a4d00286
ndroid_hardware_SensorManager.cpp
123328778e99b5bbc68b80ab8efc43ca506a6a2c 16-Apr-2012 Jeff Sharkey <jsharkey@android.com> Merge "Move TrafficStats iface counters to xt_qtaguid."
721bfaa63d14f0ac858d32431ab2eff582143b0f 14-Apr-2012 Jamie Gennis <jgennis@google.com> SurfaceTexture: fix updateTexImage JNI

Sigh...

Change-Id: I0271bed44c58e0c9a03eda4886eb2c1ee76e041f
ndroid/graphics/SurfaceTexture.cpp
dbed083ff07f4e6fa727ea22cdd7d758291630c1 14-Apr-2012 Jamie Gennis <jgennis@google.com> Merge "SurfaceTexture: update API docs"
a47425a13c19f95057df78b8bb65bb25657e8753 13-Apr-2012 Jeff Brown <jeffbrown@google.com> Add support for input devices that have vibrators.

Added a getVibrator() method to InputDevice which returns a Vibrator
associated with that input device. Its uses the same API as the
system vibrator which makes it easy for applications to be modified
to use one or the other.

Bug: 6334179
Change-Id: Ifc7f13dbcb778670f3f1c07ccc562334e6109d2e
ndroid_view_InputDevice.cpp
2b4bfa5efec7df408b4db127961cfc9aca9e57cf 13-Apr-2012 Jamie Gennis <jgennis@google.com> SurfaceTexture: update API docs

This change updates the SurfaceTexture API docs and modifies the behavior of
the updateTexImage to produce an IllegalStateException when not attached to a
GLES context.

Change-Id: I5a0875927785108960985c567d571d5f7033256a
ndroid/graphics/SurfaceTexture.cpp
497db8bfdab58c7e14ab3e2007bbe22250963246 13-Apr-2012 Pannag Sanketi <psanketi@google.com> Making the setSurface non-static

The setSurface method can be used to set a java Surface object from a
native Surface object. Making it non-static so that it can be accessed
from other units as well.

Change-Id: Id49b077ec0e7ad91cf10a4bd66938e238062408d
ndroid_view_Surface.cpp
882735972e9e7ee52a3116a3aba0440968b2da1a 13-Apr-2012 Jeff Brown <jeffbrown@google.com> Merge "Notify applications when input devices change."
af9e8d38184c6ba4d2d3eb5bde7014a66dd8a78b 13-Apr-2012 Jeff Brown <jeffbrown@google.com> Notify applications when input devices change.

This change allows the InputManager to keep track of what input
devices are registered with the system and when they change.
It needs to do this so that it can properly clear its cache of
input device properties (especially the key map!) when changes
occur.

Added new API so that applications can register listeners for
input device changes.

Fixed a minor bug in EventHub where it didn't handle EPOLLHUP
properly so it would spam the log about unsupposed epoll events
until inotify noticed that the device was gone and removed it.

Change-Id: I937d8c601f7185d4299038bce6a2934fe4fdd2b3
ndroid_view_InputDevice.cpp
d4fecc2567ca54427b9c86900bccbc7103ea8fde 13-Apr-2012 Irfan Sheriff <isheriff@google.com> Merge "Pre-association service discovery support"
21ba8153325e010224c6bc75a0acdc98b6ca82e8 05-Apr-2012 Irfan Sheriff <isheriff@google.com> Pre-association service discovery support

Add UPnp, Bonjour and vendor specific support for discovering services on
Wi-Fi direct before establishing a connection.

Change-Id: I1c1f3427180abdc80a4e682e713adc7f0326c5ef
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
ndroid_net_wifi_Wifi.cpp
62901af52a118c61579a81c84608c9f1118931a3 13-Apr-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Add Paint.setTextLocale()"
f98c8b32e87483adbfb739023ca9070559441138 13-Apr-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Add new Arabic font for SystemUI"
517825f1a9f14f92908bd7859b91b927c2eec6d9 07-Apr-2012 Fabrice Di Meglio <fdimeglio@google.com> Add Paint.setTextLocale()

- will be used for better shaping CJK and other goodies

Change-Id: If64945a337edd915f5ebb88f04b6fd18e92ca587
ndroid/graphics/Paint.cpp
276de3e1eb11d1eb93076dca5a69c791d3ef63d8 13-Apr-2012 Fabrice Di Meglio <fdimeglio@google.com> Add new Arabic font for SystemUI

- still work in progress
- bug #5987379

Change-Id: I0a7f7437c9061eab0abc9d5979c947eb5511992a
ndroid/graphics/TextLayoutCache.cpp
3f177d7c9a5c8ac727b0c6c3a5131e1e00ea52e8 13-Apr-2012 Elliott Hughes <enh@google.com> Bump the interpreter stack size for the main thread.

Bug: 6315322
Change-Id: I8d84e7c2e0eeb5314530b8a8b141f44014b8c646
ndroidRuntime.cpp
234766a36af6214644fa8205202287084ca9cf93 11-Apr-2012 Jeff Sharkey <jsharkey@android.com> Move TrafficStats iface counters to xt_qtaguid.

Use xt_qtaguid iface_stat_all counters, which are monotonic during
a single boot.

Track all ifaces associated with mobile networks since boot, and
move TrafficStats to using these ifaces. This will include usage of
networks omitted from config_data_usage_network_types, specifically
on devices that recycle network interfaces across APNs.

Split wildcard template matching, and move NetworkStatsService to
use mobile wildcard when logging stats.

Bug: 5324515
Change-Id: I2211c374c05d1b598cc647f2f873630538955ffe
ndroid_net_TrafficStats.cpp
3bdcdd8531781569d501e7023c22e25e2bae0dd1 11-Apr-2012 Jeff Brown <jeffbrown@google.com> Be more careful about exceptions in input callbacks.

consumeEvents() may be called reentrantly so we need to be
careful when handling exceptions. When called directly
through JNI, the exception should be allowed to bubble up
to the caller. When called from a Looper callback, the
exception should be recorded on the MessageQueue and bubbled
when the call to nativePollOnce() returns.

Bug: 6312938
Change-Id: Ief5e315802f586aa85af7eef1bd6e9bea4ce24ab
ndroid_view_InputEventReceiver.cpp
9f25b7fdf216c9ef0bd2322cd223eeaf0d60f77f 10-Apr-2012 Jeff Brown <jeffbrown@google.com> Request key maps from input manager service.

Instead of each application loading the KeyCharacterMap from
the file system, get them from the input manager service as
part of the InputDevice object.

Refactored InputManager to be a proper singleton instead of
having a bunch of static methods.

InputManager now maintains a cache of all InputDevice objects
that it has loaded. Currently we never invalidate the cache
which can cause InputDevice to return stale motion ranges if
the device is reconfigured. This will be fixed in a future change.

Added a fake InputDevice with ID -1 to represent the virtual keyboard.

Change-Id: If7a695839ad0972317a5aab89e9d1e42ace28eb7
ndroid.mk
ndroidRuntime.cpp
ndroid_view_InputDevice.cpp
ndroid_view_InputDevice.h
ndroid_view_KeyCharacterMap.cpp
ndroid_view_KeyCharacterMap.h
9d873d439f017a9a5c017d2c3109360448a98db6 10-Apr-2012 Jesse Hall <jessehall@google.com> Merge "Avoid waking EGL in getInitCount"
603b44589682db3ff33ade172facb0c5e309f1be 07-Apr-2012 Jeff Brown <jeffbrown@google.com> Ensure that apps crash if they throw exceptions.

Previously, if an app threw an uncaught exception in an input,
vsync or native activity callback, it would log the exception then
continue limping merrily along. In the case of input, it
could result in an ANR occurring because we had not drained
all of the pending input events and marked them as finished
(we only marked the most recent one finished).

Bug: 6304124
Change-Id: I87d76f7fd605e1a8af1237c66d8d62973080277e
ndroid_app_NativeActivity.cpp
ndroid_os_MessageQueue.cpp
ndroid_os_MessageQueue.h
ndroid_view_DisplayEventReceiver.cpp
ndroid_view_InputEventReceiver.cpp
9847f311f63301ca7d9553abcb0aec56b47cd60c 05-Apr-2012 Jesse Hall <jessehall@google.com> Avoid waking EGL in getInitCount

Change-Id: I5e0423b090c27fa4262e2a76ce4d232f8fbb8755
om_google_android_gles_jni_EGLImpl.cpp
c6d993077761fc737bbb0f4db44b961a4e7b6bbb 05-Apr-2012 Jamie Gennis <jgennis@google.com> SurfaceTexture: add GL context attach & detach

This change adds Java API support for detaching a SurfaceTexture from one GLES
context and then attaching it to a different one.

Change-Id: I8eed4b0d0e339c11598cb0408d9f4f2d99b3aa06
ndroid/graphics/SurfaceTexture.cpp
1da8f00a4cc3554b1501f60932e44b5ca56a5e7e 04-Apr-2012 Amith Yamasani <yamasani@google.com> Merge "Embed layout padding in nine patch images"
ec4a50428d5f26a22df3edaf7e5b08f41d5cb54b 04-Apr-2012 Amith Yamasani <yamasani@google.com> Embed layout padding in nine patch images

- Added a new custom PNG chunk that carries the layout padding ints.
- Extract the padding ticks from .9.png images and store in the chunk.
- Load the padding information at runtime into Bitmap and NinePatchDrawable.

- The new chunk is ordered first so that it doesn't cause a problem in older
versions of the platform.

Bug: 6087201

Change-Id: I5de46167a1d44b3ec21065b0c165e594b1dc8399
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/NinePatchPeeker.h
db8c9a6a4d9bf8c39f834b25611926caf21380f6 22-Mar-2012 Chet Haase <chet@google.com> Optimization of alpha with DisplayList properties

Some views (such as ImageView and TextView) handle non-opaque alpha
values directly. This was originally an optimization, but we can handle it faster
in many cases without this optimization when DisplayList properties are enabled.
Basically, if a view has non-overlapping rendering, we set the alpha value directly
on the renderer (the equivalent of setting it on the Paint object) and draw each
primitive with that alpha value. Doing it this way avoids re-creating DisplayLists
while getting the same speedup that onSetAlpha() used to get pre-DisplayList properties.

Change-Id: I0f7827f075d3b35093a882d4adbb300a1063c288
ndroid_view_GLES20DisplayList.cpp
b6a80077dca5a17f33350075485a534d7ed8fa2b 03-Apr-2012 Chris Craik <ccraik@google.com> Merge "Allow fine-grained control over functors execution"
9420abd56a2af7ddbeb70562b79d61b2dca8c5a1 30-Mar-2012 Chet Haase <chet@google.com> Re-enable DisplayList properties.

Re-enabling DisplayList properties last week caused some app
errors due to the way that some transforms were being handled (specifically,
those coming from the old Animations and ViewGroup's childStaticTransformation
field). This change pushes *all* transform/alpha data from View.draw() into
the view's DisplayList, making DisplayLists more encapsulated (and correct).

Change-Id: Ia702c6aae050784bb3ed505aa87553113f8a1938
ndroid_view_GLES20DisplayList.cpp
8f3b8e32993d190a26c70c839a63d8ce4c3b16d9 28-Mar-2012 Romain Guy <romainguy@google.com> Allow fine-grained control over functors execution

Adds non-drawing execution mode

Change-Id: I82f92cf1b9a3b9ff2ca6d7427c4e02b73e04e6bf
ndroid_view_GLES20Canvas.cpp
3e09cc98f48a5a3f56f6794415ffe5a15f47381a 02-Apr-2012 Jeff Brown <jeffbrown@google.com> Merge "Info logs should be loggable by default."
d56feb91b4b1ac9cd0e9b37dfa20d137825fbbfd 02-Apr-2012 Jeff Brown <jeffbrown@google.com> Info logs should be loggable by default.

Bug: 6265031
Change-Id: I6f10818c1d28fa71f434d4b372c764d04967d213
ndroid_util_Log.cpp
6db53c34a7fe8fdc2a8775dc5a400776e2716d38 02-Apr-2012 Romain Guy <romainguy@google.com> Fix builds without USE_OPENGL_RENDERER

Change-Id: I84b8dfb57dcc7de700d481774efded88e51d361a
ndroid_view_HardwareRenderer.cpp
3d275af3c3996f80816142628c380f79a9606c51 31-Mar-2012 Eric Laurent <elaurent@google.com> Merge "implemented synchronous audio capture"
7687882800f49e3fc3a14f1d7540412f77d6bd4d 30-Mar-2012 Romain Guy <romainguy@google.com> Detect surface resizes

HardwareRenderer normally relies on the window manager to be notified of
surface dimension changes. It is however possible to execute a drawing pass
before receiving the window manager notification. We must therefore compare
the actual size of the target surface to the window size and perform a full
redraw when they are not the same.

Change-Id: Idccc8592f3f777edee1ef67a98a4c2a825dcfba7
ndroid_view_HardwareRenderer.cpp
c07fca3831baf4d812dd724f506b4ed23dcc39e0 13-Jan-2012 Stephen Smalley <sds@tycho.nsa.gov> Add JNI bindings for some of the libselinux interfaces.

Change-Id: Ifcc68cb06f9f56a04f3bc64dd9906a9436fabc88
ndroid.mk
ndroidRuntime.cpp
ndroid_os_SELinux.cpp
505e5c8859f596ed58489be565d6e029314b2ac8 30-Mar-2012 Eric Laurent <elaurent@google.com> implemented synchronous audio capture

Added the infrastructure to support the synchronization of playback and
capture actions on specific events.
The first requirement for this feature is to synchronize the audio capture
start with the full rendering of a given audio content.
The applications can further be extended to other use cases
(synchronized playback start...) by adding new synchronization events and
new synchronous control methods on player or recorders.

Also added a method to query the audio session from a ToneGenerator.

Change-Id: I4e47f5108c7cbbd3bd334a7fad9b3b6c5ba55d88
ndroid_media_AudioRecord.cpp
ndroid_media_ToneGenerator.cpp
58a40a3e92f8a53ac1068f0839dec4a1707fa6fb 30-Mar-2012 Jeff Brown <jeffbrown@google.com> Merge "Refactor DisplayEventReceiver read loop."
bec0a8682c75a40df6d0dca17e23db2103a950f3 29-Mar-2012 Jeff Brown <jeffbrown@google.com> Refactor DisplayEventReceiver read loop.

Change-Id: I98ef802ec0ca48f768e3b0920e1b4b4f7f141050
ndroid_view_DisplayEventReceiver.cpp
001dd0cb784eedf18252f3d0d1c5b57bcc4d7b1c 29-Mar-2012 Romain Guy <romainguy@google.com> Merge "Refactor GLES20Canvas/HardwareRenderer JNI layers"
244ada1d35419b7be9de0fc833bb03955b725ffa 29-Mar-2012 Romain Guy <romainguy@google.com> Refactor GLES20Canvas/HardwareRenderer JNI layers

GLES20Canvas defined several JNI functions used only by HardwareRenderer.
Now that we have a JNI layer dedicated to HardwareRenderer we should
host the renderer related methods there.

Change-Id: I0bcb4ad0bcc1c4a37290df10c1685f2cfe5504ca
ndroid_view_GLES20Canvas.cpp
ndroid_view_HardwareRenderer.cpp
b2a331eae94add78654bfed094066344f73ae757 29-Mar-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #6248364 Tamil and Denavagari text crash in Google+"
43e4985abfcb69db8fb39a95794eb34a2f142214 29-Mar-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #6248364 Tamil and Denavagari text crash in Google+

- fix initialization of variables

Change-Id: Ibda4e1e6f55f867385eaf9a4c7a754c16815bbf0
ndroid/graphics/TextLayoutCache.cpp
ba4d0433319393d626d2169683209e4956a087e2 28-Mar-2012 James Dong <jdong@google.com> frameworks base Android.mk file changes

Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
ndroid.mk
d927a1d99630c05ff773f0e9e8791ca9a965e020 28-Mar-2012 James Dong <jdong@google.com> Deleted the media, camera, drm related files since they are relocated

Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
ctivityManager.cpp
ndroid.mk
6554943a1dd6854c0f4976900956e556767b49e1 27-Mar-2012 Romain Guy <romainguy@google.com> Use a status_t return type for GL functors

WebView needs more fine-grained control over the behavior of the
framework upon execution of the display lists. The new status_t
allows WebView to requests its functor to be re-executed directly
without causing a redraw of the entire hierarchy.

Change-Id: I97a8141dc5c6eeb6805b6024cc1e76fce07d24cc
ndroid_view_GLES20Canvas.cpp
a982dc05d7ca919c07f50e446549ef9dceadf6bd 23-Mar-2012 Colin Cross <ccross@android.com> frameworks/base: move Zip* from libandroidfw to libutils

ZipUtils is needed by build/tools, move it from libandroidfw
(frameworks/base) to libutils (frameworks/native).

Change-Id: I2b4b7adcdf68eb25ee7cba5dd3b69eadf0523af3
om_android_internal_content_NativeLibraryHelper.cpp
00843227504528584596da305e6587450c0c5223 20-Mar-2012 Romain Guy <romainguy@google.com> Merge "Pre-scale bitmaps on the native heap"
7b2f8b8fb7064a1d3b6d942b978c30c24c9d7299 20-Mar-2012 Romain Guy <romainguy@google.com> Pre-scale bitmaps on the native heap

Change-Id: I9819b532b89a997ab775b31ffee46445f1d16e20
ndroid/graphics/BitmapFactory.cpp
ae75f994cc50837afe79d3bfbc576811e3602fef 16-Mar-2012 Glenn Kasten <gkasten@google.com> Add libmedia_native

Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
ndroid.mk
543ec1c808e0064371cdf491bb8ff1e08134ed93 16-Mar-2012 Jeff Brown <jeffbrown@google.com> Merge "If an application calls System.exit() terminate it immediately."
c1ac23db267c0acddfeed3204c2737d110ca0ab9 16-Mar-2012 Jeff Brown <jeffbrown@google.com> Merge "Delete useless JNI methods."
8d3c318b2d6690a156cc22ef6599a73bee7ed482 16-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add a new camera open API that allows taking the ownership."
4280c4a93ea17f2e9d3f651e49d8c13dc3fb92aa 16-Mar-2012 Jeff Brown <jeffbrown@google.com> If an application calls System.exit() terminate it immediately.

There is no graceful way to kill Android application processes.
They typically have many threads running doing various things
When System.exit() is called, those threads just keep going
while the cleanup actions run until the process finally.

Performing shutdown actions can easily cause more harm than good.
For example, closing the Binder driver's file descriptor may
cause other threads waiting on Binder to wake up and then crash
in nasty ways after receiving EBADF.

So when an Android application exits, skip the cleanup and just
call _exit() to end it all.

Bug: 6168809
Change-Id: I29790c064426a0bf7dae7cdf444eea3eef1d5275
ndroidRuntime.cpp
caf813fe1ec10dda75cd752cb3ff80872ae7ac0b 16-Mar-2012 Romain Guy <romainguy@google.com> Remove unused private API

Change-Id: Iec9c2bc275fc7376f4e0b0b9c44059c56a9dd173
ndroid/graphics/BitmapFactory.cpp
16f5f5cc9d4c480fac3dc7f176f3f1edfbd256f4 16-Mar-2012 Jeff Brown <jeffbrown@google.com> Delete useless JNI methods.

Change-Id: Ie7c7638c79fc9c6a43f45604ad9a40ebc58b93c7
ndroidRuntime.cpp
c0102b7a7daa4f32f8775b243448d2ea2fd21096 16-Mar-2012 Jeff Brown <jeffbrown@google.com> Merge "Port the SQLite locale setting code to Java."
1d9f742e001ed8280fa93fd9ba0b1125ce6d00ae 15-Mar-2012 Jeff Brown <jeffbrown@google.com> Port the SQLite locale setting code to Java.

Make the database opening code more robust in the case of
read-only database connections.

Check whether a PRAGMA needs to be issues before doing it.
Mostly it's harmless but it can grab a transaction on the
database unnecessarily.

Change-Id: Iab2cdc96c785e767f82966b00597e19337163f2f
ndroid_database_SQLiteConnection.cpp
5461f5e8b9c9c012467c2f19651c73da51028f64 15-Mar-2012 Kenny Root <kroot@google.com> Merge "Add support for EINTR in BT"
a0db022419319d0b2933ff63e7ca6c59b3ed21df 15-Mar-2012 Kenny Root <kroot@google.com> Add support for EINTR in BT

During normal operation, it's common on a multi-core device to get
EINTR. This is especially noticable during a bugreport where several
services get EINTR even though it's not fatal.

This change adds TEMP_FAILURE_RETRY around the system calls that can
receive EINTR where a retry should happen.

Change-Id: If13d24f57c587392f57961fe2caf46e2a6fa843e
ndroid_bluetooth_BluetoothAudioGateway.cpp
a1c41e13b521cdd611a8fc46e43b5ae0a2c00238 24-Feb-2012 Wu-cheng Li <wuchengli@google.com> Add a new camera open API that allows taking the ownership.

The purpose is to let face unlock always get the camera
successfully. What happened was the camera applications may
have opened the camera in onResume under the lock screen.
This API lets face unlock take the camera from the camera
application. A new permission will be added, so other
applicatoins won't be able to take the camera from the face
unlock.

bug:5584464

Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
ndroid_hardware_Camera.cpp
6940484150b9ef96c93ddfb4b2dfedcaa373cb34 14-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Use correct syntax for #include <> """
c81d31c3f801ba3d559a22c27b926ace38a7ab49 13-Mar-2012 Glenn Kasten <gkasten@google.com> Use correct syntax for #include <> ""

Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_ToneGenerator.cpp
9dc348d75688faba645c03ecd6e72de7cecc87ba 13-Mar-2012 Jeff Brown <jeffbrown@google.com> Merge "Fix spurious ANRs in native activities."
2b6c32ca4177f1a97307f9cbd81ca485df28762c 13-Mar-2012 Jeff Brown <jeffbrown@google.com> Fix spurious ANRs in native activities.

Some native activities experienced ANRs when the input consumer
deferred an input event due to client-side batching. If the
input channel was fully emptied then the client had no way of
knowing that it should wake up to handle the deferred input event.

This patch also fixes some lock issues in the native activity
input queue implementation. In at least one error case, it
was possible for a function to exit without releasing the lock.

Bug: 6051176
Change-Id: I4d9d843237e69b9834f8d8b360031b677fcab8c3
ndroid_app_NativeActivity.cpp
2e76c992bfa955cb637417005941e3e93810a99d 23-Feb-2012 Daniel Lam <dalam@google.com> SurfaceTexture: Fully refactored from BufferQueue

Cleaning up camera and media interactions as part of SurfaceTexture refactoring

Change-Id: Iea2b10ff80b5f01f83ed0902c725df1d3b4c541a
ndroid_hardware_Camera.cpp
ndroid_view_Surface.cpp
18db49a46259020387c40fff36d92edc1087a366 13-Mar-2012 Glenn Kasten <gkasten@google.com> Whitespace and indentation

Fix indentation to be multiple of 4.
Make it easier to search:
sp< not sp < to
"switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.

Use git diff -b or -w to verify.

Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
b48e0291078e3a7052513572cfb2b19318f6c08c 13-Mar-2012 Siva Velusamy <vsiva@google.com> Merge "Expose a function to set OpenGL Trace level."
a1cff5043d0fbd78fcf9c48e7658e56a5b0c2de3 21-Feb-2012 Chet Haase <chet@google.com> Handle view properties at the native level

Basic functionality of handling View properties (transforms,
left/right/top/bottom, and alpha) at the native DisplayList level.
This logic is disabled for now (via compile-time flags in View.java and
DisplayListRenderer.h) as we continue work on it (there is no advantage
to the new approach until we optimize invalidation and rendering paths
to use the new code path).

Change-Id: I370c8d21fbd291be415f55515ab8dced6f6d51a3
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/Camera.cpp
ndroid_view_GLES20DisplayList.cpp
a8c67eb904b7b78856ef58ef6a4ec10e6dccccb2 12-Mar-2012 Jeff Brown <jeffbrown@google.com> Merge "Add Java wrappers for new atrace functionality."
481c1570dc5cdf58265b53f657801709dd05d1df 09-Mar-2012 Jeff Brown <jeffbrown@google.com> Add Java wrappers for new atrace functionality.

Instrument a few parts of the input dispatcher and the
view hierarchy.

Change-Id: I49285c9fb3502253baa1ffed60f521b8c24fccaf
ndroid.mk
ndroidRuntime.cpp
ndroid_os_Trace.cpp
28b269f3418c27275bbf635e524ed501bfac6518 07-Mar-2012 Glenn Kasten <gkasten@google.com> Use audio_policy_output_flags_t consistently

This affects:
- IAudioFlinger::openOutput
- AudioTrack::AudioTrack
- AudioTrack::set
- apps that call these

Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
ndroid_media_AudioTrack.cpp
64d10a1da0a702ffeb086ad9c4a632f2712f1dad 09-Mar-2012 Siva Velusamy <vsiva@google.com> Expose a function to set OpenGL Trace level.

This patch adds a function setGlDebugLevel() to libEGL, and
exposes it to the Java layer at android.opengl.GLUtils.enableTracing().

Change-Id: Ia5abb130bc32fcfe3ab25b0a0a5283a54c54f357
ndroid/opengl/util.cpp
df0d3ab4d03d8738a606b35bf9673950844aef4a 10-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Use AudioRecord::record_flags consistently"
047238ced42eea812de9d39a9f32e94d002bfa5c 08-Mar-2012 Jeff Sharkey <jsharkey@android.com> Switch Parcel to static JNI calls, pass pointer.

Instead of using parcelForJavaObject(), pass down the mNativeObj
pointer explicitly. Benchmarks show that writeInt() is roughly 3x
faster with this approach.

Change-Id: I24ca235c334c44be716070aa8066ec8a429eadb7
ndroid_os_Parcel.cpp
ndroid_view_Surface.cpp
f60a5d7162e22b565e5977b5f4032b9334618269 07-Mar-2012 Glenn Kasten <gkasten@google.com> Use AudioRecord::record_flags consistently

Change-Id: I6f369a2b99eb515603bc7d5629a07db2b96783fe
ndroid_media_AudioRecord.cpp
d84e1ce0b535128f03416145554fb405f9fade3e 07-Mar-2012 Jeff Sharkey <jsharkey@android.com> Split Parcel JNI details away from Binder.

This is purely a refactoring, with no change to the underlying
functionality.

Change-Id: I41b59f14e57d1cc144274a01f77658d99a1bfe02
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Region.cpp
ndroid_database_CursorWindow.cpp
ndroid_os_Parcel.cpp
ndroid_os_Parcel.h
ndroid_util_Binder.cpp
ndroid_util_Binder.h
ndroid_view_InputChannel.cpp
ndroid_view_MotionEvent.cpp
08965ec67ada98f63f8ac879cc44c8b0e7ff046d 06-Mar-2012 Mathias Agopian <mathias@google.com> fixup hardcoded include paths for new project

Change-Id: Id443ec5c99bb4d7653905f1be1f72a029e0cf087
ndroid.mk
66199cf939efbffb9154df89f85d0d30c8d3ec55 06-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Remove obsolete references to sched_policy.h"
403475a894de8b898c1e0bafdeae2e2f7dd19951 06-Mar-2012 Glenn Kasten <gkasten@google.com> Remove obsolete references to sched_policy.h

As part of scheduling policy cleanup, remove or isolate
all references to the scheduling policy APIs.

Change-Id: Ia1ea2fe711a399039f25217309e061267744b856
ndroid_util_Process.cpp
f51abc7dc5b9eb34c43f7c1efee86ed6f1bdabe0 05-Mar-2012 Romain Guy <romainguy@google.com> Merge "Delete display list objects and resources on the UI thread Bug #6073717 Bug #6065504 Bug #6026515 Bug #5971725"
bb0acdf9e1d862a7cf0e2533321fc1105c29b5e3 05-Mar-2012 Romain Guy <romainguy@google.com> Delete display list objects and resources on the UI thread
Bug #6073717
Bug #6065504
Bug #6026515
Bug #5971725

Prior to this patch, the destructor of DisplayList would always run
on the finalizer thread. This could cause a race condition if the UI
thread was busy rendering display lists at the same time leading to
various random native crashes.

Change-Id: Ie11108e3b1538d4b358a1a8b4cce1b2d33152d0c
ndroid_view_GLES20Canvas.cpp
ef6f68b8c825e4dd150926da61401a103d88f0e9 05-Mar-2012 Jeff Brown <jeffbrown@google.com> Merge "Don't log SQLITE_SCHEMA errors."
08cbdad565b3d2a01b005ceea5667f261ba89353 05-Mar-2012 Jeff Brown <jeffbrown@google.com> Don't log SQLITE_SCHEMA errors.

These errors are usually transient. SQLite automatically retries
queries up to 5 times before actually reporting an error to the
application. We expect SQLITE_SCHEMA errors to occur occasionally
due to the prepared statement cache, and it is ok.

If SQLite fails to automatically resolve a schema error, then
a SQLiteException will be thrown as usual.

Bug: 6114391
Change-Id: I0cdafa1a1db5c567b95bec0c41310802fe75a8c7
ndroid_database_SQLiteGlobal.cpp
2bf68f063b0077ddef6ebfe54f2ae5e063c2c229 02-Mar-2012 Romain Guy <romainguy@google.com> Deferred layer updates

Change-Id: I83d9e564fe274db658dcee9e0cc5bbf9223ebb49
ndroid_view_GLES20Canvas.cpp
5936ff097eff2c736af2e43fd4a8f7db0ddcfb5a 01-Mar-2012 Jeff Brown <jeffbrown@google.com> Externalize more SQLite configuration options.

Moved more configuration into config.xml so we can tweak settings
like the default journal mode, WAL auto-checkpoint interval and
so on.

This change itself should not introduce any functional differences.

Change-Id: Id6c95fa25b116ce47e8ae49cd8a80d52b1c0dd80
ndroid_database_SQLiteConnection.cpp
0e689abaec67ad5f0c485ca8387d843bf55ab10f 01-Mar-2012 Jeff Brown <jeffbrown@google.com> Merge "Don't throw if sqlite3_finalize returns an error."
958cbbab6a35e1668419a2f7e2a2b75b9c8db807 01-Mar-2012 Jeff Brown <jeffbrown@google.com> Don't throw if sqlite3_finalize returns an error.

Change-Id: Ibcc772ad5343dd241ed9dc492e4d838e1ab962d4
ndroid_database_SQLiteConnection.cpp
ff40ab7a418dd06cfe4758ceda17a775f2d4c776 28-Feb-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5180841 TextLayoutCache needs to support Indic

- add Tamil and Devanagari shaping support

Change-Id: I331ec52cd1987e157100deb699db27f855881c32
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
49d2b1864c3dfec6faff74d67cb2527a8f1af5a8 28-Feb-2012 Mathias Agopian <mathias@google.com> move CursorWindow from libbinder to libandroidfw

Change-Id: I3b304e4f74e0d0ec8b20c57296c62449c9a0f792
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteConnection.cpp
8335f1ccccedb6655d96d9d5b697a7f0938235dd 26-Feb-2012 Mathias Agopian <mathias@google.com> fix libgui header location

Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
ndroid_app_NativeActivity.cpp
ndroid_hardware_Camera.cpp
ndroid_view_Display.cpp
ndroid_view_Surface.cpp
om_google_android_gles_jni_EGLImpl.cpp
018549e4bf60bb9c7e2b1bce8edae727122dc57f 25-Feb-2012 Mathias Agopian <mathias@google.com> Merge "remove dependency on android_native{s_priv|buffer}.h"
af01feafc30152baf8e0a5cfddbf02bd14731fd2 25-Feb-2012 Mathias Agopian <mathias@google.com> remove dependency on android_native{s_priv|buffer}.h

Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
ndroid_app_NativeActivity.cpp
om_google_android_gles_jni_EGLImpl.cpp
325740fb444af8fc7fb0119b2e30ce322c2ae134 25-Feb-2012 Romain Guy <romainguy@google.com> Add hooks to implement Canvas.drawTextOnPath() in GL

Change-Id: I165c9e05facf5365aa6850605688e538640c7fcc
ndroid/graphics/TextLayout.cpp
ndroid_view_GLES20Canvas.cpp
83c64e6b624a876436d2ef5d2f173b10407e27b4 21-Feb-2012 Mathias Agopian <mathias@google.com> frameworks/base refactoring

create the new libandroidfw from parts of libui and libutils

Change-Id: I1584995616fff5d527a2aba63921b682a6194d58
ndroid.mk
94d0024557f415b8463f085c9784a3e1d02b58c6 12-Jan-2012 Todd Poynor <toddpoynor@google.com> Power HAL PowerManagerService hookup

Use PowerHAL to set system awake/suspend state.

Change-Id: If58a6f548564ea141b68f304455997d9ff04eace
Signed-off-by: Todd Poynor <toddpoynor@google.com>
ndroid_os_Power.cpp
b13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4 18-Feb-2012 Mathias Agopian <mathias@google.com> frameworks/base refactoring.

step 2: move libutils headers to their new home: androidfw

Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/NinePatchPeeker.h
ndroid/graphics/Typeface.cpp
ndroid/graphics/Utils.h
ndroid_app_backup_FullBackup.cpp
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_FileBackupHelperBase.cpp
ndroid_content_res_ObbScanner.cpp
ndroid_util_AssetManager.cpp
ndroid_util_StringBlock.cpp
ndroid_util_XmlBlock.cpp
ndroid_view_GLES20Canvas.cpp
om_android_internal_content_NativeLibraryHelper.cpp
4a7571bc0bd6d675d6964595407f0c184c51d9ac 18-Feb-2012 Jeff Brown <jeffbrown@google.com> Merge "frameworks/base refactoring."
b93a03f841d93498bfea6cc92a22faa34bce1337 18-Feb-2012 Mathias Agopian <mathias@google.com> frameworks/base refactoring.

First step. Move libui includes to their new home: androidfw.

Change-Id: Ic042b52fdba72f30edc3cc6339bf30b4c1b99662
ndroid_app_NativeActivity.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_c.c
ndroid_view_InputChannel.cpp
ndroid_view_InputChannel.h
ndroid_view_InputEventReceiver.cpp
ndroid_view_KeyCharacterMap.cpp
ndroid_view_KeyEvent.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_VelocityTracker.cpp
6917e6550d2dc11ad3b794be08cc9caa53970d32 18-Feb-2012 Romain Guy <romainguy@google.com> Merge "Record possible clip rejects when recording display lists"
8d25cb8a640cfe22809bc6afa493a48adc49c4ad 17-Feb-2012 Iliyan Malchev <malchev@google.com> bluetooth: replace malloc() + memset() to zero with calloc()

Change-Id: I86b0ee4babc79189184b09c51757ec1162517c7b
Signed-off-by: Iliyan Malchev <malchev@google.com>
ndroid_server_BluetoothEventLoop.cpp
33f6beb10f98e8ba96250e284876d607055d278d 17-Feb-2012 Romain Guy <romainguy@google.com> Record possible clip rejects when recording display lists

This optimization allows us to quickly skip operations that lie
entirely outside of the known bounds of a display list. Because
of ViewGroup.setClipChildren, we must keep the operations recorded
in the display list. setClipChildren(false) is however a very
uncommon operation and we will therefore often benefit from this
new optimization.

Change-Id: I0942c864e55298e6dccd9977d15adefbce3ba3ad
ndroid_view_GLES20Canvas.cpp
9806a2307f3e47e847ad5e62e302eab36d3eb3e4 17-Feb-2012 Jeff Brown <jeffbrown@google.com> Ignore broken input channel when finishing input event.

There are occasional races during application shut down where the
input dispatcher will close an input channel before the application
has finished its last event. So just ignore EPIPE.

Also tweak the logging for failed input event injection to make
it clearer which pid was trying to perform the injection.

Bug: 6013004
Change-Id: I7bbb01441d41762b03eafd4d39dcf0323e1cadf3
ndroid_view_InputEventReceiver.cpp
b503f1eea1b2ab699e3325450a08f3f62aa0c403 17-Feb-2012 Jeff Brown <jeffbrown@google.com> Don't throw on EPIPE in consumeBatchedInputEvents.

Bug: 6014825
Change-Id: I59bd98a1fba5d86f9793fd6e9d9f0a271ac1c789
ndroid_view_InputEventReceiver.cpp
91ec0b722f659bb5e4bcc64339f2fbbe30a31287 15-Feb-2012 Jeff Brown <jeffbrown@google.com> Merge "Clean up InputChannel file descriptor data type."
91e328984c0d1e0f95b3d37f779d9d4fa9bfe8f8 15-Feb-2012 Jeff Brown <jeffbrown@google.com> Clean up InputChannel file descriptor data type.

File descriptors are ints.

Change-Id: Ie36733bf36ddfeaa9a09ef6ebd7bd2f1788f5d27
ndroid_view_InputChannel.cpp
ndroid_view_InputEventReceiver.cpp
870084d26d72a9a58c665349dde3ce511dd28466 15-Feb-2012 Irfan Sheriff <isheriff@google.com> Merge "Initial support for concurrency"
b3db213eb55acb661e4b9ea40bcc00af4b76fab9 19-Jan-2012 Glenn Kasten <gkasten@google.com> Update comments

We no longer put the filename at start of file.

Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_ToneGenerator.cpp
a9daa164a58fc70d08702787e69a56212f5ad8c9 14-Feb-2012 Jeff Brown <jeffbrown@google.com> Merge "Fix possible races in vsync infrastructure."
58aedbc9bea13415e2d42cf7c9fe8a7efd243e66 14-Feb-2012 Jeff Brown <jeffbrown@google.com> Fix possible races in vsync infrastructure.

Applications sometimes crashed on exit due to the display event
receiver pipe apparently being closed while still a member of the
Looper's epoll fd set.

This patch fixes a few different possible races related to
the display event receiver lifecycle.

1. The receiver used to play a little dance with the Looper,
registering and unregistering its callback after each vsync
request. This code was a holdover from a time before the
surface flinger supported one-shot vsync requests, so we can
get rid of it and make things a lot simpler.

2. When the Choreographer is being accessed from outside the UI
thread, it needs to take great care that it does not touch
the display event receiver. Bad things could happen if the receiver
is handling a vsync event on the Looper and the receiver is
disposed concurrently.

3. It was possible for the Choreographer to attempt to dispose
the receiver while handling a vsync message. Now we defer disposing
the receiver for a little while, which is also nice because we
may be able to avoid disposing the receiver altogether if we find
that we need it again a little while later.

Bug: 5974105
Change-Id: I77a158f51b0b689af34d07aee4245b969e6260d6
ndroid_view_DisplayEventReceiver.cpp
b35b9a8642365921a185eab5e8d4716f247fed85 14-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 6466f400: am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"

* commit '6466f400a40224dc113eb6d06009a1c655151045':
Fix incorrect prototype for JNI call
eaf2617fc20dd6484722edc9df41faf6e91d73cc 14-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 472512f6: Merge "Fix incorrect prototype for JNI call"

* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
Fix incorrect prototype for JNI call
472512f6970fa170e2e1a3e1c24ac2b742e2e6b6 13-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fix incorrect prototype for JNI call"
072ec96a4900d4616574733646ee46311cb5d2cb 07-Feb-2012 Jeff Brown <jeffbrown@google.com> Implement batching of input events on the consumer side.

To support this feature, the input dispatcher now allows input
events to be acknowledged out-of-order. As a result, the
consumer can choose to defer handling an input event from one
device (because it is building a big batch) while continuing
to handle input events from other devices.

The InputEventReceiver now sends a notification when a batch
is pending. The ViewRoot handles this notification by scheduling
a draw on the next sync. When the draw happens, the InputEventReceiver
is instructed to consume all pending batched input events, the
input event queue is fully processed (as much as possible),
and then the ViewRoot performs traversals as usual.

With these changes in place, the input dispatch latency is
consistently less than one frame as long as the application itself
isn't stalled. Input events are delivered to the application
as soon as possible and are handled as soon as possible. In practice,
it is no longer possible for an application to build up a huge
backlog of touch events.

This is part of a series of changes to improve input system pipelining.

Bug: 5963420

Change-Id: I42c01117eca78f12d66d49a736c1c122346ccd1d
ndroid_app_NativeActivity.cpp
ndroid_view_InputEventReceiver.cpp
cbee6d6ede0499fb4a2c00bfc00d5db8d9ed5139 04-Feb-2012 Jeff Brown <jeffbrown@google.com> Rewrite input transport using sockets.

Since we will not longer be modifying events in place, we don't need
to use an ashmem region for input. Simplified the code to instead
use a socket of type SOCK_SEQPACKET.

This is part of a series of changes to improve input system pipelining.

Bug: 5963420

Change-Id: I05909075ed8b61b93900913e44c6db84857340d8
ndroid_app_NativeActivity.cpp
ndroid_view_InputChannel.cpp
ndroid_view_InputEventReceiver.cpp
f0451db4224e2b6360efa39cd65c88cd391f14e0 10-Feb-2012 Amith Yamasani <yamasani@google.com> Merge "Multi-user - wallpaper service"
37ce3a8af6faab675319d0803b288ab1dddc76be 06-Feb-2012 Amith Yamasani <yamasani@google.com> Multi-user - wallpaper service

- Allow each user to have their own wallpaper (live or static).
- Migrate old wallpaper on upgrade.
- Update SystemBackupAgent to backup/restore from primary user's
new wallpaper directory.

Reduce dependency on Binder.getOrigCallingUser() by passing the
userId for bindService.

Change-Id: I19c8c3296d3d2efa7f28f951d4b84407489e2166
ndroid_backup_BackupDataOutput.cpp
1137be1a686fdfc9f02c3aca7c33f28006df4742 09-Feb-2012 Glenn Kasten <gkasten@google.com> Follow raw pointer and sp<> conventions

Unconditional delete for raw pointers.
Use "if (sp != 0)" not "if (sp.get() != 0)" or "if (sp != NULL)".
Use "if (raw != NULL)" not "if (raw)".

Change-Id: I531a8da7c37149261ed2f34b862ec4896a4b785b
ndroid_media_ToneGenerator.cpp
5dd4754f58e5e99f893749ab3bb3eda1de4cfbe7 10-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "No newline or space at end of ALOG format string"
3a74bd36f8af1a12353db8ddbc5227d33c2ce680 12-Aug-2011 Mike Lockwood <lockwood@android.com> Add headless mode for running the framework without the surface flinger

Enabled by setting system property ro.config.headless to 1
This will allow the framework to run without starting activities,
system UI and the keyguard.
Framework can still run services, content providers and broadcast receivers.

Signed-off-by: Mike Lockwood <lockwood@android.com>

Conflicts:

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
services/java/com/android/server/PowerManagerService.java
services/java/com/android/server/am/ActivityManagerService.java
ndroid_view_Display.cpp
d3622e9e490191670d3dc7fa52b60e1efd575011 14-Oct-2011 Girts Folkmanis <girts@google.com> Disable output processing when opening serial port.

If post processing is not disabled, we end up translating LF to CRLF, which
makes binary protocols sad.
ndroid_hardware_SerialPort.cpp
7dbc4b457d2c2c6dd39fa445e7edd8109796f0a2 23-Sep-2011 Mike Lockwood <lockwood@android.com> Add SerialPort.sendBreak()

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_hardware_SerialPort.cpp
b01e8bf57b7492b77e3445db51471edcbadda75e 30-Aug-2011 Mike Lockwood <lockwood@android.com> New Serial Manager API:

SerialManager: provides access to serial ports
SerialPort: for reading and writing data to and from serial ports

IO with both array based and direct ByteBuffers is supported.

Accessing serial ports requires android.permission.SERIAL_PORT permission

Each platform must configure list of supported serial ports in the
config_serialPorts resource overlay
(this is needed to prevent apps from accidentally accessing the bluetooth
or other system UARTs).

In addition, the platform uevent.rc file must set the owner to the
/dev/tty* files to "system" so the framework can access the port.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_SerialPort.cpp
cbdb49dc5e1b993a0bc5c68dbfb9486bfa0cd762 20-Oct-2011 Mike Lockwood <lockwood@android.com> Simple master volume support

Still needs integration with Settings (for persistence) and VolumePanel UI.

Change-Id: I9eca92c4b1ef2df2564411006a35753ab9618dce
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_AudioSystem.cpp
0765c448ab7d51355a7b1e82d359acfcf169f481 28-Jan-2012 Glenn Kasten <gkasten@google.com> No newline or space at end of ALOG format string

Change-Id: I0bef580cbc818cb7c87aea23919d26f1446cec32
ndroid_media_ToneGenerator.cpp
fb2cfa223b47db3ee46df22dcdb92f4fb013dcdd 03-Feb-2012 Chih-Chung Chang <chihchung@google.com> Comment out a warning message to avoid log spamming.

The warning message happens a lot when the region decoder is used (like
viewing a picture in the Gallery app).

Change-Id: I435f92eac8f322b091f3ed14ee48d0b5f0d84a8a
ndroid/graphics/Graphics.cpp
0a3f6d69b6e5242d5eaca6ede801eaabbff56cfd 06-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 33476f7a: am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."

* commit '33476f7ad1c3b4dcaefddb306f315e201c4efb33':
Skia API changes as a result of an update to the Skia library.
52da99fac85d1e16a3c95bdd9c039801e920e6d1 06-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."

* commit 'a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
Skia API changes as a result of an update to the Skia library.
ffd121233a38adfa49f7bb29bdceba7a4700e0c7 04-Feb-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Revert back to DroidSansArabic font for SystemUI"
1ef7d13172248848805b9ceb6161b0741d8580dd 03-Feb-2012 Amith Yamasani <yamasani@google.com> Merge "Multi-user - 1st major checkin"
742a67127366c376fdf188ff99ba30b27d3bf90c 04-May-2011 Amith Yamasani <yamasani@google.com> Multi-user - 1st major checkin

Switching activity stacks
Cache ContentProvider per user
Long-press power to switch users (on phone)

Added ServiceMap for separating services by user
Launch PendingIntents on the correct user's uid
Fix task switching from Recents list
AppWidgetService is mostly working.

Commands added to pm and am to allow creating and switching profiles.

Change-Id: I15810e8cfbe50a04bd3323a7ef5a8ff4230870ed
ndroid_util_Binder.cpp
2d315df64118da9b03cfa4f65a43850299084730 03-Feb-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5929529 Parentheses aren't correctly rendered in RTL context"
191c849283e8045a64a8f2c3472798c029416086 03-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Use ToneGenerator::tone_type consistently"
ab8c73882e0c572f42a5c73ebabf18706b8cc7b6 31-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5929529 Parentheses aren't correctly rendered in RTL context

- do BiDi mirrored char mirroring in TextLayoutCache
- see BiDi mirrored chars list at:

http://www.unicode.org/Public/6.0.0/ucd/extracted/DerivedBinaryProperties.txt

Change-Id: Ia0af0e252dbb0c55cc689bc9db34e05591bb6ee8
ndroid/graphics/TextLayoutCache.cpp
9b255cac775064038a5548c983205b2dfb029841 02-Feb-2012 Fabrice Di Meglio <fdimeglio@google.com> Revert back to DroidSansArabic font for SystemUI

- see bug #5957987 Revert to use DroidSansArabic instead of DroidNaskh font for Arabic Shaping in SystemUI
- DroidNaskh was having FontMetrics not compatible with Roboto

Change-Id: I9f3031c250f907c80f3992f71d929dc91686e1e5
ndroid/graphics/TextLayoutCache.cpp
8835f2928e56622955a05ec9f8aee043828575ca 31-Jan-2012 Bhanu Chetlapalli <bhanu@mips.com> Fix incorrect prototype for JNI call

This issue caused every Application launch to crash when using
portable JIT

Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>

Change-Id: Id7cfdeb4fc00ba4b1ca6fa24bc01c8f3432857ff
ndroid_view_Surface.cpp
889a3fa6ab9710104af60db5f73d69f253ddf254 31-Jan-2012 Derek Sollenberger <derek@android.com> Skia API changes as a result of an update to the Skia library.

These changes are required to work with r3022 of Skia

Change-Id: Ib7cebeb2eba6790bb38edfc2397b311cf419e17c
ndroid/graphics/Canvas.cpp
13631f3da855f200a151e7837ed9f6b079622b58 31-Jan-2012 Romain Guy <romainguy@google.com> Add debug markers to OpenGLRenderer

These markers will be used to group the GL commands by View in the
OpenGL ES debugging tool. This will help correlate individual GL
calls to higher level components like Views.

Change-Id: I73607ba2e7224a80ac32527968261ee008f049c6
ndroid_view_GLES20Canvas.cpp
530041d3191ce817832a0108514617768e43cda6 26-Jan-2012 Romain Guy <romainguy@google.com> Add stencil buffer to the EGL config

Change-Id: If76c0cd6127534d90f9526b75c0f8e56259c6722
ndroid_view_GLES20Canvas.cpp
2d2d7d6f42fe22ecc2b1dc8bb96a19e503a61a20 28-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Implement a cancelation mechanism for queries."
75ea64fc54f328d37b115cfb1ded1e45c30380ed 26-Jan-2012 Jeff Brown <jeffbrown@google.com> Implement a cancelation mechanism for queries.

Added new API to enable cancelation of SQLite and content provider
queries by means of a CancelationSignal object. The application
creates a CancelationSignal object and passes it as an argument
to the query. The cancelation signal can then be used to cancel
the query while it is executing.

If the cancelation signal is raised before the query is executed,
then it is immediately terminated.

Change-Id: If2c76e9a7e56ea5e98768b6d4f225f0a1ca61c61
ndroid_database_SQLiteCommon.cpp
ndroid_database_SQLiteConnection.cpp
23f7ad39ef52c0ac0a94934a71b6802c0a806b7f 28-Jan-2012 Glenn Kasten <gkasten@google.com> Use ToneGenerator::tone_type consistently

Also remove defaults in startToneCommand(), they're not needed and the
default for tone type was nonsense.

Change-Id: I70fa8cee4f3dbb8c66ceb3719c8d3d2f447f05b9
ndroid_media_ToneGenerator.cpp
39d18f53b3ec721ecc5cc629b71f902b33504bea 27-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"
a731b082b2c43204e6e9f927ab82fb732934a83b 24-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE

- also clean some destructors (was not quite compulsory because
they are related to some Singletons)

Change-Id: I3091cac7b38628cda593d72570ba7a5d7ea2a15c
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid_view_GLES20Canvas.cpp
c14639a9a1dfda34f828e2a6d774edfe5c3c6919 27-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_source_t consistently"
0f0fbd9441f40c6f99470b89774e397f99bf61eb 23-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_source_t consistently

Was a mix of audio_source_t, uint8_t, and int.

Related fixes:
- fix comments in MediaRecorder.java
- AudioPolicyService server side was not checking source parameter at
all, so if the client wrapper was bypassed, invalid values could be
passed into audio HAL
- JNI android_media_AudioRecord_setup was checking source for positive
values, but not negative values. This test is redundant, since already
checked at Java and now checked by AudioPolicyService also, but might
as well make it correct.

Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
ndroid_media_AudioRecord.cpp
7d6d9c005e5cfad787bb62b7fee6be2d75b13ca3 11-Jan-2012 Irfan Sheriff <isheriff@google.com> Initial support for concurrency

Use of multiple socket connections over wlan0 and p2p and
p2p state machine is now controlled entirely from wifi state machine

Add discovery stop to allow STA scans to proceed after p2p is used

Change-Id: I790c9112d3f475f638f06fc3ae9e191f6d90ef35
ndroid_net_wifi_Wifi.cpp
37c56b94c48f60369c0223869cf8d86839ec3816 25-Jan-2012 Mathias Agopian <mathias@google.com> Merge changes Ib6b6da1d,I6d9a466a

* changes:
improve SurfaceFlinger dumpsys
hack up frame latency measurement
e414613bb8d9b1ee0234a2b0858d6f447d0d956a 25-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption"
3941a22bfd36fe2866c2e0da93dbea2c60ec7c22 25-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption

- use the first char of the "run" instead of the "string" for the BaseGlyphCount

Change-Id: I647528ec912bb69655cf301bbc73b66dc1a6fc82
ndroid/graphics/TextLayoutCache.cpp
b335fad4705348ff78d764fb4be53dcbe6b67abe 16-Jan-2012 Jamie Gennis <jgennis@google.com> hack up frame latency measurement

Change-Id: I6d9a466a23285304f0e229a5649815636ab5d6af
ndroid_view_HardwareRenderer.cpp
1a54368b24a8cb88ee56ee746eae45171a43b89e 24-Jan-2012 Romain Guy <romainguy@google.com> Merge "Add full support for Canvas.setDrawFilter()"
5ff9df658230d49e42c43586997a02d8e4dd417e 24-Jan-2012 Romain Guy <romainguy@google.com> Add full support for Canvas.setDrawFilter()

Change-Id: I0ad35d0603c4eeda469014803be14c1dcdde918c
ndroid_view_GLES20Canvas.cpp
22cfd047abb09929331ce2727499a24bcbb3604b 24-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5846413 "phone" keyboard layout is broken on master"
bd901dee317d10c6a921922c3d7d788b90306c82 21-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5846413 "phone" keyboard layout is broken on master

- was a subtle regression introduced when fixing bug #5753006
- as we are now using SkPaint::kGlyphID_TextEncoding (glyph encoding)
instead of SkPaint::kUTF16_TextEncoding (UTF16 encoding), we need to
force the UTF16 encoding in some cases that are NOT going thru
the TextLayoutCache / Harfbuzz shaping

- fix also breakText() the same way

- also clean some old comment

- Warning: depends also on a CL from Skia for having getBaseGlyphCount() "const"

Change-Id: I3d1fc87f070884876c679b33541f810fbfb5df3f
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
0a204ed0f58a9baaac5630864cd75495486c6cbe 12-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_format_t consistently, continued

Was int or uint32_t.

When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.

Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.

Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
ndroid_media_AudioRecord.cpp
1bf599a01e7ad720150d8cc12416ba67bebd74c9 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Initialize SQLite as part of the android runtime."
4b57553e693c9705e8363d3e0e9d881261b3e6fa 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Initialize SQLite as part of the android runtime.

This ensures that the SQLite library is always correctly configured
and initialized before other framework or application code has
a chance to use it. This is important because initialization has
to happen at most once so we need to get it right and prevent races.

This change makes it possible to omit the SQLite auto-initialization
workaround from the SQLite library, potentially saving a few cycles
here and there.

Change-Id: Ifbed8685ee44aa1e9c0b391e233b0257fa738e4f
ndroid_database_SQLiteGlobal.cpp
ndroid_util_Log.cpp
ndroid_util_Log.h
c79e413911d48ebf14621304655029f6cd2c7959 20-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix typos in string constants"
7524a592526a14d20ec3f3acffd61fe18afaa4b4 20-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Remove dead setRingerMode(mode, mask)"
46deab0a694e7e3c79980904706a4d09bbda001a 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Clean up SQLiteDebug natives."
b815d0f80ae58bc48008186d3919e7c6e51fb43e 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Remove custom SQLITE_UNCLOSED error code."
254fba8960b018a29c5fe422b8a0fd9eeedbf3e4 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Clean up SQLiteDebug natives.

In particular, ensure that the database is initialized.

Change-Id: Ifa69a9dfa9d008af79beadbd1a25e90d0d29e66c
ndroid_database_SQLiteDebug.cpp
c3c36b4fe5863c8ac0ea5470be633e8fade9c483 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"

* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
Rename LOG_ASSERT to ALOG_ASSERT
12b7da69957ef894ce5134989e38479c64308ea1 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
f3f650db96d40014a0203393c585c368b0dd7a9a 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"

* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"

* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
7ae84204c14b4abff70fcc19c3c33de2591df34b 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"

* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
97aa8ee81198234aedffceaf71ad216b96323393 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge ee4618bc

Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
36b48c30adf7236b00eccf87f3b5691359526540 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"

* commit 'c318bbb05e02a0080e129623ec8029d31be0d60e':
Rename (IF_)LOG() to (IF_)ALOG()
48a4789686412390f9efd3bad0bfcaa3efbf9bfc 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Remove custom SQLITE_UNCLOSED error code.

This error code was introduced at some point to help track when
a database could not be closed because a statement was not finalized.
Now that the DB wrappers have been rewritten, it is technically no longer
poossible for this to happen, so we can remove this.

Change-Id: Ibbd55debbf390af436d6533aebff9726b1ff29e7
ndroid_database_SQLiteCommon.cpp
f68633da3ced654a9344b5c3b82f4d1c79b6bd09 09-Jan-2012 Steve Block <steveblock@google.com> Rename LOG_ASSERT to ALOG_ASSERT

Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
om_android_internal_content_NativeLibraryHelper.cpp
c6aacce37191e1cc79cfeba13b39899f59c68c3b 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
ndroidRuntime.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/SurfaceTexture.cpp
ndroid/opengl/util.cpp
ndroid_app_NativeActivity.cpp
ndroid_app_backup_FullBackup.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteCompiledSql.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteDebug.cpp
ndroid_database_SQLiteProgram.cpp
ndroid_database_SQLiteQuery.cpp
ndroid_database_SQLiteStatement.cpp
ndroid_debug_JNITest.cpp
ndroid_emoji_EmojiFactory.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_hardware_UsbRequest.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_ToneGenerator.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_net_TrafficStats.cpp
ndroid_nfc_NdefMessage.cpp
ndroid_nfc_NdefRecord.cpp
ndroid_os_StatFs.cpp
ndroid_os_UEventObserver.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
ndroid_server_NetworkManagementSocketTagger.cpp
ndroid_server_Watchdog.cpp
ndroid_util_Binder.cpp
ndroid_util_EventLog.cpp
ndroid_util_FileObserver.cpp
ndroid_util_Log.cpp
ndroid_util_Process.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_InputChannel.cpp
ndroid_view_InputQueue.cpp
ndroid_view_KeyEvent.cpp
ndroid_view_MotionEvent.cpp
a51f0e707f1f3142358aa919ea60ad2842803139 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
ndroidRuntime.cpp
ndroid/graphics/SurfaceTexture.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid_app_NativeActivity.cpp
ndroid_backup_BackupHelperDispatcher.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_hardware_Camera.cpp
ndroid_os_Debug.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_InputChannel.cpp
ndroid_view_InputQueue.cpp
ndroid_view_KeyEvent.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_PointerIcon.cpp
ndroid_view_VelocityTracker.cpp
933e85615059b85a87747da57288384541cc56da 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)

Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
ndroidRuntime.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/opengl/util.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_debug_JNITest.cpp
ndroid_os_Debug.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_Watchdog.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
ndroid_view_InputQueue.cpp
om_android_internal_content_NativeLibraryHelper.cpp
1afd5bab4e0eaba8b5bc2ab5c7b556cd602cf2e7 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)

Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
ctivityManager.cpp
ndroidRuntime.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/HarfbuzzSkia.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid_app_NativeActivity.cpp
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_BackupHelperDispatcher.cpp
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_bluetooth_common.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_ddm_DdmHandleNativeHeap.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_hardware_UsbRequest.cpp
ndroid_net_NetUtils.cpp
ndroid_nfc_NdefMessage.cpp
ndroid_os_Debug.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_InputQueue.cpp
om_android_internal_content_NativeLibraryHelper.cpp
06ade6ae1bd015e8b8ad0685847911213c93cc5b 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
ndroidRuntime.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_bluetooth_common.cpp
ndroid_database_SQLiteCompiledSql.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_hardware_Camera.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_ToneGenerator.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
om_android_internal_content_NativeLibraryHelper.cpp
3e8d7cfd1e6e65a60a9f6b7e174672dc9a281e49 19-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Clean up SQLite debugging code."
2a293b61cb0efbf24994d74ed980f58b820bb35a 19-Jan-2012 Jeff Brown <jeffbrown@google.com> Clean up SQLite debugging code.

Deleted a bunch of dead / useless code.
Raised number of logged operations in dumpsys dbinfo to 20.

Change-Id: I88344ff57a978f200c1f0172141d91e430caa1a9
ndroid_database_SQLiteDebug.cpp
24c255acc6dc492ee91d0f3a9538f29e1d8977ba 19-Jan-2012 Glenn Kasten <gkasten@google.com> Fix typos in string constants

These were copy/paste errors in code that was copied from AudioTrack.

Change-Id: I64a04d6026667884ddb1fefba67a71d69c691d62
ndroid_media_JetPlayer.cpp
00db1f52b1c12d3670a0419305aa7548f7932aa0 16-Jan-2012 Glenn Kasten <gkasten@google.com> Rename JNI implementation to match Java method

android_media_AudioTrack_native_write renamed to
android_media_AudioTrack_native_write_byte, since the Java method name
is called native_write_byte.

Change-Id: I85ef092cf3f5a01d275fc4ef127b4b6d190139e8
ndroid_media_AudioTrack.cpp
92ecdd63033a53b3c6301a9dc94c2438e498f27b 19-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix incorrect includes of AudioTrack.h"
e119bd144207b9b89ec7d52ee619bdbcda8ab497 19-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Replace run-time stream types by compile-time"
671d6cf460531825a321edb200523d0faa7792c9 18-Jan-2012 Romain Guy <romainguy@google.com> Full support for Canvas.drawPosText

This also introduces a small optimization when rendering text.

Change-Id: Iff620ac97bf878eaac406bccc6daa07052c93890
ndroid_view_GLES20Canvas.cpp
a6dafea172ac344f38cf4255c8896766f10b7b55 18-Jan-2012 Glenn Kasten <gkasten@google.com> Fix incorrect includes of AudioTrack.h

Remove unnecessary includes of AudioTrack.h.
Use forward declaration of class names in preference to #include when possible.

Change-Id: I12982811fa75c2c7695d8bbfa595a7aaec047dc0
ndroid_media_AudioSystem.cpp
ee7fea9f2fd536107450204c9c2058bbe215f713 18-Jan-2012 Glenn Kasten <gkasten@google.com> Remove dead setRingerMode(mode, mask)

Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
ndroid_media_AudioSystem.cpp
ad3f5145fe513c4abb36388ab41508edf2be2a7c 12-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOG() to (IF_)ALOG()

Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
ndroid/graphics/TextLayout.cpp
ndroid_app_NativeActivity.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_nfc.h
fb9ffe02609c9c4ffca64927e72bc935cfe87768 18-Jan-2012 Romain Guy <romainguy@google.com> Merge "First pass at implementing Canvas.drawPosText() in GL"
eb9a5367e8f0e970db8509ffb2584f5376bc62ed 18-Jan-2012 Romain Guy <romainguy@google.com> First pass at implementing Canvas.drawPosText() in GL

Change-Id: Ia3ac347e95d57eb86c63045156c8dbc0572b03cb
ndroid_view_GLES20Canvas.cpp
1be4afecb752559092654c0e9f4ca302b6d04e9c 18-Jan-2012 Eric Laurent <elaurent@google.com> Merge "audio framework: manage stream volume per device"
d33f97f1965b34aae673585ad4734b536c3894ef 18-Jan-2012 Romain Guy <romainguy@google.com> Merge "Free optimization"
d1d4bb70704e8f37d0823837eacdae21ebe0ed05 18-Jan-2012 Romain Guy <romainguy@google.com> Free optimization

Using the TextLayoutCache with the GL renderer should help...

Change-Id: I73a19be040165212839e2a40d4183e998f9dfb7f
ndroid_view_GLES20Canvas.cpp
29a0909c5f777230b9f34ef0703fed3cd4633833 16-Jan-2012 Glenn Kasten <gkasten@google.com> Replace run-time stream types by compile-time

Use the AUDIO_STREAM_* constants defined in <system/audio.h> instead of
dynamically looking up stream types from AudioManager.

Replace a series of "if" statements by a switch.

Change-Id: I6d015bc151c9ab97a02492e84c63298b1f6f31ac
ndroid_media_AudioTrack.cpp
9bc8358ddaa01c3490f9709991989633a6a3dd42 19-Nov-2011 Eric Laurent <elaurent@google.com> audio framework: manage stream volume per device

Improve volume management by keeping track of volume for each type
of device independently.
Volume for each stream (MUSIC, RINGTONE, VOICE_CALL...) is now maintained
per device.

The main changes are:
- AudioService now keeps tracks of stream volumes per device:
volume indexes are kept in a HashMap < device , index>.
active device is queried from policy manager when a volume change request
is received
initalization, mute and unmute happen on all device simultaneously
- Settings: suffixes is added to volume keys to store each device
volume independently.
- AudioSystem/AudioPolicyService/AudioPolicyInterface: added a device argument
to setStreamVolumeIndex() and getStreamVolumeIndex() to address each
device independently.
- AudioPolicyManagerBase: keep track of stream volumes for each device
and apply volume according to current device selection.

Change-Id: I61ef1c45caadca04d16363bca4140e0f81901b3f
ndroid_media_AudioSystem.cpp
11d06a73df371be0b11d5cf586e24601d796c048 17-Jan-2012 Romain Guy <romainguy@google.com> Merge "Fix text encoding when drawing with drawPosText in software"
62b6eaa7f3a8111311a7ee097f278eb55865a499 17-Jan-2012 Romain Guy <romainguy@google.com> Fix text encoding when drawing with drawPosText in software

Change-Id: I0cd8ee526189c38c50953a1a08b50e0b31c55d8c
ndroid/graphics/Canvas.cpp
c7c09960ff9cc71d4f27f57b456986f4b634310d 17-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5870701 Thai text can be clipped when there are more glyphs generated than the initial number of code points"
fb6b5bdcea04c1fa6ccd046373f5ad3a62784713 17-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_mode_t consistently"
cc767191cfb675f744e0165608b0a4196aba2b37 17-Jan-2012 Glenn Kasten <gkasten@google.com> Fix build for SDK on Mac

Change-Id: If99541e3537edbe3636e06b1766aa31d877a2fc8
ndroid_util_Process.cpp
3c6b9cca79c872427599a325bcbb5d4a00113d80 17-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_stream_type_t consistently"
a7f656206550dea94e51dd8c9bb2dd8734bcdf92 17-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Add android.os.Process.setThreadScheduler"
03e250aefa29387f30a01243682eab2371103f8e 14-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5870701 Thai text can be clipped when there are more glyphs generated than the initial number of code points

- compute total advances correctly by iterating on the advances array for up to mShaperItem.num_glyphs
- update unit tests

Change-Id: I00af68bef88702215e9222ed80dbffcc81df51a7
ndroid/graphics/TextLayoutCache.cpp
fcbbaf1d837e96e77d0ec45a050e8a41060ae7f3 13-Jan-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of e80341c8 to master

Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef
2ddf6ea6dc67043fb9f91df366187c2153c30d30 13-Jan-2012 Kenny Root <kroot@google.com> Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
bc1d77b6cbce23fbe25f7231651037ae195bc90e 13-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_stream_type_t consistently

At native level it was a mixture of audio_stream_type_t, int, uint32_t,
and uint8_t. Java is still int. Also fixed a couple of hard-coded -1
instead of AUDIO_STREAM_DEFAULT, and in startToneCommand a hard-coded 0
instead of AUDIO_STREAM_VOICE_CALL.

Change-Id: Ia33bfd70edca8c2daec9052984b369cd8eee2a83
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_ToneGenerator.cpp
986f00faf44b0d9ed5b1384746ca4254037fc180 13-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Rewrite SQLite database wrappers."
18c415c3c87da27ceca27ce8df6e2c816d6a2fa3 12-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Clean up database tests a little bit."
e5360fbf3efe85427f7e7f59afe7bbeddb4949ac 01-Nov-2011 Jeff Brown <jeffbrown@google.com> Rewrite SQLite database wrappers.

The main theme of this change is encapsulation. This change
preserves all existing functionality but the implementation
is now much cleaner.

Instead of a "database lock", access to the database is treated
as a resource acquisition problem. If a thread's owns a database
connection, then it can access the database; otherwise, it must
acquire a database connection first, and potentially wait for other
threads to give up theirs. The SQLiteConnectionPool encapsulates
the details of how connections are created, configured, acquired,
released and disposed.

One new feature is that SQLiteConnectionPool can make scheduling
decisions about which thread should next acquire a database
connection when there is contention among threads. The factors
considered include wait queue ordering (fairness among peers),
whether the connection is needed for an interactive operation
(unfairness on behalf of the UI), and whether the primary connection
is needed or if any old connection will do. Thus one goal of the
new SQLiteConnectionPool is to improve the utilization of
database connections.

To emulate some quirks of the old "database lock," we introduce
the concept of the primary database connection. The primary
database connection is the one that is typically used to perform
write operations to the database. When a thread holds the primary
database connection, it effectively prevents other threads from
modifying the database (although they can still read). What's
more, those threads will block when they try to acquire the primary
connection, which provides the same kind of mutual exclusion
features that the old "database lock" had. (In truth, we
probably don't need to be requiring use of the primary database
connection in as many places as we do now, but we can seek to refine
that behavior in future patches.)

Another significant change is that native sqlite3_stmt objects
(prepared statements) are fully encapsulated by the SQLiteConnection
object that owns them. This ensures that the connection can
finalize (destroy) all extant statements that belong to a database
connection when the connection is closed. (In the original code,
this was very complicated because the sqlite3_stmt objects were
managed by SQLiteCompiledSql objects which had different lifetime
from the original SQLiteDatabase that created them. Worse, the
SQLiteCompiledSql finalizer method couldn't actually destroy the
sqlite3_stmt objects because it ran on the finalizer thread and
therefore could not guarantee that it could acquire the database
lock in order to do the work. This resulted in some rather
tortured logic involving a list of pending finalizable statements
and a high change of deadlocks or leaks.)

Because sqlite3_stmt objects never escape the confines of the
SQLiteConnection that owns them, we can also greatly simplify
the design of the SQLiteProgram, SQLiteQuery and SQLiteStatement
objects. They no longer have to wrangle a native sqlite3_stmt
object pointer and manage its lifecycle. So now all they do
is hold bind arguments and provide a fancy API.

All of the JNI glue related to managing database connections
and performing transactions is now bound to SQLiteConnection
(rather than being scattered everywhere). This makes sense because
SQLiteConnection owns the native sqlite3 object, so it is the
only class in the system that can interact with the native
SQLite database directly. Encapsulation for the win.

One particularly tricky part of this change is managing the
ownership of SQLiteConnection objects. At any given time,
a SQLiteConnection is either owned by a SQLiteConnectionPool
or by a SQLiteSession. SQLiteConnections should never be leaked,
but we handle that case too (and yell about it with CloseGuard).

A SQLiteSession object is responsible for acquiring and releasing
a SQLiteConnection object on behalf of a single thread as needed.
For example, the session acquires a connection when a transaction
begins and releases it when finished. If the session cannot
acquire a connection immediately, then the requested operation
blocks until a connection becomes available.

SQLiteSessions are thread-local. A SQLiteDatabase assigns a
distinct session to each thread that performs database operations.
This is very very important. First, it prevents two threads
from trying to use the same SQLiteConnection at the same time
(because two threads can't share the same session).
Second, it prevents a single thread from trying to acquire two
SQLiteConnections simultaneously from the same database (because
a single thread can't have two sessions for the same database which,
in addition to being greedy, could result in a deadlock).

There is strict layering between the various database objects,
objects at lower layers are not aware of objects at higher layers.
Moreover, objects at higher layers generally own objects at lower
layers and are responsible for ensuring they are properly disposed
when no longer needed (good for the environment).

API layer: SQLiteDatabase, SQLiteProgram, SQLiteQuery, SQLiteStatement.
Session layer: SQLiteSession.
Connection layer: SQLiteConnectionPool, SQLiteConnection.
Native layer: JNI glue.

By avoiding cyclic dependencies between layers, we make the
architecture much more intelligible, maintainable and robust.

Finally, this change adds a great deal of new debugging information.
It is now possible to view a list of the most recent database
operations including how long they took to run using
"adb shell dumpsys dbinfo". (Because most of the interesting
work happens in SQLiteConnection, it is easy to add debugging
instrumentation to track all database operations in one place.)

Change-Id: Iffb4ce72d8bcf20b4e087d911da6aa84d2f15297
ndroid.mk
ndroidRuntime.cpp
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteCommon.cpp
ndroid_database_SQLiteCommon.h
ndroid_database_SQLiteCompiledSql.cpp
ndroid_database_SQLiteConnection.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteGlobal.cpp
ndroid_database_SQLiteProgram.cpp
ndroid_database_SQLiteQuery.cpp
ndroid_database_SQLiteStatement.cpp
qlite3_exception.h
5a05c23f3d6a1a895bf5917aacd8bd9a5302ba00 12-Jan-2012 Jeff Brown <jeffbrown@google.com> Clean up database tests a little bit.

Change-Id: Ib05c699bf59187cb51627b5f352c2a15ad2c28bb
ndroid_database_CursorWindow.cpp
1c66547ba25be6a1893df0ae26857f649474843a 12-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_format_t consistently"
accb114e59ca51f2a7d370f64de8e98bde158c51 04-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_mode_t consistently

It was int or uint32_t.
Also make getMode() const.

Change-Id: Ibe45aadbf413b9158e4dd17f2b3bcc6355288d37
ndroid_media_AudioSystem.cpp
a9830d430ac36e22b53a1c2d405e4315396a8ab7 11-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix build warnings"
129e19cb37b1d30f8c46f77a3853d347c3e78bb3 11-Jan-2012 Glenn Kasten <gkasten@google.com> Fix build warnings

Change-Id: I334e0a6e018bb1067c90e050cf3583c1057aacd9
ndroid_util_AssetManager.cpp
ndroid_util_Process.cpp
ed70933d4503ec629ba8052a7faa2bdc7b984172 11-Jan-2012 Glenn Kasten <gkasten@google.com> Fix build warnings

Change-Id: Ic82cc86ac4b63b30ab66e1b8c7fd0e998fea590e
ndroid_bluetooth_HeadsetBase.cpp
ndroid_server_BluetoothService.cpp
ec193dec4d9ca2cfc8295c4becfe950a906a15ed 09-Jan-2012 Steve Block <steveblock@google.com> Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE

See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
om_android_internal_content_NativeLibraryHelper.cpp
3762c311729fe9f3af085c14c5c1fb471d994c03 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
ndroidRuntime.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/SurfaceTexture.cpp
ndroid/graphics/TextLayout.cpp
ndroid/opengl/util.cpp
ndroid_app_NativeActivity.cpp
ndroid_app_backup_FullBackup.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteCompiledSql.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteDebug.cpp
ndroid_database_SQLiteProgram.cpp
ndroid_database_SQLiteQuery.cpp
ndroid_database_SQLiteStatement.cpp
ndroid_debug_JNITest.cpp
ndroid_emoji_EmojiFactory.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_hardware_UsbRequest.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_ToneGenerator.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_net_TrafficStats.cpp
ndroid_os_StatFs.cpp
ndroid_os_UEventObserver.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
ndroid_server_NetworkManagementSocketTagger.cpp
ndroid_server_Watchdog.cpp
ndroid_util_Binder.cpp
ndroid_util_EventLog.cpp
ndroid_util_FileObserver.cpp
ndroid_util_Log.cpp
ndroid_util_Process.cpp
ndroid_view_DisplayEventReceiver.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_InputChannel.cpp
ndroid_view_InputEventReceiver.cpp
ndroid_view_KeyEvent.cpp
ndroid_view_MotionEvent.cpp
8564c8da817a845353d213acd8636b76f567b234 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
ndroidRuntime.cpp
ndroid/graphics/SurfaceTexture.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid_app_NativeActivity.cpp
ndroid_backup_BackupHelperDispatcher.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_hardware_Camera.cpp
ndroid_os_Debug.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
ndroid_view_DisplayEventReceiver.cpp
ndroid_view_InputChannel.cpp
ndroid_view_InputEventReceiver.cpp
ndroid_view_KeyEvent.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_PointerIcon.cpp
ndroid_view_VelocityTracker.cpp
d4a69b4a1cb5b52035345abd8cb9595ae4cf9fa5 06-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5753006 Garbled Labels in Maps"
a0a117b4c1a9e45ca4b895df9a355b6922ae2242 05-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE

- do not clear the smart pointer when the cache entry does not fit the cache size

See http://code.google.com/p/android/issues/detail?id=23337

Change-Id: Id4533d9f8a396c310c9215157ec5a4c07f30c7f2
ndroid/graphics/TextLayoutCache.cpp
bd47cac4dfc8440a848b33107cba1d6773f3e124 05-Jan-2012 Steve Block <steveblock@google.com> Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
c726ff02c7749f134885decadd2ea86877119c3d 05-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long"
1c5a89d4af193e3ce9be9992ffee0ab0a4d8da5a 04-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_format_t consistently

Was int, uint32_t, uint16_t, and uint8_t with 2-bit bitfield.
Also replace 0 by AUDIO_FORMAT_DEFAULT and replace 1 by
AUDIO_FORMAT_PCM_16_BIT.

Change-Id: Ia8804f53f1725669e368857d5bb2044917e17975
ndroid_media_AudioTrack.cpp
c511bee87cda99a252d1a62487f47c8f05aee78c 05-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5753006 Garbled Labels in Maps

- it was a regression introduced into this CL: https://android-git.corp.google.com/g/#/c/154240/5
- basically needed to set the GlyphID encoding to the Skia Paint as we are now using glyphID resulting
from the Harfbuzz shaping
- also define GlyphID encoding as the default on the Paint class

Change-Id: Idb7c2c57ac67595425ce3be9421258962690fcdd
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
bd7cdc32eb30e779edeec3e0d1715376aae6c546 04-Jan-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long

- do not clear the smart pointer when the cache entry does not fit the cache size

Change-Id: I49f1aa1e70018bb7d6a8fb076d9269d0ec6a5d98
See: http://code.google.com/p/android/issues/detail?id=23337
ndroid/graphics/TextLayoutCache.cpp
6215d3ff4b5dfa52a5d8b9a42e343051f31066a5 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
ndroidRuntime.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/opengl/util.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_debug_JNITest.cpp
ndroid_os_Debug.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_Watchdog.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
om_android_internal_content_NativeLibraryHelper.cpp
5baa3a62a97544669fba6d65a11c07f252e654dd 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
ctivityManager.cpp
ndroidRuntime.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/HarfbuzzSkia.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid_app_NativeActivity.cpp
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_BackupHelperDispatcher.cpp
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_bluetooth_common.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_ddm_DdmHandleNativeHeap.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_hardware_UsbRequest.cpp
ndroid_net_NetUtils.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_os_Debug.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_InputEventReceiver.cpp
om_android_internal_content_NativeLibraryHelper.cpp
44b330dfb0aeecb4e2ac97ff72a5abfb341c74fb 28-Dec-2011 Irfan Sheriff <isheriff@google.com> Add multi-interface support to native calls

Add the initial support for supporting seperate socket
connections on the p2p interface.

This is the initial change making primary interface connections
work alongside native support for p2p socket connection

Change-Id: I7619715ca75b10afd29af852279fe713331f75e0
ndroid_net_wifi_Wifi.cpp
1f095869536472c178046bb63c59947508eac4a6 21-Dec-2011 Irfan Sheriff <isheriff@google.com> clean up jni code

- Move all supplicant commands out of jni code in preparation for multi-socket
changes

- Also, clean up some function names to remove the explicit command

Change-Id: Id609ac7df0792fb85b52554d159f22064227c584
ndroid_net_wifi_Wifi.cpp
10410fc85248ea77c2c1fbbb666c3fe4fcfef1b6 20-Dec-2011 Anthony Mazzola <m00901766@AndroidServer1.huawei.com> Fix issue with selecting proper JNI libraries

Current code will load both abi and abi2 versions of the JNI libraries.
The second one found will be the library in use. Update algorithm so
that abi2 libraries will never be loaded once we find a library that
supports the primary abi. This is consistent with the original
implementation.

Bug: 5787224
Change-Id: Ib4d30bea8316ca9bf62757c970dcc5b75cd969ec
om_android_internal_content_NativeLibraryHelper.cpp
eca6d909f7dd990c9a3226aa2f1ed1fa0cd250a2 20-Dec-2011 Nick Pelly <npelly@google.com> Merge "Rewrite NDEF parsing in Java, clean-up API."
a356bf1cd81614a94ef6c720998792480ade4c84 14-Dec-2011 Nick Pelly <npelly@google.com> Rewrite NDEF parsing in Java, clean-up API.

o Lots of documentation fixes.
o Add NdefMessage(NdefRecord ... records) ctor
o Add NdefRecord.createMime()
o Add NdefRecord.createExternal()
o Add toString(), equals() and hashCode() implementations
o Deprecate NdefRecord(byte[]) and NdefRecord.toByteArray()
o Remove framework dependency on libnfc_ndef.so
o Remove NfcAdapter.getDefaultAdapter(), its been deprecated a while

next step:
o Attempt to move NdefMessage -> Intent conversion into NDEF, and
make it CTS tested. This will ensure consistent NDEF -> Intent
mapping across all Android devices.

Change-Id: Ifed4910caa9a1d6bad32dbf0a507ab22bca35e22
ndroid.mk
ndroidRuntime.cpp
ndroid_nfc_NdefMessage.cpp
ndroid_nfc_NdefRecord.cpp
25adf474775acb3eea260cb0a6251cf43ff798ce 15-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Fix indentation and whitespace"
fb2ab9efc3805c81521afb9ff91a58ff5097a36e 12-Dec-2011 Glenn Kasten <gkasten@google.com> Fix indentation and whitespace

Use git diff -w to verify.

Change-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638
ndroid_media_AudioTrack.cpp
ec62f12a94fd8c955f025328e0d3ff48217bea42 15-Dec-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Change the fd to be blocking for health profile."
82477b5e3cfe4bca1e3611c136dbe701ca8f603c 14-Dec-2011 Jaikumar Ganesh <jaikumar@google..com> Change the fd to be blocking for health profile.

This is sync with the java IO stream APIs for the public APIs.

Change-Id: I5c7958687275d89257ac26f6a5abd08906327d02
ndroid_server_BluetoothService.cpp
a4d077006306b49d85e7609e8f5a061e345f6f6d 14-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5674155 Segmentation issue for Thai

- force Harfbuzz to shape with the Thai font

Change-Id: I3830acae17385b050e2745fca277cf66af103099
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
65194adc9a5174fc88fb579472799e8b4771796b 14-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5727213 Rendering issues with Bengali in Textview in IML63B

- force Harfbuzz to shape with the Bengali font
- also fix potential returned NULL value from SkTypeface::CreateFromFile(path)

Change-Id: I25be09d06e449b89bb4a62444e27f77e436b77ba
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
902a5b31c50022a1b7707be4d333e4ce6ec4a8fa 09-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> TextLayoutCache - fix diacritics composition

- normalize (with ICU) each BiDi run before shaping them

We are normalizing by "chuncks" and starting from the end of the string. Each "chunck"
is composed of the main code point and its associated diacritics.

Fix bug #5738435 TextLayoutCache should be able to take care about diacritics during shaping

Change-Id: I7288027a7fa8eafb8b9f38d449625be60214548a
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
b02d0ca5553300063e4332192632312600caf4b9 08-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> Clean TextLayout code and remove RTL_USE_HARFBUZZ

- remove dependencies on ICU
- use TextLayouCache
- remove RTL_USE_HARFBUZZ define (we *are* using Harfbuzz now)
- also fix compilation warning

Change-Id: I022e11703438d07032e49e42724184f6bf16653e
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/RtlProperties.h
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid_view_GLES20Canvas.cpp
6779df2c28a68616134b1988f009221652d9f2ad 07-Dec-2011 Mathias Agopian <mathias@google.com> Improve the VSYNC api a bit.

- add the ability to set the vsync delivery rate, when the rate is
set to N>1 (ie: receive every N vsync), SF process' is woken up for
all of vsync, but clients only see the every N events.

- add the concept of one-shot vsync events, with a call-back
to request the next one. currently the call-back is a binder IPC.

Change-Id: I09f71df0b0ba0d88ed997645e2e2497d553c9a1b
ndroid_view_DisplayEventReceiver.cpp
9c4b79af221b53f602f946faa9ff317a596a0c39 11-Nov-2011 Romain Guy <romainguy@google.com> Discard framebuffer rendering queues when discarding layers
Bug #5581817

Change-Id: Ie30700a29059d2ea60eb7bd3f8bd20ac48a149ab
ndroid_view_GLES20Canvas.cpp
99cdc6a3b509d61b0072467f6ed47989aca528c1 06-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)

- disable GSUB / GPOS table loading

Change-Id: I2ae058c9d926242586f90dc2a98302ff886f1fe1
ndroid/graphics/HarfbuzzSkia.cpp
ndroid/graphics/TextLayoutCache.cpp
731b939de88a4fc5fcdc977845d095eee67d87c5 06-Dec-2011 Jeff Brown <jeffbrown@google.com> Merge "Add a new class to receive vsync events."
f98c2a67fe051cc92f3205bfc0267ddac90d3a71 06-Dec-2011 Jeff Brown <jeffbrown@google.com> Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)

Ensure log_clusters array is big enough.
Bug: 5714171

Explicitly handle the cases where the entire string or a single
run might have a length of 0.
Harfbuzz assumes the length of the item is at least 1.
If the length is zero, then it will clobber memory at index -1
into the log_clusters array.
Bug: 5705479

Change-Id: If28a9866221081f69973c1d12d7fe0cf8db2edd0
ndroid/graphics/TextLayoutCache.cpp
a03bdedbdf1022d1391f5f0a6ea507e2ebbb0e9a 06-Dec-2011 Jeff Brown <jeffbrown@google.com> Harfbuzz assumes the length of the item is at least 1.

If the length is zero, then it will clobber memory at index -1
into the log_clusters array.

Explicitly handle the cases where the entire string or a single
run might have a length of 0.

Bug: 5705479
Change-Id: Ibbd3a4edcb7e1cad09c34091b42bb315776ea558
ndroid/graphics/TextLayoutCache.cpp
738ef87eacd3e54132d1bf661dd9329050fddd2f 06-Dec-2011 Jeff Brown <jeffbrown@google.com> Ensure log_clusters array is big enough.

Bug: 5714171
Change-Id: I886f1af8af177827f052e6406a192f2fad5c2cec
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
0a0a1248cfc03940174cbd9af677bafd7280a3bc 02-Dec-2011 Jeff Brown <jeffbrown@google.com> Add a new class to receive vsync events.

Change-Id: I4e384336d2813752a6d65fda6a77e86113a4510c
ndroid.mk
ndroidRuntime.cpp
ndroid_view_DisplayEventReceiver.cpp
ndroid_view_InputEventReceiver.cpp
315e468763c9601e2f06443fda847d2c9eb27a75 05-Dec-2011 Dianne Hackborn <hackbod@google.com> am 803caff1: am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1

* commit '803caff1dc307a8895e9f3560112f969fa3f6f39':
Fix issue #5614559: Registering surface error in...
61566cc1932468720a831ad5cbc68ee080d613c9 03-Dec-2011 Dianne Hackborn <hackbod@google.com> Fix issue #5614559: Registering surface error in...

...Background Replacement on Stingray

This is how I should have done it in the first place. We get the
new surface from the window manager, and then just copy it in to
the constant Surface object we have for the holder.

Change-Id: I537a9e413829a18f689dfb46687014676b27156e
ndroid_view_Surface.cpp
a6062265bd7a5e69891734ae0d927a3d3f5613b7 03-Dec-2011 Jesse Hall <jessehall@google.com> am 54cf27d7: am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1

* commit '54cf27d7bbe27b1096f5e060c540f07dac07f1d0':
Disable GLES20Canvas on emu w/o native GL
868d1bdf3c01dbdcf15b780db72d1c9a3022829f 03-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "TextLayoutCache Fix compilation issue"
5448f0378ede9c5d33e7300fa318ef4a6925562f 03-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> TextLayoutCache Fix compilation issue

- fix compilation after refactoring and when setting DEBUG_ADVANCES to 1

Change-Id: I8eef7e3c4550c505325459948d3c8eebbdd5215a
ndroid/graphics/TextLayoutCache.cpp
4406345cd62d3687ce590c357854472f7f906e6c 01-Dec-2011 Jesse Hall <jessehall@google.com> Disable GLES20Canvas on emu w/o native GL

When the emulator is run without '-gpu on', GLES20 isn't supported,
so claiming GLES20Canvas is available will lead to catastrophic
failure. This change makes GLES20Canvas available when compiled in
and either not running on the emulator, or running on the emulator
with native GL acceleration enabled.

Change-Id: I89c944f9e3c9585224f5aa0877335ea48ea4a468
ndroid_view_GLES20Canvas.cpp
32cbc3855c2a971aa5a801fd339fb6a37db91a1a 01-Dec-2011 Jeff Brown <jeffbrown@google.com> Refactor InputQueue as InputEventReceiver.

This change simplifies the code associated with receiving input
events from input channels and makes it more robust. It also
does a better job of ensuring that input events are properly
recycled (sometimes we dropped them on the floor).

This change also adds a sequence number to all events, which is
handy for determining whether we are looking at the same event or a
new one, particularly when events are recycled.

Change-Id: I4ebd88f73b5f77f3e150778cd550e7f91956aac2
ndroid.mk
ndroidRuntime.cpp
ndroid_view_InputEventReceiver.cpp
ndroid_view_InputQueue.cpp
4952dfd16a0f839559ffa78f5016394caf85294f 01-Dec-2011 Jeff Brown <jeffbrown@google.com> Ensure input events are processed in-order in the application.

As it turns out, it used to be possible for there to be multiple
input events simultaneously in flight in an application. Although
it worked, it made it hard to reason about what was going on.
The problem was somewhat exacerbated by the introduction of a
queue of "InputEventMessage" objects as part of an earlier latency
optimization.

This change restores order from chaos and greatly simplifies the
invariants related to input event dispatch within the application.

Change-Id: I6de5fe61c1fe2ac3dd33edf770d949044df8a019
ndroid_view_InputQueue.cpp
2e5e96e9f06b3853dcade61c0aceb0dbaaff3032 01-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> TextLayoutCache Code cleaning

- remove commented code
- fix log

Change-Id: I8495b923c9426e33e645fe85ea04005520716f4e
ndroid/graphics/TextLayoutCache.cpp
a90d65265fe94e35967876500105d6e020ce0f91 01-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Improve TextLayoutCache logging"
56e6e5492780feb3824ff076551b563aade6a2ef 01-Dec-2011 Fabrice Di Meglio <fdimeglio@google.com> Improve TextLayoutCache logging

- make logs more consistent and readable
- add more logs information

Change-Id: Idfe5bb53e9163c4c07a9b4267b66b0d0e164a498
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
020975236c53fe2eeb1ada57f27258802858d98f 30-Nov-2011 Wu-cheng Li <wuchengli@google.com> Fix compile error in android_hardware_Camera.cpp.

Change-Id: I06b187deaacb98e01813dbfb8d92a332bfc08fc4
ndroid_hardware_Camera.cpp
b4123ef0f9cc52b329fe2564213bc2b8bc19ef4a 30-Nov-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add camera focus move callback."
a5d24d42ff8b99383a8c3051b9459e5248cf8536 29-Nov-2011 Irfan Sheriff <isheriff@google.com> Merge "Redesign p2p around provision discovery"
bb9ba8bae551305acba4f60577b0f461a9421bc5 29-Nov-2011 Mathias Agopian <mathias@google.com> BitTube::read now handles EAGAIN

Change-Id: Iacda2386342ba0727bbf278f6c597488d5467bb8
ndroid_hardware_SensorManager.cpp
9d062cfe94dcd24b1d61fc83e5de565cb67965b1 14-Nov-2011 Wu-cheng Li <wuchengli@google.com> Add camera focus move callback.

bug:5534973
Change-Id: Iaadcb2738ad040f94849be30ee531326f6199431
ndroid_hardware_Camera.cpp
618455f7e7255019c8cc08a734ba7c52b67a7dc8 18-Nov-2011 Irfan Sheriff <isheriff@google.com> Redesign p2p around provision discovery

= Provision Discovery:Is an optional discovery technique for figuring out
if a peer supports the specific WPS option. For compatibility reasons,
we will now always use it during connection but at the same time support
devices that request to support connection without it

= State machine and UI redesign around the new interaction

= Specify config methods explicitly for compatibility

Bug: 5599949
Change-Id: Ib79435dda472c43cc0746f56bf79ea896b2e33a4
ndroid_net_wifi_Wifi.cpp
55abad3904f98974e52a0b315019df307d1b0629 22-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Improve TextLayoutCache performances"
0af10b54bf110653b74cb92793484b412a90b657 19-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> Improve TextLayoutCache performances

- introduce TextLayoutEngine
- reduce calls to HB_NewFace as they are opening the font files under the cover
- refactor code for removing FontData structure
- fix logging

Change-Id: Id9658fcd454b74c34ecf4e9dfd1bd2201e04b988
ndroid/graphics/HarfbuzzSkia.cpp
ndroid/graphics/HarfbuzzSkia.h
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
3d0b23a58a7b2d499ed7bd6679b152289ec9a340 19-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix TextLayoutCache Skia Typeface caching"
a4f5aa87c73de7a2581dc4dd72e0f90ccea79a18 18-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix TextLayoutCache Skia Typeface caching

- fix reference passing for globals

Change-Id: I806dd4406d455b98c6be733847419b06b6774ccc
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
221096fdd6963a0f7090b928cfb92b9267f32d7a 16-Nov-2011 Jeff Brown <jeffbrown@google.com> am 4c0e0dd2: am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1

* commit '4c0e0dd29dcce33e7521b11d01d21d9431f3b264':
Eliminate hw.keyboards system properties.
1e08fe90df18930691b0c2ec22e5db25d7fcb4cf 16-Nov-2011 Jeff Brown <jeffbrown@google.com> Eliminate hw.keyboards system properties.

Stop using system properties to publish information about
the key character map path. Instead, we can retrieve it
on demand by asking the window manager.

It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.

Bug: 5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
ndroid_view_KeyCharacterMap.cpp
bf677de46a039e07038511909576bfbf4406f7fd 15-Nov-2011 Jeff Brown <jeffbrown@google.com> Merge "Clean up GenerationCache."
28a5ec9613a824d2ec15ce5e5cec77a6fcf444d5 14-Nov-2011 Dave Burke <daveburke@google.com> am 2cfb873c: am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1

* commit '2cfb873c9f0b56f2c7d694a21c968511223933af':
Revert "Discard framebuffer rendering queues when discarding layers"
9d66da8ae61a8520f46ee7df3cbb374852d9da91 14-Nov-2011 Dave Burke <daveburke@google.com> Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
d8fa1ad4523b6c04cab663ff4b65181fc00594d9 14-Nov-2011 Mathias Agopian <mathias@google.com> am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1

* commit '738d8cae2239d194429676f2889cfae3c8f7ba08':
Define, document, and test the behavior of very large SurfaceTextures
c93a151fde7d616c22b86ae458b3d015e3820d5e 14-Nov-2011 Mathias Agopian <mathias@google.com> Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
7077506f9945b87b02bdd47ffce75a5b813c821c 14-Nov-2011 Dave Burke <daveburke@google.com> Revert "Discard framebuffer rendering queues when discarding layers"

This reverts commit da96f8ac2c1c35a54f3f36e6d776cb386a251d03.
ndroid_view_GLES20Canvas.cpp
3f511aaf1cb9dfa69e2f4225a5bd41bec0864cc7 14-Nov-2011 Mathias Agopian <mathias@google.com> am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1

* commit 'a16ee9390e1fcea8ff7cbefd253659c37f2999a3':
Discard framebuffer rendering queues when discarding layers Bug #5581817
2858749704ea7b130499cf2ac7b3e1c3331f1582 14-Nov-2011 Mathias Agopian <mathias@google.com> Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1
d9e688cab3015d858110fb8240cf7378c6befd82 12-Nov-2011 Jeff Brown <jeffbrown@google.com> Clean up GenerationCache.

Use const references to keys and values where appropriate to avoid
copying them unnecessarily.

Deleted some dead code.

Simplified a few pieces that were doing unnecessary redundant work.

Change-Id: Ib2145b7094a40db2d679e05dafe050fe1e87b846
ndroid/graphics/TextLayoutCache.cpp
ad169f49af9fac1b80faa124496103dff2ac29f4 12-Nov-2011 Jeff Brown <jeffbrown@google.com> am 0e4669c8: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.

* commit '0e4669c81009cea51d9d7b42b7ff665f44e78aa6':
Fix bug in TextLayoutCacheKey handling embedded nulls.
0e4669c81009cea51d9d7b42b7ff665f44e78aa6 12-Nov-2011 Jeff Brown <jeffbrown@google.com> am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.

* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f 12-Nov-2011 Jeff Brown <jeffbrown@google.com> am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.

* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
b89d88f531ee39927f8f554baaae5ecc9101ba9d 10-Nov-2011 Mathias Agopian <mathias@google.com> Define, document, and test the behavior of very large SurfaceTextures

updateTexImage() now throws a runtime exception when its native
counterpart fails

Bug: 5506633

Change-Id: I151a6f685d465966e7df4df624412ab2da62e95f
ndroid/graphics/SurfaceTexture.cpp
8661489545eaa4aac641a8bc1a24b1647258a62e 12-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Improve the logging in TextLayoutCache."
06daa7b6b2186cf1e83e14d2adbb0d2050b79c39 12-Nov-2011 Jeff Brown <jeffbrown@google.com> Improve the logging in TextLayoutCache.

Also deleted some dead code.

Change-Id: I1feb5744177ae751ff1417f49f3c45139a35246b
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
f1f0c873b1d119a19342cb67ca77b59607951659 12-Nov-2011 Jeff Brown <jeffbrown@google.com> Fix bug in TextLayoutCacheKey handling embedded nulls.

We were not passing the length of the UTF-16 string to
String16::setTo. As a result, it was copying the contents of
the text up to the first null it found.

First problem, these strings are not typically null terminated!

Second problem, if the string contained a null character, then
we might truncate it. However, we only truncated the string
when the copy constructor was invoked (say, when we called
get() on the cache) but not in internalTextCopy() (before
adding the key to the cache).

As a result of the second problem, we would first search
the cache for a key that matched a partially copied truncated
string (potentially reading uninitialized memory that followed it).
Finding none, we would add the entry to the cache using
the correct key.

If the cache already had a value associated with the correct key,
then the put would fail, returning false. Charging ever onwards,
we would add the size of the entry to the cache size.

Proceeding in this manner, it was possible for the cache to
believe it had less remaining space than it really did. At that
point, it was possible for the cache to evict all entries and
yet still not think it had room to add a new one, so it would
continue trying to make space indefinitely.

Bug: 5576812
Change-Id: I05251594f6b2da0a5dc09f7200f04fe9100ec766
ndroid/graphics/TextLayoutCache.cpp
1333742bedc9b462024302f302e3a7f27053df66 11-Nov-2011 Akwasi Boateng <akwasi.boateng@ti.com> am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp

* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
Make the overridden ImageView#setVisibility remotable
Clamp non-monotonic stats instead of dropping.
DO NOT MERGE. Fix leak in LayoutTransition
Fix lastVisible/global rects
Fix Wimax-less build.
Fix leak in LayoutTransition
Deferring wallpaper update to improve workspace scrolling (issue 5506959)
Terminate EGL when an app goes in the background
boot animation is dithered and scaled
Fix NdefRecord byte-stream constructor.
PopupWindow dismiss() can get into a recursive loop.
Fold WiMAX state into the mobile RSSI.
Remove dedicated wimax icon to fix RSSI layout.
da96f8ac2c1c35a54f3f36e6d776cb386a251d03 11-Nov-2011 Romain Guy <romainguy@google.com> Discard framebuffer rendering queues when discarding layers
Bug #5581817

Change-Id: If612846ec5f7793710fc4df152791fb32c506551
ndroid_view_GLES20Canvas.cpp
99898de902c36687be126b33ee8a4858d26871ac 11-Nov-2011 Martijn Coenen <maco@google.com> Merge "Fix NdefRecord byte-stream constructor." into ics-mr1
50a66f0e9c5a85a6af4a99eb66656a69eba24572 11-Nov-2011 Romain Guy <romainguy@google.com> Merge "Terminate EGL when an app goes in the background" into ics-mr1
8ff6b9ebeeb24a6161ec6098e6bfdf8790ee5695 10-Nov-2011 Romain Guy <romainguy@google.com> Terminate EGL when an app goes in the background

This does not happen on high end gfx devices. This happens
only if only one EGL context is initialized in the current
process.

Change-Id: Ibd1737efdf84eef8a84108b05795440d1ae9964e
ndroid.mk
ndroid_view_GLES20Canvas.cpp
om_google_android_gles_jni_EGLImpl.cpp
ef565c43939d9ce417f0064852badb91ae669e77 11-Nov-2011 Martijn Coenen <maco@google.com> Fix NdefRecord byte-stream constructor.

Bug: 5601404
Change-Id: I30fada97487829a8b2ccc1a1e7a32837c29ddd70
ndroid_nfc_NdefRecord.cpp
07c0fe4c4fdb13d8e743c80394eddd292631f735 11-Nov-2011 Romain Guy <romainguy@google.com> am f1062114: am a3cc20ff: Merge "Initialize egl_cache with an app writeable file" into ics-mr1

* commit 'f1062114874f1cf46de479031d9ad3ad3cae1131':
Initialize egl_cache with an app writeable file
a3cc20fff073bd3ca588f1e61f0f7034aecf3ebb 11-Nov-2011 Romain Guy <romainguy@google.com> Merge "Initialize egl_cache with an app writeable file" into ics-mr1
a95826582773a194ed7fb66bc29c9b82fe9bb8d1 10-Nov-2011 Romain Guy <romainguy@google.com> Initialize egl_cache with an app writeable file

Change-Id: I5dda234feab0fedd6e4179a80715ae20dee1c833
ndroid.mk
ndroidRuntime.cpp
ndroid_view_HardwareRenderer.cpp
fe2d4abdd917aa98baf56d4b903999c2d8b68a7d 10-Nov-2011 Jeff Brown <jeffbrown@google.com> am 698d3de6: am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1

* commit '698d3de681bf85047675baa61f9b28961f3d6862':
Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
0bde66a837542e5bd901d8b8e47c5bd7c4c99fe4 07-Nov-2011 Jeff Brown <jeffbrown@google.com> Throw TransactionTooLargeException when Binder transaction fails.
Bug: 5578022

Previously, Binder transactions failed silently, which caused
problems because apps would carry on assuming that the operation
had succeeded. Often, the apps would crash soon due to a violated
invariant, but sometimes they managed to do some damage first...

Change-Id: Ia9cc98b3b761a8160e7c4e87507860b5912c0451
ndroid_util_Binder.cpp
208d4592f6e8db90eab30cfca3dc294731258d1c 09-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix potential crash when shaping Hebrew with bold

- make code more resilient
- make correct initialization of gHebrewRegularTypeface

Change-Id: I97e98d36b830ad35979184c1459e8c8503eb3d28
ndroid/graphics/HarfbuzzSkia.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
e187a2f55fe8684c853a0701cbc4a71392f437e0 08-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5559439 Bogus tab title in browser

- no need to shigt glyph IDs if we are a "common" script
- also code cleaning (suppress dead code)

Change-Id: I17bcf960f925a897a30894a3c581053f7fe5905f
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
4f4b83c50c67d4520af3d5b4733b1627208275ce 02-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> am 07b4b314: am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

* commit '07b4b3145333bc8ece9fdbb68ade726b3d6485cd':
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
380f763e530249bde23cff5a05887e6a9a4764a5 02-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> am 852d72b2: am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0

* commit '852d72b28e6d7d0e6372a9b544641817338002e6':
Add cdma_rmnet4 to list of monitored interfaces
07b4b3145333bc8ece9fdbb68ade726b3d6485cd 02-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

* commit 'bcf05a69090f342d328f1537d1d83406b883290b':
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
bcf05a69090f342d328f1537d1d83406b883290b 02-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

- make single run case non verbose

Change-Id: I5c3b87aeb613697233290ddecac3ca00f58f8313
ndroid/graphics/TextLayoutCache.cpp
ef9bb3c3ea3aa08071ea0c32a505b379c322e5b5 17-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5438102 Double Arabic harakat overlap instead of stack In TextView

IMPORTANT: this change needs two patches for Harfbuzz:
- one concerning hb_utf16_script_run_prev() which was not returning the correct "previous" script
- one for the "script_properties" table that was missing Arabic code point ranges and declaring
HB_Script_Inherited instead of HB_Script_Arabic

The current change is doing the following:
- pass the correct typeface for Harbuzz shaping (depending on the script of the run)
- offset correctly the glyphIDs returned by Harfbuzz

We need to offset the glyphsID as Harfbuzz will return local glyphIDs (meaning in the
local range of the font used for shapping).

We then cannot use those glyphIDs when we are using a fallback Font (Arabic, Hebrews...)
because the FontRenderer needs glyphIDs in the range of all the Fonts (including the fallbacks)

Change-Id: I494897435bbc59293b02392ee2059cebcdf0e571
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
3b8d33b131956f3a1b41c15dbe07b1b2d7f44086 01-Nov-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
852d72b28e6d7d0e6372a9b544641817338002e6 01-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0

* commit 'bd9b1528051a1b257768fdbc5077a2d4473b02dd':
Add cdma_rmnet4 to list of monitored interfaces
bd9b1528051a1b257768fdbc5077a2d4473b02dd 01-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
904221a342fe977fe05270b7dde6ac94d13383f6 25-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE

- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
ndroid/graphics/TextLayoutCache.cpp
57c8ac6e13cc1876f5ae64dd3db8f5ef324732d7 01-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> Add cdma_rmnet4 to list of monitored interfaces

Lets the data traffic arrows work on LTE device on 1x,
but also lets telephony monitor for hung radios on 1X.

bug:5531630
Change-Id: I9fa25a5223afaa2e37373668c899ac28a95783fa
ndroid_net_TrafficStats.cpp
26e9ee28decfe934f57f6e8dcaf5620b5502e926 25-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE

- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
ndroid/graphics/TextLayoutCache.cpp
ad41b7c0d42b34a039bd9055f2134f8708d0ee67 31-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5504346 Hung in native_getTextRunAdvances"
5beeda08a7bd300ec22daaa9ae4e2d02a8c121ad 25-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5504346 Hung in native_getTextRunAdvances

- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
ndroid/graphics/TextLayoutCache.cpp
bce45617083209583d61afbea50994f2cdcda459 30-Oct-2011 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 2d280f75 to ics-mr1

Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2 28-Oct-2011 Jeff Brown <jeffbrown@google.com> Improve the slow query instrumentation.

On user-debug and eng builds, you can set the
"db.log.slow_query_threshold" system property to queries that
take longer than the specified number of milliseconds.
Set it to 0 to log all queries.

This property has been around for a while but it was implemented
poorly. In particular, it *changed* the behavior of the query
by calling getCount() while holding the Db connection.
In normal operation, the query will not actually run until later.

By putting the timing logic into fillWindow() instead, we ensure
that we only measure queries that actually ran. We also capture
cases where the cursor window gets filled multiple times.

Bug: 5520301
Change-Id: I174f5e1ea15831a1d22a36e9a804d7755f230b38
ndroid_database_CursorWindow.cpp
650de3dcfcbc7635da3c070410ef1dc4027ae464 27-Oct-2011 Jeff Brown <jeffbrown@google.com> Optimize fillWindow to improve reverse-seek performance.
Bug: 5520301

When an application requests a row from a SQLiteCursor that
is not in the window, instead of filling from the requested
row position onwards, fill from a little bit ahead of the
requested row position.

This fixes a problem with applications that seek backwards
in large cursor windows. Previously the application could
end up refilling the window every time it moved back
one position.

We try to fill about 1/3 before the requested position and
2/3 after which substantially improves scrolling responsiveness
when the list is bound to a data set that does not fit
entirely within one cursor window.

Change-Id: I168ff1d3aed1a41ac96267be34a026c108590e52
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteQuery.cpp
71f2cf116aab893e224056c38ab146bd1538dd3e 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
ndroidRuntime.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_bluetooth_common.cpp
ndroid_database_SQLiteCompiledSql.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_hardware_Camera.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_ToneGenerator.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
om_android_internal_content_NativeLibraryHelper.cpp
28d9f024e043817212b15f04128d0464330502ea 12-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/141576

Bug: 5449033
Change-Id: I42575e7c29cf1c0f465c357a5c97ab118df6f473
ndroid/graphics/TextLayout.cpp
ndroid_app_NativeActivity.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_nfc.h
44cd3f8f3daf45f85f6e977dcf28f75287fbb25b 21-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix compilation issue when DEBUG_GLYPHS define is activated"
a99ed6284eac0b00686ca60c595a0b98beddcb79 14-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix compilation issue when DEBUG_GLYPHS define is activated

Change-Id: I61693952ffdc02f77058311fc982fbbf8df24c6c
ndroid/graphics/TextLayoutCache.cpp
2c183fa5bf666c5f6b2221fd04db8ee3c738d1fd 19-Oct-2011 Romain Guy <romainguy@google.com> Notify a Bitmap is has changed when calling copyPixelFromBuffer

Change-Id: Ibff1a162edfe11473c5c167e764405bf83ec5822
ndroid/graphics/Bitmap.cpp
5e5d6d8ba04d7579df840cda055cd5dfa9d7666f 13-Oct-2011 Jeff Brown <jeffbrown@google.com> Deprecate local-only CursorWindows.

There is no difference and has never really been a difference
between local-only and remotable CursorWindows. By removing the
distinction officially in the API, we will make it easier to
implement CrossProcessCursor correctly. CrossProcessCursor
is problematic currently because it's not clear whether a call
to getWindow() will return a local-only window or a remotable window.
As a result, the bulk cursor adaptor has special case handling
for AbstractWindowedCursors vs. ordinary CrossProcessCursors
so that it can set a remotable window before the cursor fills it.
All these problems go away if we just forget about local-only
windows being special in any way.

Change-Id: Ie59f517968e33d0ecb239c3c4f60206495e8f376
ndroid_database_CursorWindow.cpp
0cde89f5f025b7826be009ebb9673b970e180e32 10-Oct-2011 Jeff Brown <jeffbrown@google.com> Use ashmem for CursorWindows.
Bug: 5332296

The memory dealer introduces additional delays for reclaiming
the memory owned by CursorWindows because the Binder object must
be finalized. Using ashmem instead gives CursorWindow more
direct control over the lifetime of the shared memory region.

The provider now allocates the CursorWindows and returns them
to clients with a read-only protection bit set on the ashmem
region.

Improved the encapsulation of CursorWindow. Callers shouldn't
need to care about details like how string fields are allocated.

Removed the compile-time configuration of string and numeric
storage modes to remove some dead weight.

Change-Id: I07c2bc2a9c573d7e435dcaecd269d25ea9807acd
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteQuery.cpp
270928bd4a1db1dc0d989f4e9897a81ab865e30e 08-Oct-2011 Jeff Brown <jeffbrown@google.com> Merge changes Idbfeb3cc,I03e8e2e7,Iff9eed78

* changes:
Fix regression in CursorWindow.getString() Bug: 5332296
Clean up CursorWindow lifetime. Bug: 5332296
Fix regression in CursorWindow.copyStingToBuffer. Bug: 5332296
4cc8bafb4b10614dc881ed8121ce4754811e161d 08-Oct-2011 Jeff Brown <jeffbrown@google.com> Merge "Restore broken CursorWindow.getType behavior. Bug: 5430009"
715311fa5aeb39fd0904209e1428a3656c721c3d 07-Oct-2011 Jeff Brown <jeffbrown@google.com> Fix regression in CursorWindow.getString()
Bug: 5332296

NewStringUTF expects modified UTF-8, so it barfs on UTF-8 strings
that contain high codepoints. Even though it results in an extra
copy being performed, first convert to UTF-16, then call NewString.

Change-Id: Idbfeb3cc2c4b731834e4482848dcac2fa33ec2d0
ndroid_database_CursorWindow.cpp
7ce745248d4de0e6543a559c93423df899832100 07-Oct-2011 Jeff Brown <jeffbrown@google.com> Clean up CursorWindow lifetime.
Bug: 5332296

Removed dead code in SQLiteCursor related to the use of a background
query thread. This code could result in CursorWindows being modified
concurrently or used after free. This code is broken, unused and
is just in the way.

Added comments to explain how CursorWindow ownership is
supposed to work for AbstractWindowedCursors. (There are still cases
where cursor windows get dropped on the floor without being closed.
Those will be taken care of in a subsequent patch.)

Cleaned up SQLiteQuery.fillWindow to eliminate duplicate code and
remove bits that were only needed for background loading, like
returning -1.

Change-Id: I03e8e2e73ff0c11df76d63f57df4c5ada06ae1cb
ndroid_database_SQLiteQuery.cpp
d0ff68da6a606602235fb8749473999e3d1bde53 07-Oct-2011 Jeff Brown <jeffbrown@google.com> Fix regression in CursorWindow.copyStingToBuffer.
Bug: 5332296

Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
ndroid_database_CursorWindow.cpp
aa32c30b81134fc7ebd9408f4757d1dc4410f338 07-Oct-2011 Jeff Brown <jeffbrown@google.com> Restore broken CursorWindow.getType behavior.
Bug: 5430009

Some CTS tests try to call getType on fields in empty
cursor windows or with out of bound column indices (-1).
Restoring the previous behavior of returning FIELD_TYPE_NULL
instead of throwing. Fix this later.

Change-Id: I782bd02012474e7dabc5bb7ea2dc45e8b0c7ef25
ndroid_database_CursorWindow.cpp
75b071e74437535b827125da00dabed8e6619e40 07-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS latest build is wrong"
5c863f741e8e484bb39decd516c9fa4c6322e671 06-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS latest build is wrong

- welcome back start / count
- goodbye log clusters
- clean Paint code
- make private some functions as they should be
- improve memory allocation (create only one Shaper and reuse it for for shaping the runs in
the same input text)

Change-Id: I89a320c7f041319851308c8c9a919fbeafa82cdd
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid_view_GLES20Canvas.cpp
3bc6bbc92cd2095f42039b5aadd0a14d0e5d9230 06-Oct-2011 Jeff Brown <jeffbrown@google.com> Clean up CursorWindow code.
Bug: 5332296

The code is functionally equivalent, but a little more efficient
and much easier to maintain.

Change-Id: I90670a13799df05831843a5137ab234929281b7c
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteQuery.cpp
c04db7e06737c5b9bae276ac462858d44002672e 04-Oct-2011 Dianne Hackborn <hackbod@google.com> Fix handling of "allow fds" state.

Didn't take into account nesting of bundles. Boo.

Change-Id: Ic8cf21ad8d6f4938a3e105128624c9d162310d01
ndroid_util_Binder.cpp
6579a9d6fe2302fa149452f66c4062ebc60c2523 24-Sep-2011 Jeff Brown <jeffbrown@google.com> Transfer large bitmaps using ashmem.
Bug: 5224703

Change-Id: If385a66adf4c6179a0bb49c0e6d09a9567e23808
ndroid/graphics/Bitmap.cpp
9ecebbfbf768fd63e9a6c9a09c86d81c7737ee2d 29-Sep-2011 Dianne Hackborn <hackbod@google.com> Add mechanism for Parcel to not allow FDs to be written to it.

This is to help implement issue #5224703.

Change-Id: I026a5890495537d15b57fe61227a640aac806d46
ndroid_util_Binder.cpp
8ebf1efd66516340bedbf0d0a19d5e96cc28fa20 03-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix potential issue with the TextLayoutCache with glyphs"
155fa38a71ff11e1617b1e3dfda770543df8eb1d 01-Oct-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix potential issue with the TextLayoutCache with glyphs

- there may be a mapping of one char to many glyphs

Change-Id: I48846d176d61dc8d8e513ca144fdf8ad805e63b7
ndroid/graphics/TextLayoutCache.cpp
717060b076350ea811153290281075396a554fed 28-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Improve TextLayoutCache performances a bit

- the gain is about 5% and the timing is more stable
- use compare_type() and strictly_order_type()

Change-Id: Iab81869a8ba461ce786a468b6c59b8f34e8db838
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
8f0bb4bc1715ad9aaa486d010ea870ec2f43d245 28-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs"
cbb62bb81807ff83a0887b90111218d81a3f57df 27-Sep-2011 Irfan Sheriff <isheriff@google.com> Merge "Switch to cfg based signal_poll command"
5293cea4e05556b4144d9487b47282a21c9f6941 27-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs

- make the log clusters happy

Change-Id: I73ca9512f0ca02549dad5270d6ec198ae9b00a4e
ndroid/graphics/TextLayoutCache.cpp
921df5cbc44c00abe85f04093afe7692e73d490a 27-Sep-2011 Irfan Sheriff <isheriff@google.com> Switch to cfg based signal_poll command

Bug: 5352916
Change-Id: Id2ba7091a5e4cc4c1e14aa2c49e5b943519019bf
ndroid_net_wifi_Wifi.cpp
b6377170960d40e66858d8b4d335a95eac773762 25-Sep-2011 Bart Sears <bsears@google.com> Revert "Transfer large bitmaps using ashmem. Bug: 5224703"

This reverts commit 56c58f66b97d22fe7e7de1f7d9548bcbe1973029

This CL was causing the browser to crash when adding bookmarks, visiting the bookmarks page, and sharing pages (see bug http://b/issue?id=5369231
ndroid/graphics/Bitmap.cpp
56c58f66b97d22fe7e7de1f7d9548bcbe1973029 24-Sep-2011 Jeff Brown <jeffbrown@google.com> Transfer large bitmaps using ashmem.
Bug: 5224703

Change-Id: Ic7481dd9f173986f085a8bbdcc59bbe9830d7a44
ndroid/graphics/Bitmap.cpp
651e46679b2d5dc7809fdb2b57e15a9ba2992db4 23-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"
54303e6b2361e2fbfe889f4464074c89763f7ab1 23-Sep-2011 Christopher Tate <ctate@google.com> am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom

* commit 'b20d378cec09da18301eb9c33bc88251beb81042':
Don't crash during full backup when CheckJNI is enabled
ca1605e6e342a8e17859daf03bd23fdad1ad83a0 23-Sep-2011 Christopher Tate <ctate@google.com> Don't crash during full backup when CheckJNI is enabled

It's not okay to pass null to JNI methods and trust that it will just
back off and return a null result cleanly. Fixes bug 5361822 .

Change-Id: Id8a17b958fd183d55cb6475f394e158c13aae2ea
ndroid_app_backup_FullBackup.cpp
79df5323e7ed541b854cea5684a89e8be8c2dfc9 20-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits

- makes TextLayoutCache not carring about start/count. Basically he will cache the result for
the full string and gives back the "chunk" corresponding to start/count
- changed the TextLayoutCacheValue API to take start/count parameters
- add Harfbuzz LogClusters in TextLayoutCacheValue as it is needed for extracting the start/count "chunk"

Change-Id: I4b38a4442428606de9a093303bbbe98181e1f89c
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid_view_GLES20Canvas.cpp
a08ff8f3a74fdaff627bbe601362f67035116d85 21-Sep-2011 Wu-cheng Li <wuchengli@google.com> am 5f0ef5fb: Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.

* commit '5f0ef5fb0c2e65ca3d0aa4fcd2b300d4cd0a2b4b':
Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
5f0ef5fb0c2e65ca3d0aa4fcd2b300d4cd0a2b4b 21-Sep-2011 Wu-cheng Li <wuchengli@google.com> Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.

mManualBufferMode is only for CAMERA_MSG_PREVIEW_FRAME. If it is
CAMERA_MSG_COMPRESSED_IMAGE, a new byte array should be allocated.

bug:5340480

Change-Id: I4f33bd6297bfd30505e0e15ae46012ea44e85962
ndroid_hardware_Camera.cpp
7aac2979605f4811cf096f7c62d363381c68f6b2 20-Sep-2011 Jeff Brown <jeffbrown@google.com> TextLayoutCacheKey needs to store start and count.

Bad merge.

Change-Id: Id6507b3a7e35808a6d34501a45d79fcb7470657d
ndroid/graphics/TextLayoutCache.cpp
4dd99e5912c73d5a9db165cefd4852b51ea438e8 19-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> TextLayoutCache code refactoring

- use vector (instead of array) for advances and glyphs
- reverse glyphs directly in computeRunValuesWithHarfbuzz() (instead of reversing them after)

Change-Id: I716a8f914fd043818d7cb80cca76ee5fb0effb96
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
e0d558ac92cd9e550b3d08bf09d9bb12c2a506c6 19-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix potential leak in TextLayouCache"
54dc642cc1e188b9eeecadb648b9e8c610f4b857 19-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Make TextLayoutCache no more dependent on ICU

- move ICU call to TextLayout

Change-Id: Id5a21e7b69e484536cfb5b86fbb0c112fb661dfa
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
e74fef3b55dc1b5daf40b3a6aea857582071560f 18-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix potential leak in TextLayouCache

- need a copy constructor for the key as the GenerationCache we are using
is actually a KeyedVector<K, sp<Entry<K, V> > >
- use the getText() API to access the text in the cache key

Change-Id: I5b60ebc062b62308ed7ac1284cfe2a9f28e2b8b1
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
9c418dbc56efd334c68872d281f75138e16eae46 18-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Revert "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"

This reverts commit d686d76814f18061e06995df0d5de9feb9f70a7e
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid_view_GLES20Canvas.cpp
d686d76814f18061e06995df0d5de9feb9f70a7e 14-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits

- makes TextLayoutCache not carring about start/count. Basically he will cache the result for
the full string and gives back the "chunk" corresponding to start/count
- changed the TextLayoutCacheValue API to take start/count parameters
- added the Harfbuzz LogClusters in TextLayoutCacheValue as it is needed for extracting the start/count "chunk"
- fix potential issue of cache key leaking

Change-Id: I9276f9bec744e8de36349acfba8429f7c6f83394
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid_view_GLES20Canvas.cpp
98a4f7e7e12effb78b3d1035e5a670ccbbf5bca1 03-Sep-2011 JP Abgrall <jpa@google.com> NetworkManagement SocketTagger: Migrate QTagUid support to JNI.

* Instead of javaland trying to write commands to
/proc/net/xt_qtaguid/ctrl
use the libcutils/qtaguid.c support via JNI.
* Get rid of tagToKernel() handled by qtaguid library.

Requires libcutils changes from c/132538/

Change-Id: I9de5b3fa4a596c56835024c6d376769a0eea7db1
ndroid.mk
ndroidRuntime.cpp
ndroid_server_NetworkManagementSocketTagger.cpp
93578af23ecfb8f5b6001346d63c6214cdec5d17 15-Sep-2011 Jeff Brown <jeffbrown@google.com> Merge "Velocity Tracker II: The Revenge of Velocity Tracker Bug: 5265529"
ec537457cd2869e52b9b2c99e8c01dd96a9682e2 15-Sep-2011 Dianne Hackborn <hackbod@google.com> Fix issue #5155678: Portrait > Landscape full-screen transition...

...mode cuts off screen rendering

The code for limiting application window sizes to not include the
navigation bar was dead. Now it is back.

Change-Id: Ic0bde56e3300fd0d9d225e19d8de2766d07e8780
ndroid_view_Display.cpp
b59ab9f41faafb358afb4f951de96f34a656e0b4 14-Sep-2011 Jeff Brown <jeffbrown@google.com> Velocity Tracker II: The Revenge of Velocity Tracker
Bug: 5265529

Rewrote the velocity tracker to fit a polynomial curve
to pointer movements using least squares linear regression.
The velocity is simply the first derivative of this polynomial.

Clients can also obtain an Estimator that describes the
complete terms of the estimating polynomial including
the coefficient of determination which provides a measure
of the quality of the fit (confidence).

Enhanced PointerLocation to display the movement curve predicted
by the estimator in addition to the velocity vector.

By default, the algorithm computes a 2nd degree (quadratic)
polynomial based on a 100ms recent history horizon.

Change-Id: Id377bef44117fce68fee2c41f90134ce3224d3a1
ndroid_view_VelocityTracker.cpp
444457306041f00331283d0d470434d4922418f8 14-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix some TextLayoutCache issues"
51f383d65f9ee3c7d73d0508b576550e7998c5b5 14-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix some TextLayoutCache issues

- wrong ContextCount was passed
- better logs

Change-Id: Ie78ba70f98f3cf017c168ab8848cc080fc175f31
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayoutCache.cpp
62f7c9737f0270b8ca1baeb3739ef3c8ef89d186 13-Sep-2011 Matthew Xie <mattx@google.com> Fix a compile error when debug is turned on

logv uses a variable that is declared after its use

Change-Id: Id5c09698e4a0a91befa3ce2f60ce02ec28733889
ndroid_server_BluetoothEventLoop.cpp
b5d2d4526cd2c0117b7a33b1297ac683c37ac5c7 07-Sep-2011 Jaikumar Ganesh <jaikumar@google.com> Add error codes for channel disconnection / connection.

Channel connection / disconnection was handled as boolean,
doesn't capture all the values. Also make it asynchronous
instead of the dbus call being synchronous.

Change-Id: If30177b9f93b7c83f162fbbc1233edf3e46dbfea
ndroid_bluetooth_common.h
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
eb9d34630f74d0260690287f2df57c0cd3d7ba1d 01-Sep-2011 Jaikumar Ganesh <jaikumar@google.com> Make Bluetooth Health APIs public.

Fix a few bugs:
a) Pass a integer token to identify the channel.
b) Close fds in case of errors.

Change-Id: I2046787be5008769435f2f72a5bd67c19b749da0
ndroid_server_BluetoothService.cpp
163268b3a8d4dd7e650e6c540f832bf60f6bf4c9 08-Sep-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5274332 TextLayoutCache is having multiple instances

- also fix the missing LOG_TAG define

Change-Id: I25e96d1ba372e84768604f18702e0724fdecefb0
ndroid/graphics/Canvas.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ndroid_view_GLES20Canvas.cpp
b695741330f56405f559a0fb2df89a21dbbb3b1f 01-Sep-2011 Jeff Brown <jeffbrown@google.com> Merge "Fix JNI leak in copyStringToBuffer Bug: 5244396"
f786b6ca5df079f5cc84838251137f9b65ae10c9 01-Sep-2011 Jeff Brown <jeffbrown@google.com> Fix JNI leak in copyStringToBuffer
Bug: 5244396

Code was acquiring the char array twice for FIELD_TYPE_INTEGER
or FIELD_TYPE_FLOAT but only releasing it once.

Removed the redundant calls to GetCharArrayElements.

Change-Id: If767d3295d5a663a823e5ca0cd979379a3ccd024
ndroid_database_CursorWindow.cpp
9d4bc852ea459c2a4347a87ce0357b3328a25db8 31-Aug-2011 Jeff Brown <jeffbrown@google.com> Merge "Fix input channel leak. Bug: 5156144"
cc4f7db698f88b633a286d8ab1105b28a474cd09 31-Aug-2011 Jeff Brown <jeffbrown@google.com> Fix input channel leak.
Bug: 5156144

Input channels could leak or simply live longer than they should
in some cases.

1. Monitor channels (used by the pointer location overlay) are never
unregistered, so they would leak.

Added code to handle failures in the receive callback by closing
the input channel.

2. The DragState held onto its input window and application handles
even after the input channel was disposed.

Added code to null these handles out when they are no longer needed.

3. Input channels previously used as input event targets would stick
around until the targets were cleared (usually on the next
event).

Added code to detect when the input dispatcher is in
an idle state and to proactively clear the targets then
to ensure that resources are released promptly.

4. Native input window handles held onto the input channel even
after the input window was removed from the input dispatcher.
Consequently, the input channel would not be disposed until
the input window handle itself was freed. Since the input
window handle is held from managed code, this meant that the
window's input channel could stick around until the next GC.

Refactored the input window handle to separate the properties
(info) and identify (handle) state into different objects.
Then modified the dispatcher to release the properties (info)
when no longer needed, including the input channel.

7. The pointer location overlay does not actually use its
standard input channel, only the monitor input channel.

Added INPUT_FEATURE_NO_INPUT_CHANNEL to allow windows to
request that they not be provided with an input channel
at all.

Improved some of the error handling logic to emit the status
code as part of the exception message.

Change-Id: I01988d4391a70c6678c8b0e936ca051af680b1a5
ndroid_view_InputChannel.cpp
ndroid_view_InputQueue.cpp
c21843a8b5c395cbaae6db0f786bdee556075f5d 31-Aug-2011 Mathias Agopian <mathias@google.com> Merge "fix Surface positions are not floats"
34cb9f2a960c4173bdafb4b8a2444c1bca4c5f0d 31-Aug-2011 Mathias Agopian <mathias@google.com> fix Surface positions are not floats

Added Surface.setPosition(float, float) which allows to set a surface's
position in float.

Bug: 5239859
Change-Id: I903aef4ad5b5999142202fb8ea30fe216d805711
ndroid_view_Surface.cpp
0d4a792e8d5ebfd182acc8db7cd9b40f3bc51640 30-Aug-2011 Christopher Tate <ctate@google.com> Fix JNI for warning about failure to unlink DeathRecipients

We now (a) use the right Class getName() method, and (b) look it
up once at setup time rather than doing that lookup every time we
want to emit the warning. Verified to work properly and no longer
crash or throw or otherwise complain.

Change-Id: If0767f8845588ba7f34bac21474f4e2ad5c111d6
ndroid_util_Binder.cpp
335e40c0f1c3aec550e61fa159130527fda597b6 30-Aug-2011 Irfan Sheriff <isheriff@google.com> Merge "Use seperate config file for p2p"
f42c39b3d188ebb3ba9003cffc530717829fe874 26-Aug-2011 Irfan Sheriff <isheriff@google.com> Use seperate config file for p2p

Keep p2p and sta config seperate to avoid conflicts.

Bug: 5002384
Change-Id: I8f8fc5f984f4f91f9ece4012bf536daa5cc00bba
ndroid_net_wifi_Wifi.cpp
ac5e350e567c7a257ced37dd4e8ca0f4c95f7e81 26-Aug-2011 Christopher Tate <ctate@google.com> Warn if we're tearing down "live" DeathRecipient content [take 2]

If the native-side bookkeeping still has strong references to VM-side
DeathRecipient objects at the time when it's being torn down, that
suggests that the app is doing unwholesome. Log a warning to that
effect, with the class name of the objects to try to help the developer
figure out what they're mishandling.

Fixes bug 5202777 -- in particular, it no longer logs in the
working-as-intended case following delivery of the death notices,
when we've got the existing list shell but the weak refs have properly
cleared. Also step down from "error" to "warning" logging as befits
the nature of the actual situation now being described.

This new patch fixes the JNI bug present in the earlier version.

Change-Id: I095862777a8d0e3905cb7f416af658878280041d
ndroid_util_Binder.cpp
189887e0ae171c1b7601991442104a30e56c50ab 25-Aug-2011 Romain Guy <romainguy@google.com> Implement saveLayer*() correctly

When the Rect parameter is null, the layer's bounds must match the
clip rect.

Change-Id: Idbb3973af039bf319e840d1095b7037bf1015f35
ndroid_view_GLES20Canvas.cpp
2611f89ab4f1119b96123edb2cd6d8d8139c03c4 24-Aug-2011 Christopher Tate <ctate@google.com> Warn only if we're tearing down "live" DeathRecipient content

If the native-side bookkeeping still has strong references to VM-side
DeathRecipient objects at the time when it's being torn down, that
suggests that the app is doing unwholesome. Log a warning to that
effect, with the class name of the objects to try to help the developer
figure out what they're mishandling.

Fixes bug 5202777 -- in particular, it no longer logs in the
working-as-intended case following delivery of the death notices,
when we've got the existing list shell but the weak refs have properly
cleared. Also step down from "error" to "warning" logging as befits
the nature of the actual situation now being described.

Change-Id: Ic393560824800fbd912a6e69692c65be4fcc7544
ndroid_util_Binder.cpp
110be0f1d9e66e0a40a0084db5ebc4285194a8d7 22-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Listen to the right Bluez signal for Channel deletion."
ae37d06dd0f844fe397b76210e6d145abf4210b6 21-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Listen to the right Bluez signal for Channel deletion.

Health device channel deletion was looking at the
wrong dbus interface.

Reported by: Sungjun<sj222.choi@samsung.com>

Change-Id: I48e7c464fdcdd8bd47dc8cc9cd55b14ba8ea6bbf
ndroid_server_BluetoothEventLoop.cpp
067bb3b44357e09628ae63a8e7cf27f93b811b84 19-Aug-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Update TextLayout logging"
abb0f299fdc72755a18cf8848d57919890f0cd42 19-Aug-2011 Fabrice Di Meglio <fdimeglio@google.com> Update TextLayout logging

- centralize logging into TextLayoutCache
- add offset logging

Change-Id: I52f229b2a8aed121715b37a5a42936875b23f3c9
ndroid/graphics/Canvas.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid_view_GLES20Canvas.cpp
eeb22142137d8309f6f010b10f504e23161190f4 19-Aug-2011 Christopher Tate <ctate@google.com> Merge "Stop leaking DeathRecipient and BinderProxy instances"
86284c60b52c40f027427aa32dbe8dc0899b63d5 18-Aug-2011 Christopher Tate <ctate@google.com> Stop leaking DeathRecipient and BinderProxy instances

The native-side death recipient object holds a global reference
to the DVM-side DeathRecipient instance. This is necessary so
that the DeathRecipient isn't GC'd early in the case when the
caller of linkToDeath() doesn't retain their own reference to
the recipient instance.

However, that global reference was never being released in
association with the delivery of the actual binderDied() event.
In that case, if the death recipient did not explicitly call
unlinkToDeath() themselves, the hard global reference was
maintained and a hard-reference cycle was perpetuated, crossing
the native <-> DVM boundary. This was visible as a gradual
leakage of DVM-side DeathRecipient and BinderProxy instances.

The one problematic constraint is that it needs to be valid to
call unlinkToDeath() cleanly *after* binderDied() is delivered
to the given recipient; that requires that we have the hard reference
linkage described above. The fix is to replace the hard global
reference with a weak reference to the DVM-side DeathRecipient
after we deliver binderDied() to that recipient. In the case
where the caller has retained their own reference to the instance
(i.e. they might still call unlinkToDeath() on it later), the
weak reference stays live and everything works cleanly (and is
reaped explicitly by unlinkToDeath() as usual). In the case where
the caller has *not* retained the instance to call unlinkToDeath()
themselves, demoting to a weak DeathRecipient reference allows
the DeathRecipient to be GC'd, which in turn frees the DVM-side
BinderProxy it's tied to, and so on around the chain to free
all of the associated allocations.

Fixes bug 5174537

Change-Id: Ia4ad76e667140cc2a1b74508bbba652ab31ab876
ndroid_util_Binder.cpp
5293bfa57a5dbc7982b3dbb5992e0acef9362226 18-Aug-2011 Jaikumar Ganesh <jaikumarg@android.com> am 294539df: am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"

* commit '294539df2c05eb62c417e25b2e1c8a71474b09e6':
Bluetooth event loop dispatches dbus data on wakeup
294539df2c05eb62c417e25b2e1c8a71474b09e6 18-Aug-2011 Jaikumar Ganesh <jaikumarg@android.com> am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"

* commit '3e9413473f87ad17f3767ffbb0c57046c2db29be':
Bluetooth event loop dispatches dbus data on wakeup
c5f7a851b33d28db707f5aea2629298f8b76b036 17-Aug-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic"
596072306191932c3a7f845b549795380eeb4c53 17-Aug-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic

- revert back to old working code where the script was setup for Harfbuzz\
depending of the direction of the run

Change-Id: I7ec740732b51ccf05b6744b7f9d2fcb35555478d
ndroid/graphics/TextLayoutCache.cpp
302a9df1d50373c82923bb84ff665dfce584fb22 16-Aug-2011 Romain Guy <romainguy@google.com> Add an API to set the transform on a TextureView's surface texture.
Bug #5156689

Change-Id: I635a625885c9b832a60d44ece0de7613ceb84109
ndroid_view_GLES20Canvas.cpp
f4c6404f50b8a2da601f97bfcd86ab744589b28e 20-Jun-2011 Albert Mojir <albert.mojir@sonyericsson.com> Bluetooth event loop dispatches dbus data on wakeup

On some occasions when the event loop thread and a binder thread are
both waiting for a message from dbus, both threads are not woken up
when a message is received. This causes applications not receiving
responses or events. This happens because both threads are listening
to same socket and both threads are not guaranteed to wake up when
there is data to read. To fix this we subscribe to callback to wake
the eventloop when an message is added to incoming queue.

To reproduce the issue:
1. Activate BT
2. Make phone Discoverable
3. Clock is ticking down from 120s
4. At 20s tap the setting again
5. Crash due to keyDispatchingTimedOut
6. Not possible to scan for other devices or making your phone discoverable again
7. Restart necessary

Tell tale sign:
07-25 16:37:12.240 E/ActivityManager( 262): ANR in com.android.settings
(com.android.settings/.bluetooth.BluetoothSettings)
07-25 16:37:12.240 E/ActivityManager( 262): Reason: keyDispatchingTimedOut

Test case to verify this patch:
android.bluetooth.BluetoothStressTest#testDiscoverable

Change-Id: I7696b5722805e85cd0204ce2597e91594cbe6789
ndroid_server_BluetoothEventLoop.cpp
be414332a11b539b8b7751f31a0ef584f11b48f6 14-Aug-2011 Elliott Hughes <enh@google.com> Fix android.text.format.Time to use GetBooleanField on its boolean field.

Bug: 5162851
Change-Id: I49b1429e86ffa91fbfb8b4c9d1a0c6d30c72621e
ndroid_text_format_Time.cpp
f43fa5746ee5b81a6e386d36594094d079ac8160 13-Aug-2011 Dianne Hackborn <hackbod@google.com> Turn off hinting by default for higher density displays.

Also adds an API for apps to control whether hinting is used.

Change-Id: I1a06b06255fbb8d0f02a8ce48c2cd60019088ed3
ndroid/graphics/Paint.cpp
1ee60119c4fa51ebfa781cf5fdc33f192e8551b8 26-Jul-2011 Ted Bonkenburg <tedbo@google.com> Remove ParcelSurfaceTexture and update MediaPlayer

This removes the ParcelSurfaceTexture class since that functionality has been
folded into Surface.java. The change also updates the MediaPlayer to get rid
of setParcelSurfaceTexture() and modifies setTexture() to use the new Surface
functionality in order to simplify the code.

Change-Id: Iafa75ea3188263928128325d8a726786971b4de4
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/ParcelSurfaceTexture.cpp
03f156e96f5b1b9427473197c2de3a8454d7039c 12-Aug-2011 Romain Guy <romainguy@google.com> Merge "Remove unnecessary private API"
9d865512f1a39bac6bed612b24023213d5a1fb1d 12-Aug-2011 Romain Guy <romainguy@google.com> Remove unnecessary private API

Change-Id: I2ecb367528ec0691c07153a3d163b82a6ca33fdf
ndroid_view_GLES20Canvas.cpp
aae7a3d1fb7ea7e7f8c2317e8a51441d5c13f84f 10-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Bluetooth : fix for bluetooth turning on issue.(limit: 64times)"
5ec09727f44d7f284031e0cad2c96c21b2a8399e 06-Aug-2011 hyungseoung.yoo <hyungseoung.yoo@samsung.com> Bluetooth : fix for bluetooth turning on issue.(limit: 64times)

Bluetooth fails to turn on after 64 iterations.

When setUpEventLoop is called, Adapter is not ready yet.
However, we have already added the Dbus match rules. These match
rules are not deleted and we hit the dbus limit.

Change-Id: If207d4d33574685520a852b53a641adfbeb45d43
Author: hyungseoung.yoo <hyungseoung.yoo@samsung.com>
ndroid_server_BluetoothEventLoop.cpp
5de5b1a91e25ef4931661fdd089d7e0e2b7da035 09-Aug-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix Harbuzz shaper for being able to do select other scripts than Common or Arabic

- need to take care of diacritics marks that return HB_Script_Inherited for a script

Change-Id: Icbfea46b305e15849b25410fed07d9cd5dfeb818
ndroid.mk
ndroid/graphics/TextLayoutCache.cpp
6ab90ed017fb52aac4493a2fac897299d345874f 09-Aug-2011 Fabrice Di Meglio <fdimeglio@google.com> Solidify and optimize Paint text related APIs

- better check parameters consistency
- return calls as soon as possible (when null or empty text)

Change-Id: I46744e517b04e3fba0ec37132d7de400177f214b
ndroid/graphics/Paint.cpp
f95761826590a953c927fd93b1e8ef627dbc3e5b 08-Aug-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Revert "Adapt TextLayoutCache for new Harfbuzz scripts""
f09e46e938cd041315f25de3d23560c12c08bf4e 08-Aug-2011 Fabrice Di Meglio <fdimeglio@google.com> Revert "Adapt TextLayoutCache for new Harfbuzz scripts"

This reverts commit 7f4ae758ba4724f7c3031d33ad8e749c11d1e059

This CL created a regression:

#5134317 Arabic Keyboard does not appear
ndroid.mk
ndroid/graphics/TextLayoutCache.cpp
b437e090ec03a2bab10bdfcb9484577a7f34e157 06-Aug-2011 Dianne Hackborn <hackbod@google.com> Improved memory use reporting.

Change-Id: I38e53e6228bba92a142bafeedb5af8df4e4e5724
ndroid_os_Debug.cpp
adc25267f8ba29ccf1408d8840dc9e840e7c65c7 04-Aug-2011 Russell Brenner <russellbrenner@google.com> Merge "Adapt TextLayoutCache for new Harfbuzz scripts"
452f035c31620499563dc9135926f9a6b4d15cae 04-Aug-2011 Mathias Agopian <mathias@google.com> Merge changes I689cb0c0,I09603218

* changes:
Add a 'release' method to the SurfaceTexture public Java API
Mark Window-Manager-specific APIs on android.view.Surface as @hide
ec46b4e1ca89d7c3a9ad70ded58da08b5e19f08f 04-Aug-2011 Mathias Agopian <mathias@google.com> Add a 'release' method to the SurfaceTexture public Java API

Bug: 5063618
Change-Id: I689cb0c01c14e597ccfb4eb0972e64fa570bd4e8
ndroid/graphics/SurfaceTexture.cpp
1ebd74acf9977daa42133507e970dab88e08f0ef 04-Aug-2011 Kenny Root <kroot@google.com> Better error codes for missing files

Make sure that files that don't exist aren't returning bogus 'out of
space' error codes.

Add some Javadoc so I can remember what each thing does in an IDE.

Add copyright header to NativeLibraryHelper

Bug: 3375299
Change-Id: Iac46019160921daca65b21d38897e5165063316e
om_android_internal_content_NativeLibraryHelper.cpp
7f4ae758ba4724f7c3031d33ad8e749c11d1e059 03-Aug-2011 Russell Brenner <russellbrenner@google.com> Adapt TextLayoutCache for new Harfbuzz scripts

The Harfbuzz script setting was wired to HB_Script_Common for left-
to-right text and HB_Script_Arabic for right-to-left. This change
selects from additional scripts using some utility APIs from
Harfbuzz.

Change-Id: I34a6f1e0407c8d122bc968443948e7863d1f91ed
ndroid.mk
ndroid/graphics/TextLayoutCache.cpp
4f7c380d5160a66274c96e1529928149ed9e9624 02-Aug-2011 Derek Sollenberger <djsollen@google.com> Merge "Reverting until we can find a better way to address this issue without affecting nine-patches with large stretchable areas."
09a22e33e7a912ef14982b91f9387f907cc015f5 02-Aug-2011 Derek Sollenberger <djsollen@google.com> Reverting until we can find a better way to address this issue without affecting nine-patches with large stretchable areas.

Revert "Fix NinePatch decoder when the target is smaller than the source."

This reverts commit c4c458c678567b899aae04631570460c5e729512
ndroid/graphics/NinePatchImpl.cpp
bb1e275c0e684dd213f124da77110cdd9d6f090c 29-Jul-2011 Wu-cheng Li <wuchengli@google.com> Pass camera frame metadata from camera service to Java.

bug:4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
ndroid_hardware_Camera.cpp
2a2ec87b55d423ae91385d4e9f51725154b7a272 02-Aug-2011 Jeff Brown <jeffbrown@google.com> Merge "Refactor input reader to add stylus support. Bug: 5064702"
0965a3244b4c3009d08db2e084cdcb681ef66d26 02-Aug-2011 Romain Guy <romainguy@google.com> Allow Canvas.setBitmap() to receive a null Bitmap.

Change-Id: I6096f0b44866e532ccd96a29c816bf34d48c1dc2
ndroid/graphics/Canvas.cpp
569980c349217e5b128e1a4daa7a1446ffaea2da 01-Aug-2011 Matthew Xie <mattx@google.com> Merge "Change setDevicePropertyNative to no block."
be1aa8250cee7819c49741e819e81659d1d03823 28-Jul-2011 Jeff Brown <jeffbrown@google.com> Refactor input reader to add stylus support.
Bug: 5064702

Introduced the concept of an InputListener to further decouple
the InputReader from the InputDispatcher. The InputListener
exposes just the minimum interface that the InputReader needs
to communicate with the outside world. The InputReader
passes arguments to the InputListener by reference, which makes
it easy to queue them up.

Consolidated all of the InputReader locks into one simple global
Mutex. The reason this wasn't done before was due to potential
re-entrance in outbound calls to the InputDispatcher. To fix this,
the InputReader now queues up all of the events it wants to send
using a QueuedInputListener, then flushes them outside of the
critical section after all of the event processing is finished.
Removing all of the InputMapper locks greatly simplifies the
implementation.

Added tests for new stylus features such as buttons, tool types,
and hovering.

Added some helpers to BitSet32 to handle common code patterns
like finding the first marked bit and clearing it.

Fixed a bug in VelocityTracker where the wrong pointer trace
could get cleared when handling ACTION_POINTER_DOWN. Oops.

Changed PointerCoords so it no longer stores useless zero
axis values. Removed editAxisValue because it is not very
useful when all zero value axes are absent and therefore
cannot be edited in place.

Added dispatch of stylus hover events.

Added support for distance and tool types.

Change-Id: I4cf14d134fcb1db7d10be5f2af7b37deef8f8468
ndroid_view_VelocityTracker.cpp
3fd36737b3bdf0100045cf46fe98534431c3fd5c 29-Jul-2011 Matthew Xie <mattx@google.com> Change setDevicePropertyNative to no block.

Change setDevicePropertyNative to use async dbus call to bluez instead of
blocking call. The old call was dbus_connection_send_with_reply_and_block.
It is replaced by dbus_connection_send_with_reply.

Change-Id: I1a772b33b54c8aad71a6f4d86dcd289354d8155b
ndroid_server_BluetoothService.cpp
f4fd53b381d794af77dc887454032ed5f299a22e 29-Jul-2011 Derek Sollenberger <djsollen@google.com> Merge "Fix NinePatch decoder when the target is smaller than the source."
5ff1c1591fc5abfdd00ebbce724445661fcc384d 29-Jul-2011 Nick Pelly <npelly@google.com> Merge "Workaround for bug 5082381 (EALREADY on ACL collision)."
c4c458c678567b899aae04631570460c5e729512 29-Jul-2011 Derek Sollenberger <djsollen@google.com> Fix NinePatch decoder when the target is smaller than the source.

If the target is smaller on a given axis than the source then we
just draw a downscaled version of the NinePatch. If we use the
current path and the source has transparency then areas of the
NinePatch overlap and are blended together resulting in visual
inconsistancy.

bug: 5041053
Change-Id: I0fcc6fb5c214b188a164acf0651aa4ab2f35946d
ndroid/graphics/NinePatchImpl.cpp
fbbea2e1bf85bbee28fe86d1cf912929a8d09f6f 29-Jul-2011 Nick Pelly <npelly@google.com> Workaround for bug 5082381 (EALREADY on ACL collision).

If connect() fails with EALREADY, then retry.

Unfortunately we also need to switch to a new FD. This is currently
safe, but its a little fragile to changes in the code (especially
if we ever expose the fd to applications) so it would be great to
fix this issue properly in the kernel sometime and revert this
commit.

Change-Id: I12fb6b7f2b8ca40f425f66b504754048c9460329
ndroid_bluetooth_BluetoothSocket.cpp
6903a7de88e32e04965f41f1cf6371d855cdfa88 29-Jul-2011 Matthew Xie <mattx@google.com> Merge "Provide an API to set the friendly name of a remote device."
f0d6a48c6ad852b84687127f14b1ffde02416dc4 27-Jul-2011 Wu-cheng Li <wuchengli@google.com> Add frame metadata parameter to camera data_callback.

bug:4460717
Change-Id: Ib47d7d7df20af8155a719f3dabefe030893bfebc
ndroid_hardware_Camera.cpp
269e81a563cfe080d7f241d0d46411d3c946c111 27-Jul-2011 Matthew Xie <mattx@google.com> Provide an API to set the friendly name of a remote device.

BluetoothDevice setName overwrite the locally cached remote name.
The changed name is saved in the local storage so that the change
is preserved over power cycle.
bug 5081605
Change-Id: I486966033828d153bfb1076a99e274c8a7f41636
ndroid_server_BluetoothService.cpp
d5d7e164d316e595a64faf1555839d1939da0863 17-May-2011 Jeff Brown <jeffbrown@google.com> Support wrapping app processes to inject debug instrumentation.
Bug: 4437846

Change-Id: Ib0559e5224b0fa0df074e485787307b6634e8654
ndroidRuntime.cpp
om_android_internal_os_ZygoteInit.cpp
b6f7a27c59fd170b5d7617e43e21bfd8587f234e 28-Jul-2011 Romain Guy <romainguy@google.com> Merge "Reclaim more memory, more often."
65b345fa22b878e141b8fd8ece9c208df00fa40f 28-Jul-2011 Romain Guy <romainguy@google.com> Reclaim more memory, more often.

Yay.

Change-Id: I04557ad575c307a55088549f48f0e9ad994b7275
ndroid_view_GLES20Canvas.cpp
4f35092af55d569975e6931ee6e8c0343f749d1e 28-Jul-2011 Kenny Root <kroot@google.com> Merge "Move extract native libraries to JNI code"
3d5a703db83265f7914eed8580de986106abfad2 28-Jul-2011 Jeff Brown <jeffbrown@google.com> Merge "Report the external display size to the input reader."
4c2292efbbfe7338138a9a0e8eefeaabdef1a0b4 21-Jul-2011 Wu-cheng Li <wuchengli@google.com> Add camera face detection API.

API are still hidden.

bug:4460717
Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
ndroid_hardware_Camera.cpp
66269ea6f68f2f25888ce1080c94ac782742fafc 12-Jul-2011 Kenny Root <kroot@google.com> Move extract native libraries to JNI code

The built-in ZipFile class was quite a long time to find an unpack
libraries. Move everything to using the libutils ZipFileRO class that
goes quite a bit faster. Initial measurements are 6 times faster than
the Java code.

Also, read files off the disk and compare their CRC against the APK's
CRC to see if we need to write the new file to disk. This also cuts down
the bootup time by up to a second per APK that has native files.

Change-Id: Ic464a7969a17368fb6a6b81d026888c4136c7603
ndroid.mk
ndroidRuntime.cpp
om_android_internal_content_NativeLibraryHelper.cpp
af20eacc2170a0641749bad822926d86161431c7 26-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 4319552 Java to native channel mask translation"
bc68a59c024bdb745dac8e2ec7408a9f30595f1a 25-Jul-2011 Jeff Brown <jeffbrown@google.com> Report the external display size to the input reader.

The input reader needs this information so that it knows how to
interpolate touches on an external touch screen.

Changed Display so that it asks the WindowManager what the real
display size is (as opposed to the raw display size). This means
it now takes into the forced display size set by
adb shell am display-size.

Replaced all calls to getRealWidth() / getRealHeight() /
getRealMetrics() in the WindowManager and replaced them with direct
usages of the mCurDisplayWidth / mCurDisplayHeight so that the WM
doesn't end up making a reentrant Binder call into itself.

Fixed the table status bar HeightReceiver so that it updates the
height on all configuration changes since it is possible that the
display size changed independently of an external HDMI display
being plugged / unplugged.

Improved the Display class documentation to make the distinctions
betweeen the various sizes clearer.

Change-Id: I3f75de559d3ebffed532ab46c4ae52c5e7f1da2b
ndroid_view_Display.cpp
d9ae1c573e37e245c7f4f0480a8fa925e57bd49d 25-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 4319552 Java to native channel mask translation

When creating a new AudioTrack instance, translate from a Java
channel mask as defined in android.media.AudioFormat to one
as defined in audio.h which matches industry-standard
channel mask definitions.

Change-Id: I7eeece8ec2a437977c31f6e82590f9591158144b
ndroid_media_AudioTrack.cpp
467cabe879cb58df96f6a84879f5fb226e049aeb 26-Jul-2011 Kenny Root <kroot@google.com> Throw NullPointerException on args to Time#compare

Check for null on arguments to Time#compare(Time, Time) before passing
it down to JNI code.

Bug: 5073949
Change-Id: I077e9d5194a89206d1e51fc89a72c8a72e29f8f1
ndroid_text_format_Time.cpp
5518dd92d38edd5902482841413722aa654cc2e7 25-Jul-2011 Ted Bonkenburg <tedbo@google.com> Merge "Add support for creating a Surface from a a SurfaceTexture."
55bc5f3e0408bcb5a39a6732de0b2d1aa99a55be 24-Jun-2011 repo sync <isheriff@google.com> Updated: Wi-Fi p2p framework

First stage. Get the bones in right now even though
we are not ready on the native side.

Once, we have things underneath working - we will further update the
framework

Change-Id: I4a7dab5cd4267373dc5f8989ae4122f91c384ed5
ndroid_net_wifi_Wifi.cpp
0de171b0d490a5928d54d2fb67c912d140aac643 16-Jul-2011 Ted Bonkenburg <tedbo@google.com> Add support for creating a Surface from a a SurfaceTexture.

The Surface is already using SurfaceTexture internally and it is parcelable. This
is intended to replace and phase out ParcelSurfaceTexture in favor of creating a
new Surface.java object from an existing SurfaceTexture.

Change-Id: I8e2dd86614523da6abed6403e1d705a68fa19fdf
ndroid_view_Surface.cpp
08695111cffd239d0f9917ff197c86e12e2e150c 22-Jul-2011 Jeff Brown <jeffbrown@google.com> Merge "Decouple GLES20RecordingCanvas lifetime from GLES20DisplayList. Bug: 5062011"
162a0217563f4665da6eb183dfce0fef740f641f 22-Jul-2011 Jeff Brown <jeffbrown@google.com> Decouple GLES20RecordingCanvas lifetime from GLES20DisplayList.
Bug: 5062011

Previously, each GLES20DisplayList would hold onto an instance of
GLES20RecordingCanvas. In turn, each GLES20RecordingCanvas
held onto an SkWriter with a 16Kb buffer along with several other
objects. With one display list per view and hundreds of views,
the overhead could add up to a few megabytes.

Ensured that the GLES20RecordingCanvas is reset as soon as
the display list has been constructed, thereby promptly freeing
the 16Kb buffer.

Changed GLES20DisplayList so that it acquires a GLES20RecordingCanvas
from a pool as needed and recycles it when done.

Removed some dead code and cruft related to the construction of
GLES20Canvas objects in general. Some code was written with the
assumption that the underlying renderer object could change
behind the scenes or might be lazily constructed, but that isn't
actually the case so we can simplify things.

Removed an unnecessary weak reference from GLES20DisplayList
to the View. It isn't actually used anywhere.

Fixed a bug in GLES20DisplayList where isValid() would return
true while the display list was being recorded. This is incorrect
because the native display list might not actually exist. Worse,
even if the native display list does exist, it is stale and
potentially refers to old Bitmaps that have been GC'd (because the
mBitmaps list was cleared when recording started).

Change-Id: Ib12d5483688cb253478edeb0156d34c476c2566b
ndroid_view_GLES20Canvas.cpp
d7a374f6f8f52a88d7e9a4660d9bf9037cf0b659 21-Jul-2011 Irfan Sheriff <isheriff@google.com> Merge "Fix multicast API"
b0c1b80f471bd49af60e7b78161d814e355a6972 20-Jul-2011 Irfan Sheriff <isheriff@google.com> Fix multicast API

Fix multicast API and disable mutlicast V6 packets at driver start

Bug: 5016558
Change-Id: I1e04a905a36045e52c785c1dc702cc246a381a57
ndroid_net_wifi_Wifi.cpp
0eecc27714d10b640bd8d40af8d1fb20aa3d29a0 21-Jul-2011 Eric Laurent <elaurent@google.com> Merge "AudioRecord JAVA: expose audio session Id"
648bee18a1ccd362445d562729250ff5910f16a0 21-Jul-2011 Romain Guy <romainguy@google.com> Convert looper traces to traceview traces

Change-Id: If9238e8b00744118c1c4d2182727569f94deb638
ndroid_os_SystemClock.cpp
c2063a5b18bc2e54f000b411c82f43992a53854e 18-Jul-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #5037425 Canvas.drawText can't handle Right-to-Left text and text composing

- optimization for single run case was broken
- pass isRTL boolean along the call stack instead of the dirFlags integer
(which was only used as a "isRTL" in the shaper)
- update unit tests

Change-Id: I33110b76a433633a0b92fbd1db03785204e0c3e6
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
3ad4d3ce01f173e80e0ebb751c4a8913aef5648a 19-Jul-2011 Doug Kwan <dougkwan@google.com> Merge "Add C code to use BDADDR_ANY macro properly. The macro expands into code that is not valid C++. So we need to use a C helper."
f40aa3834d92bfb516e0f865375103d81e3de71d 19-Jul-2011 Romain Guy <romainguy@google.com> Merge "Trim OpenGLRenderer's memory usage whenever possible"
6be3d5561cbeccf0a8257a4acb155657f868e548 15-Jul-2011 Romain Guy <romainguy@google.com> Add lock/unlockCanvas to TextureView

With this change, TextureView has feature parity with SurfaceView.

Change-Id: I4ef2da33420fc9590f868636ae72a5a6de61965b
ndroid_view_GLES20Canvas.cpp
ndroid_view_TextureView.cpp
bdf7609867a3f886455c51dba91623a86cceb6e2 19-Jul-2011 Romain Guy <romainguy@google.com> Trim OpenGLRenderer's memory usage whenever possible

Change-Id: I9225077184f374b1a43300add15cc1d5b6869d1c
ndroid_view_GLES20Canvas.cpp
46c72507984f32c8b5c86721086b624d73ae859a 18-Jul-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Clean test APIs for Harfbuzz support"
44ff4cd8be50768d5bd471bc6c034acefa0b59ca 18-Jun-2011 Eric Laurent <elaurent@google.com> AudioRecord JAVA: expose audio session Id

Added getAudioSessionId() method to AudioRecord class so that applications can
retrieve the AudioRecord's session ID and attach audio pre processes.

Change-Id: I1914770f0e54d97c9aef6a9eb36fff69b6d31552
ndroid_media_AudioRecord.cpp
f9cf814440dad21dd1ef92bb4b93d1a6a4e6442c 18-Jul-2011 Elliott Hughes <enh@google.com> Stop attempting to call the removed -Xdeadlockpredict option.

Bug: 5038293
Change-Id: If834f07355c110eb02cc8a96e25b432c508462cd
ndroidRuntime.cpp
0e3328fbdd3845b0e2bec364e951498eaee6b079 17-Jul-2011 Dianne Hackborn <hackbod@google.com> Rework and fix "adb shell dumpsys meminfo"

We now collect more detailed information splitting the maps into
additional useful categories.

Fixed some bugs in account, such as not correctly handling all of
the current dalvik allocations.

The activity manager now prints a final summary of all pss organized
by the apps and the categories.

Change-Id: Iafc5f27c998095812b1483c6803b8e0f0587aeae
ndroid_os_Debug.cpp
75d086e5b2ed3c7ff70f60ca1f616138b825f551 17-Jul-2011 Doug Kwan <dougkwan@google.com> Add C code to use BDADDR_ANY macro properly. The macro expands into code
that is not valid C++. So we need to use a C helper.

Change-Id: I5e7a46dd2af404972c1b4b97d21398d77c339cac
ndroid.mk
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_bluetooth_c.c
ndroid_bluetooth_c.h
796cc96243a57cd1b652bd90c4e7ba7823c6c2fe 16-Jul-2011 Fabrice Di Meglio <fdimeglio@google.com> Clean test APIs for Harfbuzz support

- also update unit tests

Change-Id: I557f61e84c4c4b6165163b783d9c679a6b3b4106
ndroid/graphics/Canvas.cpp
f85ad937553d4476e3362dcf017dbc4a4919c946 16-Jul-2011 Romain Guy <romainguy@google.com> Don't break the build...

Change-Id: I9c77f3d22eb412dc92703167100d72496aefac9c
ndroidRuntime.cpp
dafbf247ee4d0c14d501a23612115ab3a1306288 16-Jul-2011 Romain Guy <romainguy@google.com> Remove unused code

Change-Id: I7f7fc6bac03c92087037fc56b78fc43a1e93dae5
ndroid.mk
ndroidRuntime.cpp
om_android_internal_graphics_NativeUtils.cpp
99b7b7a7f896f8b98e84c4d87e1239541f518f76 14-Jul-2011 Romain Guy <romainguy@google.com> Force bitmaps to load in ARGB8888 by default.
Bug #5024993

Change-Id: Id0c63f675ae188e5a786b7fdd63916e114b9ed4a
ndroid/graphics/BitmapFactory.cpp
6793ac943afeb16642f477c43ddfd27e498db37b 13-Jul-2011 Glenn Kasten <gkasten@google.com> Add android.os.Process.setThreadScheduler

And add the associated SCHED_* constants
and remove redundant parameter to signalExceptionForPriorityError
and signalExceptionForGroupError.

Change-Id: I5a4e9652155aef2e5d544185e0d73a0120f89d97
ndroid_util_Process.cpp
14fcf900ce65e5c8c952c95ee12041f8de16fbb7 14-Jul-2011 Jeff Brown <jeffbrown@google.com> Fix invalid JNI call signature.
Bug: 5029536

Change-Id: I1f9b3faa77d49e26ef43982ff57cbbf0c3be8b40
ndroid_server_BluetoothEventLoop.cpp
c1b9bbb21c8ad5109978a4e9e770cd18b0257434 13-Jul-2011 Mike Lockwood <lockwood@android.com> Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build

Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroidRuntime.cpp
ndroid_net_TrafficStats.cpp
ndroid_os_Debug.cpp
ndroid_os_FileUtils.cpp
ndroid_os_Power.cpp
ndroid_util_Log.cpp
ndroid_util_Process.cpp
om_android_internal_os_ZygoteInit.cpp
6dd4531639157191e6224d3f8af5c9d099ca945f 13-Jul-2011 Jaikumar Ganesh <jaikumar@google.com> resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp

Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
9ff89495a4890191a0bc5dfddf28f23f79f23698 13-Jul-2011 Jaikumar Ganesh <jaikumarg@android.com> am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"

* commit '53cf7858c3fd36082302efdc4d848925bcc0001e':
Bluetooth: correcting return value from cancelDiscovery
53cf7858c3fd36082302efdc4d848925bcc0001e 13-Jul-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Bluetooth: correcting return value from cancelDiscovery"
8ff5a9d84ebb57e2fb520e01e00c8140b28639e3 12-Jul-2011 Wink Saville <wink@google.com> resolved conflicts for merge of 99cd6671 to master

Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79
bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
ndroid.mk
5623b074977d55a61f29099f44670916c6282e51 11-Jul-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Bluetooth Health APIs"
fb658c72a3a76dac334c39070d1501a2575c1069 07-Jul-2011 Jaikumar Ganesh <jaikumar@google.com> Bluetooth Health APIs

1. Remove the check of configs in BluetoothHealth.
This check is useless since BluetoothHealth is a proxy.

2. Add a wrapper and a callback class. We shouldn't expose
Binder interfaces as public APIs.

Change-Id: If62620b4251cf93f3f97d2fe63099e40fae7da4d
ndroid_server_BluetoothService.cpp
99cd66711b99272d4b5d8017eb6ed5fc688c2e4d 11-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 64ba5eaa: Concurrent multi-PDP support in TrafficStats

* commit '64ba5eaa40614877c679b3fbaaa3c2efd17d50d2':
Concurrent multi-PDP support in TrafficStats
64ba5eaa40614877c679b3fbaaa3c2efd17d50d2 05-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Concurrent multi-PDP support in TrafficStats

Quick fix to enable concurrent multiple PDP support in TrafficStats.
Just updated the list of hard-coded mobile interfaces for now.

Bug: 4553527
Change-Id: I44ce73f3000542d6457f353bb561a2275684af6b
ndroid_net_TrafficStats.cpp
10e89712863f5b91a2982dc1783fbdfe39c1485d 09-Jul-2011 Jeff Brown <jeffbrown@google.com> Eliminate single-process mode.
Bug: 5010576

Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
ndroid_util_Process.cpp
ae367419df6e5f55b081fa793b535cc84b55d6ed 08-Jul-2011 Wink Saville <wink@google.com> resolved conflicts for merge of e4a56a32 to master

Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
e4a56a32ac243dad5e7fa33c5de4777d9a4b8162 08-Jul-2011 Wink Saville <wink@google.com> am 8171e6f6: Use resetConnections with resetMask.

* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
Use resetConnections with resetMask.
9ace8f5e79e76893fe4ca9e4d10f6c4056330485 08-Jul-2011 Romain Guy <romainguy@google.com> Use NEAREST filtering for layers whenever possible.

Change-Id: Id5bee1bd4a322cf93e8000b08e18f1e1b058648e
ndroid_view_GLES20Canvas.cpp
8171e6f690cca1bad354e7e352823d79d420daf3 08-Jul-2011 Wink Saville <wink@google.com> Use resetConnections with resetMask.

Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
ndroid_net_NetUtils.cpp
f61970fc79e9c5cf340fa942597628242361864a 07-Jul-2011 Romain Guy <romainguy@google.com> Add an API to query maximum bitmap/texture size on Canvas.

Change-Id: I2c576c9a4ecad9f33cc6636bcbc29786acdf052d
ndroid_view_GLES20Canvas.cpp
a0c680393f2dd03a937c598b2cb9abf98a58152c 26-Jun-2011 Matthew Xie <mattx@google.com> Incoming Bluetooth Connection requests - dialog.

This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.
Includes down merged contributions from Jaikumar Ganesh.

Change-Id: Ic8b857aad3554315aae39a0e871eb94d0ac98a91
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
3cf7cf575138bcbe5b49c32eb4ae401f92e4c8f7 28-Jun-2011 Jamie Gennis <jgennis@google.com> Merge changes I9fb59763,I8b2c6e00

* changes:
SurfaceTexture: consume buffers after err checks
SurfaceTexture: change onFrameAvailable behavior
84e297238f53f83c9e7de499e711b997d09514e0 27-Jun-2011 Andy McFadden <fadden@android.com> Remove native EventRecurrence parser

Switch over to the new parser.

Bug 4575374

Change-Id: If78d8042fb266182900398f7fc464a048c779966
ndroid.mk
ndroidRuntime.cpp
ndroid_pim_EventRecurrence.cpp
bd5404d0312752e7c8946e8540129f0d2d97bcd7 27-Jun-2011 Jamie Gennis <jgennis@google.com> SurfaceTexture: change onFrameAvailable behavior

This change alters the conditions under which the onFrameAvailable
callback gets called by the C++ SurfaceTexture class. The new behavior
is to call the callback whenever a frame gets queued that will be
visible to the buffer consumer. This means that buffers queued in
synchronous mode always trigger the callback, as those buffers will
remain pending until they are consumed. Buffers queued in asynchronous
mode will only trigger the callback if there was not previously an
unconsumed buffer pending.

The new behavior means that a consumer should perform a draw operation
exactly once for every onFrameAvailable call that it recieves. This
change also modifies SurfaceFlinger and the SurfaceTexture JNI to
support of the new behavior.

Change-Id: I8b2c6e00961d3d58b11c6af50b555b6e4c5f5b40
ndroid/graphics/SurfaceTexture.cpp
a2c8a7b5739c1febf8ffbf9461334343bdadab16 27-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am ec5039b3: am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."

* commit 'ec5039b3720ee9b92fb2a2c6dd9f468d2dcd7172':
Add WEBP to the list of Image formats that support Compression.
436b50f0dcfd0c3ec397d860e8f98abbce231e23 26-Jun-2011 Jamie Gennis <jgennis@google.com> Merge "SurfaceTexture: detach from Dalvik when necessary."
ec5039b3720ee9b92fb2a2c6dd9f468d2dcd7172 24-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."

* commit '99c070d8eb9f1ff9ea5c38991f15f091040226c2':
Add WEBP to the list of Image formats that support Compression.
d3d4b4b86ae5bc8301b64ee6d78a7a9343347398 24-Jun-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix potential advances overrun in TextLayoutCache."
b092f55c37f19aa4ee714242337136b9061f8ca8 24-Jun-2011 Doug Felt <dougfelt@google.com> Fix potential advances overrun in TextLayoutCache.

Change-Id: Ibec544f249833a28fe8ef9a15fc8ab48fddfc51c
ndroid/graphics/TextLayoutCache.cpp
c9286ebbf4ee8233908bc6b4c472ed89b0e60228 24-Jun-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Implement APIs for Bluetooth Health profile."
99c070d8eb9f1ff9ea5c38991f15f091040226c2 24-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."

* commit '4fea5373d350f5d855408ffaa41206b8fa743c55':
Add WEBP to the list of Image formats that support Compression.
2ea1e85dcb57d17f5782dbafa1d25eb51c630e4b 02-Apr-2011 Jaikumar Ganesh <jaikumar@google.com> Implement APIs for Bluetooth Health profile.

This first patch implements all the APIs.
The APIs wil be made public soon. The data specification
API will be submited in another patchset.
Change-Id: I2462683b7e07380e2c42474b0036b34d03b4bed1
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
5c5050d9026f7e0ba52bec094f681e048cdd5d9a 24-Jun-2011 Grace Kloba <klobag@google.com> Make TextureView to use async SurfaceTexture.

With this, there is no synchronous destroy SurfaceTexture requirement any more.

Revert the previous change which only applies to the sync SurfaceTexture.

Change-Id: Id4790d38a27f2982d0c8ad471bc1107683d27ffc
ndroid_view_GLES20Canvas.cpp
0904d0af81e8a0a5404d6c03f4dcea02bea8170d 24-Jun-2011 Grace Kloba <klobag@google.com> Add allowSynchronousMode to SurfaceTexture constructor.

Change-Id: I54f30a3c16bbe6b813f3bcd1d389da5627531304
ndroid/graphics/SurfaceTexture.cpp
0a8fd9b610b2de92930c92d71ac184dc9e2bcb4d 21-Jun-2011 Jamie Gennis <jgennis@google.com> SurfaceTexture: detach from Dalvik when necessary.

This change adds a call to detach from the Davlik VM in SurfaceTexture
JNI calls that caused an attach.

Change-Id: I8e0d7d596680bd25ac42f8db4ca8343a62827255
ndroid/graphics/SurfaceTexture.cpp
0694cfe49a889788e185a265deed0c231fe31f4b 23-Jun-2011 tedbo <tedbo@google.com> Merge "Add method to create a ParcelSurfaceTexture from android.view.Surface."
b950b8e23e18cbe23069b791bca93c8cfbbab5ce 23-Jun-2011 Jamie Gennis <jgennis@google.com> Merge "Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode."
2305ac9e4a262ed09fd034ae417e9b1dda4c0ccb 23-Jun-2011 Vikas Arora <vikasa@google.com> Add WEBP to the list of Image formats that support Compression.

Note: The integrator of this change to Android internal code-repo will
have to run one extra step 'make update-api' to update 'api/current.txt'
file corresponding to approved API. The AOSP branch didn't have this
file, hence I could not add the same to this change. The updated file
'api/current.txt' has to be submitted along with this change.

Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
ndroid/graphics/Bitmap.cpp
a9489274d67b540804aafb587a226f7c2ae4464d 23-Jun-2011 Romain Guy <romainguy@google.com> Add the ability to specify the opacity of a TextureView

TextureView assumes its content is opaque by default.

Change-Id: Iba873423566a5b67c388081838bd910dceba32ba
ndroid_view_GLES20Canvas.cpp
4e8a5c922c287ec97fec847194e930f8598a1941 23-Jun-2011 tedbo <tedbo@google.com> Add method to create a ParcelSurfaceTexture from android.view.Surface.

Change-Id: I05e343ab7e327478f60322af9373574b70c148f5
ndroid/graphics/ParcelSurfaceTexture.cpp
ndroid_view_Surface.cpp
c989d867f2580a99cde25fab0e49e445aea33f2f 22-Jun-2011 Romain Guy <romainguy@google.com> Collapse UI events in TextureView.

Change-Id: Ia6c0cef0f694edc4b685c1ade1a9ba509a51e541
ndroid_view_GLES20Canvas.cpp
5389c80d1f7c9d2710a47ccf70cce94c2d5d9599 22-Jun-2011 Irfan Sheriff <isheriff@google.com> am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE

* commit 'cf99765b6255d73aa4fbc61d5bd78ec65fbd0370':
Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
cf99765b6255d73aa4fbc61d5bd78ec65fbd0370 22-Jun-2011 Irfan Sheriff <isheriff@google.com> resolved conflicts for merge of 914ed90f to honeycomb-LTE

Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
20b6ded6e326e3fedb9f7e112773a82b94c4aca6 22-Jun-2011 Irfan Sheriff <isheriff@google.com> am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE

* commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
c74eacde3028551864d8a9f8822803a835785c3a 22-Jun-2011 Irfan Sheriff <isheriff@google.com> resolved conflicts for merge of 267a6181 to honeycomb-LTE

Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
0bc6eb30bc09b4c49193229cf3c0de28341be6f4 22-Jun-2011 Grace Kloba <klobag@google.com> Fix the issue where TextureView stuck if the producer side is too fast.

When SurfaceTexture is in sync mode, the consumer needs to pull the pending
frames. Otherwise the onFrameAvailable won't be called and no more update.

This simple fix is to skip frame to keep up with the producer side.

Change-Id: Ica833695dc0b0221d2543f46f0dd41aa55d1aa16
ndroid_view_GLES20Canvas.cpp
925bcaabde5a21687b51caa7ab329310a819f068 22-Jun-2011 Grace Kloba <klobag@google.com> Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode.

If there is more frame after updateTexImage, trigger the listener again.

Change-Id: I1415ae9a914cc8bb139cb369464b1f6a2aa24058
ndroid/graphics/SurfaceTexture.cpp
ae633b2d36172862df3cd5ab240882bdff5a2a6c 14-Jun-2011 Andy McFadden <fadden@android.com> Port EventRecurrence.parse() from native

This adds a Java-language implementation of EventRecurrence.parse(),
to make it easier to relocate it for the benefit of unbundled
Calendar.

Differences from the native version:

- enforces that FREQ appears first
- allows (but ignores) X-* parts
- improved validation on various values
- error messages are more specific
- enforces that only one of UNTIL and COUNT may be present [disabled]
- allows lower-case property and enumeration values [disabled]

As part of the transition process, both versions of the parser are
called on every request, and the results are compared. If the results
are different a warning message is logged.

An unnecessary constructor was removed.

This also this moves some EventRecurrence tests out of CalendarProvider,
into coretests, and adds a simple parse test with the examples from
the RFC.

Bug 4575374

Change-Id: If737ed1272fda65c93363d87b2da12b85e644f5b
ndroid_pim_EventRecurrence.cpp
914ed90f2c02092474d2db36626734ca1b2cf315 21-Jun-2011 Irfan Sheriff <isheriff@google.com> Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""

This reverts commit 58d1bb497e0d83e28a02fbcdc1f33f29a992db7e.
ndroid_net_NetUtils.cpp
9e5d0de9a333683533a021e9733e824cac666d18 21-Jun-2011 Jaikumar Ganesh <jaikumar@google.com> am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread

* commit 'b38fa2a0ac2bde56504929de6a3dd61ac723958e':
DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
58d1bb497e0d83e28a02fbcdc1f33f29a992db7e 21-Jun-2011 Irfan Sheriff <isheriff@google.com> DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"

This reverts commit fe3b33d4ead06c546202753e38188db5e2eaa7fa.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
ndroid_net_NetUtils.cpp
b38fa2a0ac2bde56504929de6a3dd61ac723958e 21-Jun-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
d762f063be970033314d3f77194bfe5cb284b605 17-Jun-2011 Jaikumar Ganesh <jaikumar@google.com> DO NOT MERGE Incoming Bluetooth Connection requests - dialog.

This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.

Change-Id: Ibe267f7cda28ce2a46c25800df2e8ac685b0b9e6
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
fd0ffd2a4e883074c56f519906f3e2c720de6da8 20-Jun-2011 Jamie Gennis <jgennis@google.com> Merge "SurfaceTexture: attach to Dalvik when needed."
84293fb9625a3ab7d7d302436bea05441b8d7316 18-Jun-2011 Jamie Gennis <jgennis@google.com> SurfaceTexture: attach to Dalvik when needed.

This change fixes a bug in the SurfaceTexture JNI where a thread that
the Dalvik VM was not aware of calls the onFrameAvailable callback.
When this happens the callback needs to first attach the thread to the
VM before attempting to post the onFrameAvailable event for Java code to
handle.

Change-Id: I6a5470c32611ea6f38e9167779450f50635cabd3
ndroid/graphics/SurfaceTexture.cpp
035f1010ebed7d420e74a4e9d830018ab8c8163a 16-Jun-2011 Romain Guy <romainguy@android.com> Correctly register native methods.

Change-Id: Ic82a2b9c5dd7fb5dc23650c4d5aa208ef8563a31
ndroid_view_GLES20Canvas.cpp
ndroid_view_TextureView.cpp
b38484ccb9386780c1d192c552da30b680539952 16-Jun-2011 Romain Guy <romainguy@android.com> Forgot to ammend the change

Change-Id: Ic6b0be487245a6bb926ab8b6b66b7c63ea1130c6
om_google_android_gles_jni_EGLImpl.cpp
e5e0c50f7dfaccc220725c5595080e921ffda1e4 16-Jun-2011 Romain Guy <romainguy@android.com> Properly refcount SurfaceTexture in the JNI layer.

Change-Id: I4b4c8020c13b8d6ce0d302fe42410033bf5785a6
ndroid_view_GLES20Canvas.cpp
om_google_android_gles_jni_EGLImpl.cpp
77a811610f99e21da7f88dafef60d09f345d0506 15-Jun-2011 Romain Guy <romainguy@google.com> Add TextureView.getBitmap()

This API can be used to get a Bitmap copy of the content of a
TextureView.

Change-Id: I07522216c353720fba5cab333174f58f484eb911
ndroid_view_GLES20Canvas.cpp
114420f5315c72e9cbd41cd4ae7472ef24ef1b94 14-Jun-2011 tedbo <tedbo@google.com> Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink."
290029d19a9d314e925b73e19453ab0497602f80 14-Jun-2011 Dima Zavin <dima@android.com> audio: update for audio/audio_policy header names/locations

Change-Id: I36c49352eee57559403cd1597f56a8485a360289
Signed-off-by: Dima Zavin <dima@android.com>
ndroid_media_AudioSystem.cpp
f11c52d246d9e43c8533dff82979e7eeb72c1d50 16-May-2011 Derek Sollenberger <djsollen@google.com> Updates resulting from the Skia merge (revision 1327)

Change-Id: I1d2cecbad6c30e6ebc9579093404742f17e14e84
ndroid/graphics/Canvas.cpp
ndroid/graphics/NinePatchImpl.cpp
cc5278a3e258b30903102b718fb1cd832e79bb2b 10-Jun-2011 tedbo <tedbo@google.com> Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.

This adds support for setting a SurfaceTexture as the MediaPlayer video
sink by using a ParcelSurfaceTexture object. The goal is to enable a
SurfaceTexture to pass through Binder (via ParcelSurfaceTexture) and then
be set on the MediaPlayer.

Change-Id: Ife5689ce673eb4bee1c377019db761685217b71d
ndroid/graphics/ParcelSurfaceTexture.cpp
ndroid/graphics/SurfaceTexture.h
4532c5e49cc0d029c53a3aee3e0b1fdf8ffd2ec4 10-Jun-2011 Jamie Gennis <jgennis@google.com> Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder."
050316184b01c0d1a01c46afae7429b89a27c31b 07-Jun-2011 tedbo <tedbo@google.com> Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder.

This adds a new ParcelSurfaceTexture.java class that can be instantiated with
a SurfaceTexture and used to send the corresponding ISurfaceTexture interface
to another process via Binder. The ParcelSurfaceTexture java object can then
be used to create an ANativeWindow based on the SurfaceTextureClient interface.

Change-Id: Ie38ea948b866e52f36a6d0f6cde19b54a8546817
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/ParcelSurfaceTexture.cpp
ndroid/graphics/SurfaceTexture.cpp
ndroid/graphics/SurfaceTexture.h
ndroid_view_Surface.cpp
e5141eef50341ec5890fd72c90cd27e52c16703a 09-Jun-2011 Martijn Coenen <maco@google.com> am 4c5f2a9d: am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.

* commit '4c5f2a9dd26674be797e1cb7c995247601096a04':
Prevent allocation overflows by corrupt NDEF records.
66e9af6c549b1f6ab4e3f26e2bab14b115ad3848 08-Jun-2011 Romain Guy <romainguy@google.com> Remove obsolete code.

Change-Id: I2f990528bdc0dc6127f367e55c55287d43dd29f9
ndroid.mk
ndroidRuntime.cpp
ndroid_view_ViewAncestor.cpp
0315a2c5640dc91cd1689db9dff997e43e4effca 08-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am f3894a04: Merge "Tweak setViewport stuff for fwd-compat"

* commit 'f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
Tweak setViewport stuff for fwd-compat
de267191531fef134f0171c9ddb91498fe9400cd 08-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Tweak setViewport stuff for fwd-compat

Change-Id: I532336eced54544115dfd47d5557cc77bafdfc87
ndroid/graphics/Canvas.cpp
ndroid/graphics/NinePatchImpl.cpp
4c5f2a9dd26674be797e1cb7c995247601096a04 07-Jun-2011 Martijn Coenen <maco@google.com> am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.

* commit 'ed1c8d7dc09996351db711be7d2acf0ff4715c2d':
Prevent allocation overflows by corrupt NDEF records.
b0628bfd5aac480a0d412ac96b8af1d97ac01c30 03-Jun-2011 Christopher Tate <ctate@google.com> Implement shared-storage full backup/restore

Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes. This is an approximation
of "internal + the external card". This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.

Also fixed a bug in the handling of files/dirs with spaces in
their names.

Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
ndroid_app_backup_FullBackup.cpp
890e013c05ed62bea9781168f3f65efebcbac4d5 06-Jun-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix USE_TEXT_LAYOUT_CACHE define"
af033caf26ef4eca99c4024e59def7e42c3fa4cd 06-Jun-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix USE_TEXT_LAYOUT_CACHE define

- fix compilation issues

Change-Id: I3358457d94d2278804e81e4ca96c9633ed76a147
ndroid/graphics/Canvas.cpp
ndroid/graphics/TextLayout.cpp
ndroid_view_GLES20Canvas.cpp
6af763bec7c3f4d50fee8dd0046409bb8a7fe8f6 05-May-2011 Glenn Kasten <gkasten@google.com> Remove dead code related to gettid

The gettid system call is always available now.

Change-Id: Ib78b41781eda182dc8605daf456bbea7ff7c2dc0
ndroid_util_Process.cpp
4b2711372d7bebd9dc874404ee22fbc9b932fa11 02-Jun-2011 Romain Guy <romainguy@google.com> Merge "Take advantage of EGL_BUFFER_PRESERVED on IMG."
6f7d9394ec69e9fb38ca5fc2caf6d2aef6f7442d 02-Jun-2011 Romain Guy <romainguy@google.com> Take advantage of EGL_BUFFER_PRESERVED on IMG.

The IMG architecture does not support the EGL_SWAP_BEHAVIOR_PRESERVED_BIT
in EGL configurations. This bit is used only to be able to change the
EGL_SWAP_BEHAVIOR, which matters when the default behavior is not the
one we want. However on IMG, the default swap behavior is the one we
desire.

Change-Id: Iff5980c97df9e41bc837e424baf83b8eadbb7161
ndroid_view_GLES20Canvas.cpp
efc1d16374955f04d713c770ab47d90d190afe83 21-Mar-2011 Albert Mojir <albert.mojir@sonyericsson.com> Bluetooth: correcting return value from cancelDiscovery

BluetoothAdapter.cancelDiscovery was previously always
returning false.

Change-Id: Ic1fd134d4b710438d95c5b8ca009104529dd1bf5
ndroid_server_BluetoothService.cpp
54f40eb222fb04055ad29e65878e89a0953664c9 02-Jun-2011 Glenn Kasten <gkasten@google.com> Merge "Revert "Use AudioTrack::event_type not int in callback""
e46a86fcb6a0849fc05c4cade6cb94aad0325295 02-Jun-2011 Glenn Kasten <gkasten@google.com> Revert "Use AudioTrack::event_type not int in callback"

This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
ndroid_media_AudioTrack.cpp
cb0975b3c1c73d8bcadaca80e1ee99383750af60 01-Jun-2011 Romain Guy <romainguy@google.com> Merge "Add support to OpenGLRendere to draw BiDi text. Bug #4350336"
726aeba80ffc6778a9bc3e0ee957b8d644183505 01-Jun-2011 Romain Guy <romainguy@google.com> Add support to OpenGLRendere to draw BiDi text.
Bug #4350336

Change-Id: I1cf31693f7ca9653fa3a41b5b91c27ef288d680f
ndroid_view_GLES20Canvas.cpp
2225e4b7049fa3fb9d39a068b8268b63c952d7c1 05-May-2011 Glenn Kasten <gkasten@google.com> Use AudioTrack::event_type not int in callback

Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
ndroid_media_AudioTrack.cpp
ed1c8d7dc09996351db711be7d2acf0ff4715c2d 01-Jun-2011 Martijn Coenen <maco@google.com> am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.

* commit '0aa1017f9183bca752c95af72f73120e102ab2d3':
Prevent allocation overflows by corrupt NDEF records.
0aa1017f9183bca752c95af72f73120e102ab2d3 01-Jun-2011 Martijn Coenen <maco@google.com> Prevent allocation overflows by corrupt NDEF records.

Basic sanity check for the length fields in NdefRecord; this prevents
malformed NdefRecords from crashing the vm and the entire NFC service
with it.

Bug: 4165324
Change-Id: I67b341d445d6647cb76cc24ea49afaf77de0610e
ndroid_nfc_NdefMessage.cpp
9743547cde4e823a397cfdfd79a3229af1f7ec7e 26-May-2011 Marco Nelissen <marcone@google.com> Fix crash when nesting Picture recording.

b/4490619, http://code.google.com/p/android/issues/detail?id=16644

Change-Id: Ia227c87cba61e0d0b6f86b01a064a3eefe447fe1
ndroid/graphics/Picture.cpp
8bede1704717f594a0f924a57ff46f6300347e30 08-Apr-2011 Martijn Coenen <maco@google.com> Fix NdefRecord flags handling.

NdefMessages created from byte arrays set the wrong flags on
NdefRecord: every record had at least FLAG_MB|FLAG_ME set, instead of actually
setting the flags from the byte-stream itself. Fixed by creating an internal
constructor which can take the flags.

Public constructor remains the same, as we don't want to bother application
writers with these flags - they can be inferred from the context in which the
record is used. Getting the flags is not a public operation on an NdefRecord
either. However, applications can get the byte[] representation and it
is reasonable for them to expect the flags byte to be set correctly.

Change-Id: Ic32411688dd092c55b1aeccbba9635792e15a671
ndroid_nfc_NdefMessage.cpp
ndroid_nfc_NdefRecord.cpp
3c2fb0242b0ec21101959dfa08aad3162a523634 25-May-2011 Jeff Brown <jeffbrown@google.com> am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

* commit '8148cc3e47e50c916066e2fed562618b5827188f':
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
8148cc3e47e50c916066e2fed562618b5827188f 25-May-2011 Jeff Brown <jeffbrown@google.com> am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

* commit '86ea1f5f521981d075aef56f11693e4f3bc32fdb':
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
7d0fb57044576fd4bbaf9683997bab288c3b759c 25-May-2011 Jeff Brown <jeffbrown@google.com> am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2

* commit '16330e249663fed890df0e95fce4016c2971120a':
Improve VelocityTracker numerical stability. (DO NOT MERGE)
86ea1f5f521981d075aef56f11693e4f3bc32fdb 13-Apr-2011 Jeff Brown <jeffbrown@google.com> Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

Added a new PointerIcon API (hidden for now) for loading
pointer icons.

Fixed a starvation problem in the native Looper's sendMessage
implementation which caused new messages to be posted ahead
of old messages sent with sendMessageDelayed.

Redesigned the touch pad gestures to be defined in terms of
more fluid finger / spot movements. The objective is to reinforce
the natural mapping between fingers and spots which means there
must not be any discontinuities in spot motion relative to
the fingers.

Removed the SpotController stub and folded its responsibilities
into PointerController.

Change-Id: Ib647dbd7a57a7f30dd9c6e2c260df51d7bbdd18e
ndroid.mk
ndroidRuntime.cpp
ndroid_view_PointerIcon.cpp
ndroid_view_PointerIcon.h
16330e249663fed890df0e95fce4016c2971120a 25-May-2011 Jeff Brown <jeffbrown@google.com> am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2

* commit '94e838f6e113f8cad30086a18f68da99976101d0':
Improve VelocityTracker numerical stability. (DO NOT MERGE)
b5b1fb25853eb2e00f981d3b0bb52acd50684c4f 24-May-2011 Jeff Brown <jeffbrown@google.com> Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
ebed7d6e35f7f960e6e6add2b8ab7c7a31a511c3 17-May-2011 Jeff Brown <jeffbrown@google.com> Support wrapping app processes to inject debug instrumentation.
Bug: 4437846

Change-Id: I4552501c693716b14714afb5c5248edaca9547ab
ndroidRuntime.cpp
om_android_internal_os_ZygoteInit.cpp
5b2b4d9c0a56c4b5e869c828a6c36a1b9e27d61b 15-Mar-2011 Jeff Brown <jeffbrown@google.com> Improve VelocityTracker numerical stability. (DO NOT MERGE)

Replaced VelocityTracker with a faster and more accurate
native implementation. This avoids the duplicate maintenance
overhead of having two implementations.

The new algorithm requires that the sample duration be at least
10ms in order to contribute to the velocity calculation. This
ensures that the velocity is not severely overestimated when
samples arrive in bursts.

The new algorithm computes the exponentially weighted moving
average using weights based on the relative duration of successive
sample periods.

The new algorithm is also more careful about how it handles
individual pointers going down or up and their effects on the
collected movement traces. The intent is to preserve the last
known velocity of pointers as they go up while also ensuring
that other motion samples do not count twice in that case.

Bug: 4086785
Change-Id: I95054102397c4b6a9076dc6a0fc841b4beec7920
ndroid.mk
ndroidRuntime.cpp
ndroid_view_InputQueue.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_MotionEvent.h
ndroid_view_VelocityTracker.cpp
939461300a0283a9f370a0425d4061d32b36f952 23-May-2011 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 070a19e0 to master

Change-Id: I855ab02a4e8dd465af67fd23b66c0dace76bd411
5710e72d91f16f34998ceccdd961ef9dc9e3cdb6 22-May-2011 Jaikumar Ganesh <jaikumarg@android.com> am 69ed0b62: am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."

* commit '69ed0b628e18570f3fc7909fcdadc1e06f42e944':
Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
070a19e035cd28f2a0cc831f2322f2121d80de44 21-May-2011 Dianne Hackborn <hackbod@google.com> am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2

* commit '5c8caba2e590792531ffb2c9f4ea924993662abd':
Add ParcelFileDescriptor.fromFd() and .adoptFd().
69ed0b628e18570f3fc7909fcdadc1e06f42e944 20-May-2011 Jaikumar Ganesh <jaikumarg@android.com> am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."

* commit 'd1735ef91af201ff140f8d954dd07eff80836d20':
Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
5c8caba2e590792531ffb2c9f4ea924993662abd 20-May-2011 Dianne Hackborn <hackbod@google.com> am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2

* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
Add ParcelFileDescriptor.fromFd() and .adoptFd().
4b41df613db19c5fe1d8c0d05ef314326fd3f95b 20-May-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
ea2117bdc03316a9292e2344c6fd157c85c13167 20-May-2011 Dianne Hackborn <hackbod@google.com> Add ParcelFileDescriptor.fromFd() and .adoptFd().

Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
ndroid_os_ParcelFileDescriptor.cpp
fef966ae4629f09158576de4cedef38e83d50b2b 20-May-2011 Dianne Hackborn <hackbod@google.com> Fix another merge problem.

Change-Id: I3a65f3f588dd84bf163502e9c7ab99c8a22bae26
ndroid_content_res_Configuration.cpp
161e67ff3ba26408eea09221734ad2e29a1eed11 20-May-2011 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 06a8ceac to master

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68 20-May-2011 Dianne Hackborn <hackbod@google.com> am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.

* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
Add new "-swNNNdp" resource qualifier.
c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a 20-May-2011 Dianne Hackborn <hackbod@google.com> am 69cb8757: Add new "-swNNNdp" resource qualifier.

* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
Add new "-swNNNdp" resource qualifier.
69cb87576ba163b61bb0e6477a3b7c57a9b11d40 20-May-2011 Dianne Hackborn <hackbod@google.com> Add new "-swNNNdp" resource qualifier.

Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
ndroid_content_res_Configuration.cpp
ndroid_util_AssetManager.cpp
90f902afde7ac92cdb60363d517e9d142e1f1977 19-May-2011 Mike Lockwood <lockwood@android.com> resolved conflicts for merge of c1730dcf to master

Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
c1730dcf8971950a0e32e3f4fc6e3fb08b7395cd 19-May-2011 Mike Lockwood <lockwood@android.com> am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors

* commit 'ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
USB: Add method to access raw USB device descriptors
ae448e2c90cae096efea53c1c93a70e7b5ca2db7 19-May-2011 Mike Lockwood <lockwood@android.com> am a88b42d5: USB: Add method to access raw USB device descriptors

* commit 'a88b42d569a91290477d8f5731a2ee43931271da':
USB: Add method to access raw USB device descriptors
a88b42d569a91290477d8f5731a2ee43931271da 19-May-2011 Mike Lockwood <lockwood@android.com> USB: Add method to access raw USB device descriptors

Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_hardware_UsbDeviceConnection.cpp
5c3816f2ff3d40136da1e40eec792d8faf0e75dd 19-May-2011 Jean-Baptiste Queru <jbq@google.com> Merge c41aefe1

Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
c41aefe1d4c862a9fbaf717ffb886bbd702c94f2 19-May-2011 Robert Greenwalt <rgreenwalt@google.com> am 59b1a4ed: Switch to use netd to add/remove routes.

* commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
Switch to use netd to add/remove routes.
59b1a4ede7032c1b4d897e13dd4ede09b5e14743 11-May-2011 Robert Greenwalt <rgreenwalt@google.com> Switch to use netd to add/remove routes.

Also adds support for v6 routes and for removing single routes.

Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
ndroid_net_NetUtils.cpp
41701ac5f694074a41e3f1d2e0a889e8af792a37 18-May-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor"
78b868ff42cc368c45f851443678a822560dc266 18-May-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor

- take care of empty strings in TextLayoutCache when computing advances/glyphs with Harfbuzz

Change-Id: I8eb5f632feb7a86e5c4a6db03d073c4b7d859dbc
ndroid/graphics/TextLayoutCache.cpp
43124d22142f708b39e79fb0d91258e6234b5f26 17-May-2011 Derek Sollenberger <djsollen@google.com> Merge "Updates resulting from the Skia merge (revision 1327)"
f97ed771979162c4a2a75959c57fb793438a3a8b 16-May-2011 Dianne Hackborn <hackbod@google.com> am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2

* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
DO NOT MERGE. Integrate from master: Rework display size access.
d90a2c4d4463085155444efb07eba2d6579b444a 16-May-2011 Dianne Hackborn <hackbod@google.com> am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2

* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
DO NOT MERGE. Integrate from master: Rework display size access.
d39d1affe82cb8c21d32baaa5fbb2d6afb806f8e 16-May-2011 Derek Sollenberger <djsollen@google.com> Updates resulting from the Skia merge (revision 1327)

Change-Id: I2a8f5869dbe95bb594f2ba5d7278f9b330e6f17a
ndroid/graphics/Canvas.cpp
ndroid/graphics/NinePatchImpl.cpp
ac8dea12c17aa047e03a358110aeb60401d36aa2 21-Apr-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. Integrate from master: Rework display size access.

Applications now get the display size from the window manager. No
behavior should be changed yet, this is just prep for some real
changes.

Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
ndroid_view_Display.cpp
fbdf9df053800afb25453630d11bd48cbc068271 16-May-2011 Dianne Hackborn <hackbod@google.com> am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2

* commit '2a20583a5f436d66ab73cd6c0fdc73e59a3cecad':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
2a20583a5f436d66ab73cd6c0fdc73e59a3cecad 16-May-2011 Dianne Hackborn <hackbod@google.com> am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2

* commit '700ab1c75862babba90f54e02bdc877becd4f4fc':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
35844a3a4e6f7383d4e77f4426fbd71d5990bf6e 16-May-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #4415576 Gmail text looks broken"
8fb507171f68d4170cfeb1187ee7d1f70f98917d 14-May-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #4415576 Gmail text looks broken

- pass correct "contextCount" when needed

Change-Id: I56ebd9486e99e6ca5a3973ec403cf1ced874b4c3
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
9a84983a9fd9959671e102045eaf185b83291269 08-Apr-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.

Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem. Also lots of general cleanup of the am
dump output.

Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
ndroid_util_Binder.cpp
65f47d88107b2e34e4bab1f5208bff3f73ce4e8a 13-May-2011 Jeff Brown <jeffbrown@google.com> Merge "Add initial API for stylus and mouse buttons."
fe9f8ab03a63b1037f07dd85799fbea80ec6adaa 07-May-2011 Jeff Brown <jeffbrown@google.com> Add initial API for stylus and mouse buttons.

Added the concept of pointer properties in a MotionEvent.
This is currently used to track the pointer tool type to enable
applications to distinguish finger touches from a stylus.

Button states are also reported to application as part of touch events.

There are no new actions for detecting changes in button states.
The application should instead query the button state from the
MotionEvent and take appropriate action as needed.

A good time to check the button state is on ACTION_DOWN.

As a side-effect, applications that do not support multiple buttons
will treat primary, secondary and tertiary buttons identically
for all touch events.

The back button on the mouse is mapped to KEYCODE_BACK
and the forward button is mapped to KEYCODE_FORWARD.

Added basic plumbing for the secondary mouse button to invoke
the context menu, particularly in lists.

Added clamp and split methods on MotionEvent to take care of
common filtering operations so we don't have them scattered
in multiple places across the framework.

Bug: 4260011
Change-Id: Ie992b4d4e00c8f2e76b961da0a902145b27f6d83
ndroid_view_MotionEvent.cpp
2e4a3236a7634d17f89288e9739a438ecbea0471 13-May-2011 Dianne Hackborn <hackbod@google.com> am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2

* commit '46a282f323bc05606e4fe1eba795bd9ac7c99819':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
46a282f323bc05606e4fe1eba795bd9ac7c99819 13-May-2011 Dianne Hackborn <hackbod@google.com> am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2

* commit '0ed2e845db3f6bc7bc12a08ada18363942c2fb3d':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
9dec462c1f522533620be3c70f2fc60e69368c1a 13-May-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Prepare OpenGLRenderer to use glyphs from TextLayoutCache"
2ea75880142152b3a9993cb245754d73c05749a7 13-May-2011 Fabrice Di Meglio <fdimeglio@google.com> Prepare OpenGLRenderer to use glyphs from TextLayoutCache

- add OpenGLRenderer.drawGlyph()
- refactor glypth logging code

Change-Id: I797e6f1304d3f3f8f6ed31e7f9965d336233d2a4
ndroid/graphics/Canvas.cpp
ndroid/graphics/TextLayout.h
ndroid_view_GLES20Canvas.cpp
ebff8f92f13513ce37bd74759eb1db63f2220590 13-May-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. Integrate add new screen width/height in "dp" configs.

You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
ndroid_util_AssetManager.cpp
b0ca8b9dfd1a9dbd1fef2b44968c08c85771061f 13-May-2011 Jean-Baptiste Queru <jbq@google.com> am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop"

* commit 'a84d29cb0494310e9472884c7a459603eb305e38':
Ninepatch tweaks for better interop
0ceb9501b29cba97273ab983ba5d6efba037e75c 11-May-2011 Derek Sollenberger <djsollen@google.com> Adapt to latest skia

Change-Id: I39247db04ca8b7993b0f5a16fb0324828d04cc3a
ndroid.mk
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Canvas.cpp
ndroid_view_ViewRoot.cpp
9faa34e6032e2d8759ae1ece72e78acda1730668 12-May-2011 Jean-Baptiste Queru <jbq@google.com> Ninepatch tweaks for better interop

Change-Id: I96781e2b27fcd6dd05d9726829e8e79ff365cbdc
ndroid.mk
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/NinePatchPeeker.h
01ea7f01ec133285ac2397817aa015870c7da650 12-May-2011 Irfan Sheriff <isheriff@google.com> Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2
fe3b33d4ead06c546202753e38188db5e2eaa7fa 07-May-2011 Irfan Sheriff <isheriff@google.com> DO NOT MERGE Add DhcpStateMachine

Add DhcpStateMachine for interation with dhcpcd

- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
simultaneously
- Optionally, a controller can request a notification prior
to DHCP request/renewal being sent

Change-Id: I5324814b19ff19863aa6fa89f1e3f0a202930c98
ndroid_net_NetUtils.cpp
34bb419e5946ab28112e9e27a4d1b3928d31e0e2 11-May-2011 Dima Zavin <dima@android.com> update for new audio.h header location

Change-Id: Ic4c62c4037800802427eb7d3c7f5eb8b25d18876
Signed-off-by: Dima Zavin <dima@android.com>
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
c9e22e9affec97a8c68f838de29dc7f685d9247b 12-May-2011 Jean-Baptiste Queru <jbq@google.com> Switch to SkSafeUnref for better portability

Change-Id: Ia146a4728b5eb92626462effe42521ca73454a7d
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Xfermode.cpp
om_google_android_gles_jni_EGLImpl.cpp
4a627c71ff53a4fca1f961f4b1dcc0461df18a06 01-Apr-2011 Christopher Tate <ctate@google.com> Full local backup infrastructure

This is the basic infrastructure for pulling a full(*) backup of the
device's data over an adb(**) connection to the local device. The
basic process consists of these interacting pieces:

1. The framework's BackupManagerService, which coordinates the
collection of app data and routing to the destination.

2. A new framework-provided BackupAgent implementation called
FullBackupAgent, which is instantiated in the target applications'
processes in turn, and knows how to emit a datastream that contains
all of the app's saved data files.

3. A new shell-level program called "bu" that is used to bridge from
adb to the framework's Backup Manager.

4. adb itself, which now knows how to use 'bu' to kick off a backup
operation and pull the resulting data stream to the desktop host.

5. A system-provided application that verifies with the user that
an attempted backup/restore operation is in fact expected and to
be allowed.

The full agent implementation is not used during normal operation of
the delta-based app-customized remote backup process. Instead it's
used during user-confirmed *full* backup of applications and all their
data to a local destination, e.g. via the adb connection.

The output format is 'tar'. This makes it very easy for the end
user to examine the resulting dataset, e.g. for purpose of extracting
files for debug purposes; as well as making it easy to contemplate
adding things like a direct gzip stage to the data pipeline during
backup/restore. It also makes it convenient to construct and maintain
synthetic backup datasets for testing purposes.

Within the tar format, certain artificial conventions are used.
All files are stored within top-level directories according to
their semantic origin:

apps/pkgname/a/ : Application .apk file itself
apps/pkgname/obb/: The application's associated .obb containers
apps/pkgname/f/ : The subtree rooted at the getFilesDir() location
apps/pkgname/db/ : The subtree rooted at the getDatabasePath() parent
apps/pkgname/sp/ : The subtree rooted at the getSharedPrefsFile() parent
apps/pkgname/r/ : Files stored relative to the root of the app's file tree
apps/pkgname/c/ : Reserved for the app's getCacheDir() tree; not stored.

For each package, the first entry in the tar stream is a file called
"_manifest", nominally rooted at apps/pkgname. This file contains some
metadata about the package whose data is stored in the archive.

The contents of shared storage can optionally be included in the tar
stream. It is placed in the synthetic location:

shared/...

uid/gid are ignored; app uids are assigned at install time, and the
app's data is handled from within its own execution environment, so
will automatically have the app's correct uid.

Forward-locked .apk files are never backed up. System-partition
.apk files are not backed up unless they have been overridden by a
post-factory upgrade, in which case the current .apk *is* backed up --
i.e. the .apk that matches the on-disk data. The manifest preceding
each application's portion of the tar stream provides version numbers
and signature blocks for version checking, as well as an indication
of whether the restore logic should expect to install the .apk before
extracting the data.

System packages can designate their own full backup agents. This is
to manage things like the settings provider which (a) cannot be shut
down on the fly in order to do a clean snapshot of their file trees,
and (b) manage data that is not only irrelevant but actively hostile
to non-identical devices -- CDMA telephony settings would seriously
mess up a GSM device if emplaced there blind, for example.

When a full backup or restore is initiated from adb, the system will
present a confirmation UI that the user must explicitly respond to
within a short [~ 30 seconds] timeout. This is to avoid the
possibility of malicious desktop-side software secretly grabbing a copy
of all the user's data for nefarious purposes.

(*) The backup is not strictly a full mirror. In particular, the
settings database is not cloned; it is handled the same way that
it is in cloud backup/restore. This is because some settings
are actively destructive if cloned onto a different (or
especially a different-model) device: telephony settings and
AndroidID are good examples of this.

(**) On the framework side it doesn't care that it's adb; it just
sends the tar stream to a file descriptor. This can easily be
retargeted around whatever transport we might decide to use
in the future.

KNOWN ISSUES:

* the security UI is desperately ugly; no proper designs have yet
been done for it
* restore is not yet implemented
* shared storage backup is not yet implemented
* symlinks aren't yet handled, though some infrastructure for
dealing with them has been put in place.

Change-Id: Ia8347611e23b398af36ea22c36dff0a276b1ce91
ndroid.mk
ndroidRuntime.cpp
ndroid_app_backup_FullBackup.cpp
19399f4ed6f407a0e97b9769cd723e77859ea352 09-May-2011 Marco Nelissen <marcone@google.com> Fix mode.

Change-Id: I94813a4a73ea3a7b11e0747fda479be87e697072
ndroid_server_Watchdog.cpp
d8689137283bd902edc58d1385273f6941bb3a2f 09-May-2011 Marco Nelissen <marcone@google.com> When using O_CREAT, the mode should be specified.

Change-Id: Id364072fce62388eba47207a97800eb185480633
ndroid_server_Watchdog.cpp
44e39d608cfddcbf56123480123822f26f20f259 09-May-2011 The Android Automerger <android-build@android.com> Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
c351f52a4a40155444e956824dd738d7a41678d9 04-May-2011 Irfan Sheriff <isheriff@google.com> DO NOT MERGE Handle GET_POWER failures

Return a failure when GET_POWER returns a non-conforming
format

Bug: 4380317
Change-Id: Ie723c424ab07774f2be2594aa5deeaa5cd5ac280
ndroid_net_wifi_Wifi.cpp
ed30fd8e9a2d65ee5c8520de55b0089c219f390c 23-Apr-2011 Chet Haase <chet@google.com> Add ability for hierarchyviewer to output displaylist info

Clicking on a node in hierarchyviewer1 and hierarchyviewer2 and then
clicking the new "Dump DisplayList" button will cause the display
list for the selected node (including its children) to be output into
logcat.

Change-Id: Iad05f5f6cca0f8b465dccd962b501dc18fe6e053
ndroid_view_GLES20Canvas.cpp
75d14c33d795621988a1df173d3d69abe0b6c8f4 05-May-2011 Nicu Pavel <npavel@mini-box.com> Use proper type for oob variable in register_agent.
Without this change the BluetoothEventLoop crashes on my armv5 arch board.

Change-Id: Ia10382f0aea4736be268512ccf9d5c5cde052851
ndroid_server_BluetoothEventLoop.cpp
33bf60a3fcab0489077314e845323de2d856af43 05-May-2011 Irfan Sheriff <isheriff@google.com> am 86654eda: am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures

* commit '86654eda96b005ea21bfe4d29cd042187e497a8f':
Handle GET_POWER failures
86654eda96b005ea21bfe4d29cd042187e497a8f 05-May-2011 Irfan Sheriff <isheriff@google.com> am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures

* commit '8a14d8b9c03c611cabde5743cfdcc9ff51314550':
Handle GET_POWER failures
8a14d8b9c03c611cabde5743cfdcc9ff51314550 05-May-2011 Irfan Sheriff <isheriff@google.com> am 1a5b6098: Handle GET_POWER failures

* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
Handle GET_POWER failures
a17de9b493123f0d6e6d0b842150bf29322b7a88 05-May-2011 Chet Haase <chet@google.com> Revert "Add ability for hierarchyviewer to output displaylist info"

This reverts commit b2a4b52e8d5e499d33e2765e8c47851bf0266299.
ndroid_view_GLES20Canvas.cpp
42a3a39e231c02a3c2b7624cb7c64fe10d6ff4b0 05-May-2011 Chet Haase <chet@google.com> Merge "Add ability for hierarchyviewer to output displaylist info"
b2a4b52e8d5e499d33e2765e8c47851bf0266299 23-Apr-2011 Chet Haase <chet@google.com> Add ability for hierarchyviewer to output displaylist info

Clicking on a node in hierarchyviewer1 and hierarchyviewer2 and then
clicking the new "Dump DisplayList" button will cause the display
list for the selected node (including its children) to be output into
logcat.

Change-Id: Id32f62569ad1ab4d533bc62987f3a7390c1bb4e6
ndroid_view_GLES20Canvas.cpp
1a5b6098d5002ae07ce3f9bc514400a87c2b64fa 04-May-2011 Irfan Sheriff <isheriff@google.com> Handle GET_POWER failures

Return a failure when GET_POWER returns a non-conforming
format

Bug: 4380317
Change-Id: If1ce73572ae261cd6998e4289e21112c88859437
ndroid_net_wifi_Wifi.cpp
c6cc0f8c19d9eccf408a443fa2bf668af261dcd0 12-Apr-2011 Joe Onorato <joeo@google.com> Rename ViewRoot to ViewAncestor.

ViewRoot is about to be a new public class for poking at ViewAncestor.

Change-Id: Ie95d707c6d8bbb48f78d093d7b2667851812a7d5
ndroid.mk
ndroidRuntime.cpp
ndroid_view_ViewAncestor.cpp
ndroid_view_ViewRoot.cpp
d58efd38e7ef62f3392ad4decc44f794f67044c0 04-May-2011 Bjorn Bringert <bringert@android.com> Merge "Check for exceptions before calling back into Java"
9c7ac0d142eaf4b083a309299ab023932a9bb109 15-Apr-2011 Iliyan Malchev <malchev@google.com> frameworks/base: include system/core header camera.h in Camera.h

We define struct CameraInfo in this camera/Camera.h, even though an identical
struct camera_info is defined in hardware/camera.h (but not in
hardware/camera_defs.h). We may not export struct definitions from the HAL
into headers which may find their way into the NDK.

This commit also renames FRAME_CALLBACK_FLAG_xxx to CAMERA_FRAME_CALLBACK_xxx.

Change-Id: I3e2ddd01d61bf5371ff2fc1a397995e0f1ee11f8
Signed-off-by: Iliyan Malchev <malchev@google.com>
ndroid_hardware_Camera.cpp
df0a7fbdcff3c683641b7980da50a7d0eebe0876 03-May-2011 Romain Guy <romainguy@google.com> Merge "Allows to render with an OpenGL context inside a TextureView."
8f0095cd33558e9cc8a440047908e53b68906f5f 03-May-2011 Romain Guy <romainguy@google.com> Allows to render with an OpenGL context inside a TextureView.

Change-Id: I59453f7fc3997f0502a1c5d325d37fed376fabc7
ndroid.mk
ndroidRuntime.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_TextureView.cpp
om_google_android_gles_jni_EGLImpl.cpp
a8e0dfae06298b375637813a3263a62749dd0b82 02-May-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of db46fa25 to master

Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
d713683f9f5230d6a234ce8efbaf3c0959b81e22 02-May-2011 Irfan Sheriff <isheriff@google.com> am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE

* commit 'd369d64ee7931726d479e60e64d76a31fdba4a8f':
Add DhcpStateMachine for interation with dhcpcd
db46fa25be0a3e8040b118f688b69dd526aed86d 02-May-2011 Robert Greenwalt <rgreenwalt@google.com> am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE

* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
Add RouteInfo objects for tracking routes.
a47c40193fcbe9ca07facea78b2828afdae5e025 02-May-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
d369d64ee7931726d479e60e64d76a31fdba4a8f 02-May-2011 Irfan Sheriff <isheriff@google.com> am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE

* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
Add DhcpStateMachine for interation with dhcpcd
aa70f101e08098ed9cb190abe2d7f952561026b8 28-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Add RouteInfo objects for tracking routes.

Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
ndroid_net_NetUtils.cpp
e7cb25916c70625e9086386293247ec604753d5c 02-May-2011 Conley Owens <cco3@android.com> am 1eb31b43: am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class"

* commit '1eb31b434fdc325c55b65ecf1783c63b2fdfa669':
Fix memory leak of SkMovie class
31be7cf4c7aef140f2a576975a7fd31e062f6964 28-Apr-2011 Irfan Sheriff <isheriff@google.com> Add DhcpStateMachine for interation with dhcpcd

- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
simultaneously
- Optionally, a controller can request a notification prior
to DHCP request/renewal being sent

Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
ndroid_net_NetUtils.cpp
1eb31b434fdc325c55b65ecf1783c63b2fdfa669 30-Apr-2011 Conley Owens <cco3@android.com> am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class"

* commit '718516f3b73468c480ef8d2283a1c80a6223658d':
Fix memory leak of SkMovie class
9fd8e0579fb3306f61ba1716b1977562ae3626e1 29-Apr-2011 Conley Owens <cco3@android.com> Merge "Fix memory leak of SkMovie class"
ad44445c772efe66fdf063aa8f78d7ae3233570e 29-Apr-2011 Romain Guy <romainguy@google.com> Merge "New widget: TextureView Bug #4343984"
aa6c24c21c727a196451332448d4e3b11a80be69 29-Apr-2011 Romain Guy <romainguy@google.com> New widget: TextureView
Bug #4343984

TextureView can be used to render media content (video, OpenGL,
RenderScript) inside a View.

The key difference with SurfaceView is that TextureView does
not create a new Surface. This gives the ability to seamlessly
transform, animate, fade, etc. a TextureView, which was hard
if not impossible to do with a SurfaceView.
A TextureView also interacts perfectly with ScrollView,
ListView, etc. It allows application to embed media content
in a much more flexible way than before.

For instance, to render the camera preview at 50% opacity,
all you need to do is the following:

mTextureView.setAlpha(0.5f);
Camera c = Camera.open();
c.setPreviewTexture(mTextureView.getSurfaceTexture());
c.startPreview();

TextureView uses a SurfaceTexture to get the job done. More
APIs are required to make it easy to create OpenGL contexts
for a TextureView. It can currently be done with a bit of
JNI code.

Change-Id: Iaa7953097ab5beb8437bcbbfa03b2df5b7f80cd7
ndroid_view_GLES20Canvas.cpp
24fc2fb1c541e954b83fd31ea9f786a5e9b45501 20-Apr-2011 Dima Zavin <dima@android.com> audio/media: convert to using the audio HAL and new audio defs

Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
9013ccd9fcf3ac317e122aff08cb27cdac2b95fe 26-Apr-2011 Bjorn Bringert <bringert@android.com> Check for exceptions before calling back into Java

This fixes a crash when StrictMode is on and a Binder
call throws an exception.

Bug: 4337406
Change-Id: I5c4d4a8bcd92aa5b0d72b7957578df980cb2a783
ndroid_util_Binder.cpp
8f67eae87ae84fb0c17e7fd4c9b6a62e73b0de29 26-Apr-2011 Romain Guy <romainguy@google.com> Take the index parameter into account in drawTextOnPath.

Change-Id: I92ff9b2c0fe16a467996ae1973bbfd4fad5ef750
ndroid/graphics/Canvas.cpp
589e4e27ee071f028a4bc72b91a1fb053ab13404 26-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #4338103 (Android Arabic and Hebrew input is broken)

- fix glyph order when there is only a single run
- update tests

Change-Id: I113f28a8c76cab622fb75ce84bc50d1d38fa254e
ndroid/graphics/TextLayoutCache.cpp
3f92b8b18856371f561955197b488191433977e6 23-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Clean getTextRunAdvances() APIs"
0a1413e4bf9dcda2a8abb2287e43f612a7fb2453 22-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Clean getTextRunAdvances() APIs

- remove ICU reference in API names
- use a "reserved" int parameter to pass either "0" for Harfbuzz or "1" for "ICU"

Change-Id: I88b4f76feafd203a6999cd7349402fa36a9a4b2a
ndroid/graphics/Paint.cpp
5db1314192b462f3666455fdae42a96ec2918ce9 22-Apr-2011 Mathias Agopian <mathias@google.com> Merge "Get rid of the "pid" parameter from createSurface"
b104800b6cfaec78e5912015c63f8fc6a2437d0e 22-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "TextLayout cache - update size and improve logging"
010d5c4e5ba7a229f621f08f5d1c5cbff7643402 22-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> TextLayout cache - update size and improve logging

- set size to 256K
- add pid logging
- fix percent gain computation

Change-Id: Id6da4d606147294e05597022414531c346860f45
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
44bc17c6b517aef35a390c81b5aa79c4f284f744 21-Apr-2011 Dianne Hackborn <hackbod@google.com> Rework display size access.

Applications now get the display size from the window manager. No
behavior should be changed yet, this is just prep for some real
changes.

Change-Id: I2958a6660895c1cba2b670509600014e55ee9273
ndroid_view_Display.cpp
9638e5c167be321643bf3f3ee39e3fb45541fb3b 20-Apr-2011 Mathias Agopian <mathias@google.com> Get rid of the "pid" parameter from createSurface

Change-Id: I28635e3f803e6abe965d79998e305f54a202465d
ndroid_view_Surface.cpp
e41588b41c1e2ee270f177819a4e15487207963f 20-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Use Harfbuzz for Paint drawText / measureText / breakText APIs"
4f810c8535055bd9a8d89a7d1ba0a7c712a8843d 19-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Use Harfbuzz for Paint drawText / measureText / breakText APIs

Change-Id: I35aa02bfd45629bf5c560f98a28399ff3d0fc900
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
3f14891fc9e764d97de07b109f066aedfff90c2e 20-Apr-2011 Jeff Brown <jeffbrown@google.com> Merge "Initial checkin of spot presentation for touchpad gestures."
2352b978a3c94cd88f41d0d908f961333fdac1e9 13-Apr-2011 Jeff Brown <jeffbrown@google.com> Initial checkin of spot presentation for touchpad gestures.

Added a new PointerIcon API (hidden for now) for loading
pointer icons.

Fixed a starvation problem in the native Looper's sendMessage
implementation which caused new messages to be posted ahead
of old messages sent with sendMessageDelayed.

Redesigned the touch pad gestures to be defined in terms of
more fluid finger / spot movements. The objective is to reinforce
the natural mapping between fingers and spots which means there
must not be any discontinuities in spot motion relative to
the fingers.

Removed the SpotController stub and folded its responsibilities
into PointerController.

Change-Id: I5126b1e69d95252fda7f2a684c9287e239a57163
ndroid.mk
ndroidRuntime.cpp
ndroid_view_PointerIcon.cpp
ndroid_view_PointerIcon.h
b39d89735b8d88669c779b6a8549a179fd0f6f44 19-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Use Harfbuzz for Canvas drawText APIs

Change-Id: I661d5e9e0bbe9a859e7a000cb161994d29add099
ndroid/graphics/Canvas.cpp
06732fde78b1caf8b5e6c0ef93357cfacedd1823 19-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Return chars advances instead of glyphs advances

- take care of log_clusters for char/glyph mapping
- remove verbose logs

Change-Id: Id19af2b4a46cc4ada0b99263a3208de14a979ba5
ndroid/graphics/RtlProperties.h
ndroid/graphics/TextLayoutCache.cpp
f7b9e7848623efcb4f596aa06f055bb4d2ebe7f5 18-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Add Unicode BiDi Algo before drawing text in Canvas"
689e515ed2b8064c15e54d8ab69d87de54c5e0d6 14-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Add Unicode BiDi Algo before drawing text in Canvas

- only for temporary API
- update BiDiTest

Change-Id: Ifd445799dc0fda4da896246e41978cd8d71aa035
ndroid/graphics/Canvas.cpp
ndroid/graphics/RtlProperties.h
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
d195e5ab401432ddac659791640a2927fc668699 14-Apr-2011 Elliott Hughes <enh@google.com> Replace a custom AndroidRuntime::findClass with a more targeted fix.

This seems simpler and more contained, and I think the comment explaining
why hoop-jumping is necessary is a bit clearer now.

Change-Id: Ief4afd7cbb42188ed835fce23e497520bdb753a8
ndroidRuntime.cpp
ndroid_util_Process.cpp
13f3683d935394ca18c215682aa3ecbd1101ade6 13-Apr-2011 Elliott Hughes <enh@google.com> Merge "More native code cleanup."
f17b971a75577a3a0e5ab574618e0756d167f5d4 13-Apr-2011 Elliott Hughes <enh@google.com> More native code cleanup.

Use ScopedUtfChars (fixes a leak in TrafficStats, and fixes a crash in Wifi in
a case where GetStringChars could have been called with a pending exception).

Change-Id: I3465ff392b4038dfdafa6af80ec1314cc6d6a11c
ndroid_net_TrafficStats.cpp
ndroid_net_wifi_Wifi.cpp
f9dc3db273ccb770a7f55617fa22ffd5a7bf75d6 13-Apr-2011 Elliott Hughes <enh@google.com> Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."
e9cf71dfd01f3e2006462de99d5c423038e20b65 13-Apr-2011 Elliott Hughes <enh@google.com> Merge "Don't allocate a raw object then call its constructor manually..."
cf6f7a0f006c0fcf59bb634cbe79f2a8500fd92a 13-Apr-2011 Elliott Hughes <enh@google.com> Don't allocate a raw object then call its constructor manually...

We can do this in one step.

Change-Id: Id6b70c83002038caf62fe89cc769eca54ae0c055
ndroid/graphics/Graphics.cpp
ndroid/graphics/Movie.cpp
ndroid_emoji_EmojiFactory.cpp
4cb1753ec6e90d7e747880c599dc1c164a568cf3 13-Apr-2011 Elliott Hughes <enh@google.com> Remove useless forward declarations.

Change-Id: I8f191367acb18ea9a3f807e791099e0485b1b249
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/Interpolator.cpp
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/YuvToJpegEncoder.cpp
4390758f277645de6e81f6482d582473383cc917 12-Apr-2011 Elliott Hughes <enh@google.com> Use an @hide libcore API to get the FileDescriptor from a Socket.

Saves having your own native code...

Change-Id: Ib082a6530bcf743a35031500cee6318bc92d4d35
ndroid_os_ParcelFileDescriptor.cpp
dd66bcbf9d6ef0c50a18d9c4b1b39ce7ef7afcc4 12-Apr-2011 Elliott Hughes <enh@google.com> More native code cleanup.

Don't keep unused global references to classes, don't throw exceptions
when an exception is already pending, and fix a (harmless) misunderstanding
about how GetStringChars works.

Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid_content_res_ObbScanner.cpp
ndroid_emoji_EmojiFactory.cpp
ndroid_hardware_UsbDevice.cpp
ndroid_net_NetUtils.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_nio_utils.cpp
ndroid_os_FileUtils.cpp
ndroid_os_MemoryFile.cpp
ndroid_pim_EventRecurrence.cpp
ndroid_text_AndroidBidi.cpp
ndroid_text_AndroidCharacter.cpp
ndroid_util_EventLog.cpp
ndroid_util_Process.cpp
om_android_internal_graphics_NativeUtils.cpp
om_google_android_gles_jni_EGLImpl.cpp
ae447967b5f07dd789a7488aa9e190637478a97c 12-Apr-2011 Elliott Hughes <enh@google.com> Merge "Kill the global references in the OpenGL wrappers."
a3804cf77f0edd93f6247a055cdafb856b117eec 12-Apr-2011 Elliott Hughes <enh@google.com> You don't need to poke around inside FileDescriptor manually.

We can help you with that.

Note also that getParcelFileDescriptorFD did no such thing. All its callers
were passing in a regular java.io.FileDescriptor and expecting the int. No
ParcelFileDescriptors involved.

Change-Id: Idc233626f20c092e719f152562601f406cc1b64a
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_BackupHelperDispatcher.cpp
ndroid_backup_FileBackupHelperBase.cpp
ndroid_database_SQLiteStatement.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_media_JetPlayer.cpp
ndroid_os_ParcelFileDescriptor.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Binder.cpp
ndroid_util_Binder.h
ndroid_view_GLES20Canvas.cpp
24ce5fb2cc09d0a14406e7b935f8648c5720d27e 09-Apr-2011 Elliott Hughes <enh@google.com> Kill the global references in the OpenGL wrappers.

Just use jniThrowException instead. Note that it would be trivial to throw
seemingly more appropriate exceptions (NullPointerException and
OutOfMemoryException in particular), but I'm only attempting to preserve
existing behavior here.

I also found shadowing bugs in some of the special-case functions, which
would previously always have leaked memory.

This also moves an accidental change to a generated file (ActivityThread ->
AppGlobals) into the generator, so it won't be overwritten in future.

Change-Id: Iab570310b568cb406c60dd0e2b8211f8a36ae590
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
om_google_android_gles_jni_GLImpl.cpp
dcd2ef9acc34c70e7a3c698d7e01e8af0af00f20 09-Apr-2011 Elliott Hughes <enh@google.com> Merge "More JNI exception-throwing cleanup."
69a017bc1d1649350f830dfada5c6ed5eac0b770 08-Apr-2011 Elliott Hughes <enh@google.com> More JNI exception-throwing cleanup.

There are a few (unimportant) bug fixes here. There were several attempts to
throw exceptions in situations where there's already a pending exception.

There were also cases where the code was wrong; it was checking for a NULL
return from Get*ArrayElements and throwing NPE, but passing NULL is an error
that causes a crash and a NULL return means an exception has already been
thrown. I didn't want to get into the Scoped* classes just yet, but that
was by far the easiest way to fix this.

Change-Id: I0b31160ee51b96e82539f6514b8412b149dba7c3
ndroid.mk
ndroid/graphics/Graphics.cpp
ndroid/graphics/NinePatch.cpp
ndroid_hardware_Camera.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_ToneGenerator.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_os_SystemProperties.cpp
ndroid_pim_EventRecurrence.cpp
ndroid_text_AndroidCharacter.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Binder.cpp
ndroid_util_EventLog.cpp
ndroid_util_Process.cpp
om_android_internal_graphics_NativeUtils.cpp
om_android_internal_os_ZygoteInit.cpp
0343a7eb6d7cd2bd44dabe5119e2366e84427c93 08-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "TextLayoutCache - add glyphs caching"
fcf2be1846935e7983ea2fe87fdd4d7af27764b6 06-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> TextLayoutCache - add glyphs caching

- cache glyphs after Harfbuzz shaping
- use "m" prefix for member variables
- add temporary API for drawing text with glyphs
- update BiDiTest app

Change-Id: I619b3f313b15f010018daad21b3e5e486619b4e4
ndroid/graphics/Canvas.cpp
ndroid/graphics/RtlProperties.h
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
ceb889711ff182aa0635f0776fdeeb7185f3a105 08-Apr-2011 Brian Carlstrom <bdc@google.com> Merge "Tolerate missing AccountManager resource, not just missing resource name"
fbb0788463c17fd2d718cefc11474357d3433dcb 08-Apr-2011 Elliott Hughes <enh@google.com> Merge "Use jniThrowException for exception throwing from native code."
8451b25a4422656bbd6657a5855e69c0f4d53c74 08-Apr-2011 Elliott Hughes <enh@google.com> Use jniThrowException for exception throwing from native code.

I'll do media and the generated gl stuff separately. Otherwise, this
cleans up all direct calls of ThrowNew/Throw except the one in the
binder that needs to remain.

Change-Id: I8f95a5f020f53b25926ad31ac0c9477ddf85d04b
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Movie.cpp
ndroid/graphics/Paint.cpp
ndroid/opengl/util.cpp
ndroid_content_res_ObbScanner.cpp
ndroid_graphics_PixelFormat.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_os_Power.cpp
ndroid_util_Log.cpp
ndroid_util_StringBlock.cpp
ndroid_util_XmlBlock.cpp
ndroid_view_Display.cpp
ndroid_view_Surface.cpp
om_google_android_gles_jni_EGLImpl.cpp
e17aeb31030cfeed339a39a107912ad5e9178390 08-Apr-2011 Dianne Hackborn <hackbod@google.com> Improve activity manager debug dumps.

Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem. Also lots of general cleanup of the am
dump output.

Change-Id: Id0dbccffb217315aeb85c964e379833e6aa3f5af
ndroid_util_Binder.cpp
46703b099516c383a6882815bcf9cd4df0ec538d 07-Apr-2011 Brian Carlstrom <bdc@google.com> Tolerate missing AccountManager resource, not just missing resource name

In addition to the primary change in the subject, also some minor cleanup of javadoc, typos, CloseGuard warning, etc found while working on a new AbstractAccountAuthenticator.

Change-Id: I73f3408773a43a0021a15f8d051fd3dbbdf898a5
ndroidRuntime.cpp
85b65f2008e7eb8ef492a63cba80555f58915769 06-Apr-2011 Glenn Kasten <gkasten@google.com> Merge "Miscellaneous code cleanup in audio framework"
3fc982f41fda1f254bfbc35490d81cd82a0ed90a 31-Mar-2011 Dianne Hackborn <hackbod@google.com> Add new resource configurations for screen width/height in "dp".

You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I22f8afa136b4f274423978c570fa7c9855040496
ndroid_util_AssetManager.cpp
ed0079ddddd4070f3369b13b274222da2e69f4b9 04-Apr-2011 Glenn Kasten <gkasten@google.com> Miscellaneous code cleanup in audio framework

Changes:
- Move declaration of kClassPathName to top of file so it can be used
in more than one place, instead of "android/media/AudioSystem".
- Make private methods static.
- Add comment to stream_type, audio_mode, force_use types that they must match
values in AudioSystem.java.
- Add comment about unused types mp3_sub_format and vorbis_sub_format.
- Fix typos.
- Use @ in javadoc comments.
- Delete dead APIs setMode, getMode, setRouting, getRouting in AudioSystem.java
(they are all hidden, deprecated, and unused by rest of framework)
- Delete unused private log method.
- Fix pathname for android_media_AudioSystem.cpp.
- Improve code formatting for space after == and !=.
- Add logging of delta for changing audio policy manager ref count.

Change-Id: I18037c7beb8ab76d1fda08c11e589f6e591d36e1
ndroid_media_AudioSystem.cpp
fb84ce0df6b2db84981e4efa4530397a85240d4a 06-Apr-2011 Brian Carlstrom <bdc@google.com> Merge "Don't use local ref for cached jclass reference in JNI code"
46e18c11d46a2bc1a46174f963d0ed1224d94cd2 06-Apr-2011 Brian Carlstrom <bdc@google.com> Don't use local ref for cached jclass reference in JNI code

Change-Id: Id45b2acb358a819f2fd332e99f3a095f6fc7299b
related-to-bug: 4241138
ndroid/graphics/Movie.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_net_NetUtils.cpp
ndroid_view_GLES20Canvas.cpp
955276656755bdc85518049305a8492b3f7f8b0a 06-Apr-2011 Irfan Sheriff <isheriff@google.com> Merge "Add support for supplicant SCAN_INTERVAL"
2b7f63887e39079a52592fb4507d8daaf90e8afa 25-Mar-2011 Irfan Sheriff <isheriff@google.com> Add support for supplicant SCAN_INTERVAL

Also, allow scan interval for framework and supplicant
to be configured at build time or run time

Bug: 4144882
Change-Id: I877f4bcc872597b44d3f4da85cf2bc0f16e09444
ndroid_net_wifi_Wifi.cpp
14faa3bd8bd6d1deab63a40ad2f8b6e451a16208 30-Mar-2011 Jaikumar Ganesh <jaikumar@google.com> Update for change in Bluez version.

1. Implement address copy
2. Update device properties parsing.

Change-Id: I112371c848cdfaa2f02e0c447154070c0a38737f
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_common.cpp
72b18064a2149c664110712a7ec2a5820b5d07c8 24-Mar-2011 Jaikumar Ganesh <jaikumar@google.com> Disable Out of Band pairing for Bluez upgrade.

This is a temporary change, till OOB pairing is redone.

Change-Id: I3e25fc7923eb4c70b4139880da884acf43098386
ndroid_server_BluetoothEventLoop.cpp
23e0df585426ee5527b98c00c5f217628b507d09 06-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "TextLayoutCache - more code refactoring"
48796a81be31e42ee267347156c94445cb9fb67a 06-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> TextLayoutCache - more code refactoring

- move code from .h file to .cpp file

Change-Id: Ib8201a20e2767ef5d92707a6f4d8d79a3673e04d
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
3a6076ec2860af09eed3cea5502ab27c86e42fc4 06-Apr-2011 Brian Carlstrom <bdc@google.com> Merge "Fix usages of PopLocalFrame to include returned local reference"
b32b1ddf722a94962321f78c8cd87c6924e1e9a9 06-Apr-2011 Brian Carlstrom <bdc@google.com> Fix usages of PopLocalFrame to include returned local reference

Change-Id: Ibd7a37b4035862718cb625110cfbba741537c17a
ndroid_server_BluetoothService.cpp
1de9e7a9dffb4391a446000f748e4c017d948f6b 05-Apr-2011 Fabrice Di Meglio <fdimeglio@google.com> Code refactoring for TextLayoutCache

- rename TextLayoutCache entry name
- update references to old name
- better variable names in TextLayoutCache::getRunAdvances()

Change-Id: I5173fbc8af79437ce4786084580426f130120ce8
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
9a9adb5d25e764bba4df10f157c9b7832ae5f943 05-Apr-2011 Brad Fitzpatrick <bradfitz@android.com> am 5851b866: am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"

* commit '5851b8662dc95372d68df293cb13c59da0cf8582':
Fix data corruption when writing to Bluetooth socket
5851b8662dc95372d68df293cb13c59da0cf8582 05-Apr-2011 Brad Fitzpatrick <bradfitz@android.com> am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"

* commit '27e00544ea08d25e8e9b1b94264205f9d53030fb':
Fix data corruption when writing to Bluetooth socket
27e00544ea08d25e8e9b1b94264205f9d53030fb 04-Apr-2011 Brad Fitzpatrick <bradfitz@android.com> am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"

* commit '9907d161584415c81de1099678f160da172fd1a6':
Fix data corruption when writing to Bluetooth socket
36aa8839d5509d12323a6025329d6913cbaa353b 22-Oct-2010 Mike Playle <mike.playle@realvnc.com> Fix data corruption when writing to Bluetooth socket

Writes to Bluetooth sockets are handled by writeNative() in
android_bluetooth_BluetoothSocket.cpp. This calls asocket_write()
which is implemented in abort_socket.c.

This latter function sleeps until poll() indicates that the socket is
writeable, then calls write() once, returning the number of bytes
written. However writeNative() just returns this byte count to the
caller; it's eventually ignored in BluetoothOutputStream.java. This
doesn't match the semantics of a Java OutputStream, which is required
to block until all bytes have been written.

This fix adds a loop to writeNative() that repeatedly calls the lower
level write function until all the data has been written (or an error
occurred in which case we should exit the loop early). With this
change it is possible to write large amounts of data to a Bluetooth
socket without experiencing data loss.

Change-Id: I0b464382817e15adec32ba0e3cb37e7d1cccc730
ndroid_bluetooth_BluetoothSocket.cpp
aedc2a8fcc2841063b3324e09234eff03044a324 03-Apr-2011 Brian Carlstrom <bdc@google.com> Merge "Tracking merge of dalvik-dev to master"
08065b9f09ead8895d97b2971622af8c179e1768 02-Apr-2011 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to master

git cherry-pick --no-commit a80febd83c8bf0b6717da2a7136179bdc906a5b7

git cherry-pick --no-commit 5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd

git cherry-pick --no-commit 4886db14c9eee4b6fee69bd54c57c5af04709c4c

git cherry-pick --no-commit 560c685e448769904047507b9484ce8111967d7e

git cherry-pick --no-commit 63dde7a2fcfa53dc531558635b64cea613d3cdb4

git cherry-pick --no-commit 74e5cb91060a379d98dd3a333b5f231bfb4f502e

git cherry-pick --no-commit 1cc8c9708b555e2e338b7798d38887a2fefcfea6

git cherry-pick --no-commit 09625a21f5abe0c0db15757f58585d552d62c3d7

git cherry-pick --no-commit fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458

git cherry-pick --no-commit a68cb7fa3ab42854768b8145ff85231663770292

git cherry-pick --no-commit 716beb1c131dd2c6b805d4f681debaa20075010c

git cherry-pick --no-commit 8c29b1097a7afe3a77e27546a56e396f3620a4ec

git cherry-pick --no-commit 9c6a1a55d1c8086c1cc57464eea43725694ff70c

git cherry-pick --no-commit b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8

Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
ndroidRuntime.cpp
905787a7c91d23daa4efc3d16bd8cbf1a683e779 01-Apr-2011 Chet Haase <chet@google.com> Fix the build: break due to no OPENGL in some builds

Change-Id: Ibceb501d2361df9b74dc1964ff6b92ec8452f219
ndroid_view_GLES20Canvas.cpp
0865d33d976bb6c8ac34da9551ff62fbb60d715a 01-Apr-2011 Chet Haase <chet@google.com> Fix the build - change a reference to a namespace specification

Change-Id: I79c8b571e6555451611b825669963f042d901f1a
ndroid_view_GLES20Canvas.cpp
09bc5f5b5789818bee8d6eae3df68d855c627326 01-Apr-2011 Chet Haase <chet@google.com> Merge "Add logging of graphics acceleration info to bugreports"
9c1e23baf5bfbebd1aebbd6d9a18c225325567ce 24-Mar-2011 Chet Haase <chet@google.com> Add logging of graphics acceleration info to bugreports

Change-Id: I9fa4cda6ccf92df9d1c644ccdc0e7274a30106e0
ndroidRuntime.cpp
ndroid_view_GLES20Canvas.cpp
bc2278b95f4012d81918b0faedea36011f122a33 01-Apr-2011 Jeff Brown <jeffbrown@google.com> Merge "Add a little input event consistency verifier."
21bc5c917d4ee2a9b2b8173091e6bba85eaff899 01-Mar-2011 Jeff Brown <jeffbrown@google.com> Add a little input event consistency verifier.

The idea is to assist with debugging by identifying cases in which
the input event stream is corrupted.

Change-Id: I0a00e52bbe2716be1b3dfc7c02a754492d8e7f1f
ndroid_view_MotionEvent.cpp
0fb1ac0038c9e67b5f321aa2ec7f7bfec5db6db2 31-Mar-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Code cleaning - suppress non useful code"
99e95b0e1228dfeb2813590eedbef877ed2bd421 31-Mar-2011 Fabrice Di Meglio <fdimeglio@google.com> Code cleaning - suppress non useful code

Change-Id: I3f3bffdd1f5d64a6b601d56bee3b5fc8147086bd
ndroid/graphics/TextLayoutCache.h
aabe537f1ed3b64f755af9fc62022d6074eec169 31-Mar-2011 Fabrice Di Meglio <fdimeglio@google.com> Update TextLayoutCache key for supporting more SkPaint properties

Change-Id: I35bb991e536e662c1a0724ab7e311fba3d52487a
ndroid/graphics/TextLayoutCache.h
eee49c699c035ffba188417489f40d34f587d65c 25-Mar-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix text redering issue where the text was sometimes truncated

- mostly was visible in Settings apps / Wi-Fi networks summary info for each network
- correctly setup the local SkPaint for advances computation
- improve test app for adding live resizing

Change-Id: Ia031fe1b115b521ba55c7e68f2a26300f02e48ca
ndroid/graphics/HarfbuzzSkia.cpp
ndroid/graphics/HarfbuzzSkia.h
ndroid/graphics/Paint.cpp
ndroid/graphics/RtlProperties.h
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.h
571a24bfe31f2267d9f71a00ac0aba920c420f91 29-Mar-2011 Matthew Xie <mattx@google.com> Merge "Use mask_eighth_bit function to replace is_ascii check."
73108675c944ab4ee89631dced23566b12341b66 28-Mar-2011 Jack Palevich <jackpal@google.com> Add Java support for a few accidentally omitted OpenGL ES APIs.

Fixes 3491494 Support OpenGL APIs: glBlendEquationSeparate and friends

Change-Id: I8fdc94b6ea14e9a7e3d402a965d500790a3d8f77
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_opengl_GLES20.cpp
08d7778f081aae745e6ad9e5350221b21dbf352e 28-Mar-2011 Kimiyoshi Kusaka <kusaka.kimiyoshi@sharp.co.jp> Fix memory leak of SkMovie class

Movie class doesn't have finalize method.
So memory leak of SkMovie class of native Skia occurs when Movie class is released.
I add finalize method to Movie class (Movie.java) and jni destructor method to SkMovie class (Movie.cpp).

Change-Id: I4dae9dd95f128cbfade50bef978b219ba99321dd
ndroid/graphics/Movie.cpp
696257ccf315a1da042787c5b2d1f80c7146fc94 26-Mar-2011 Mathias Agopian <mathias@google.com> merge libsurfaceflinger_client into libgui

this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
ndroid.mk
251ae9a7b466fe3938db359e3a61a198b315c40c 25-Mar-2011 Fabrice Di Meglio <fdimeglio@google.com> Fix text redering issue where the text was sometimes truncated

- mostly was visible in Settings apps / Wi-Fi networks summary info for each network
- use ceilf() instead of roundf()

Change-Id: I80310a9f00e8f7eb066d8ff03f52ea8f9cd85880
ndroid/graphics/TextLayoutCache.h
aa5eb64a0c0709a05731a934c033f213d6dbcc2f 23-Mar-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Use Harfbuzz instead of ICU4C for computing advances"
9f82b580d744ce4baf057b061994394dcf239eed 08-Mar-2011 Fabrice Di Meglio <fdimeglio@google.com> Use Harfbuzz instead of ICU4C for computing advances

- use Harfbuzz shaper for shaping and getting glyphs
- add test app for showing result of drawText() and drawGlyphs()
- add private API in Canvas and Paint for test app

Change-Id: Ia15be216f8636d2d864066e9b7de2f53008c30f6
ndroid.mk
ndroid/graphics/Canvas.cpp
ndroid/graphics/HarfbuzzSkia.cpp
ndroid/graphics/HarfbuzzSkia.h
ndroid/graphics/Paint.cpp
ndroid/graphics/RtlProperties.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
1a81aea8144b92ebaf807af9de69a0ab3415a5aa 21-Mar-2011 Romain Guy <romainguy@google.com> Update GL textures when changing a Bitmap's pixels
Bug #4146495

Change-Id: I4fe3f8501373b86b164af11ae51642b140035bb8
ndroid/graphics/Bitmap.cpp
fe90059c8a8011225730c036715ba3d675866738 21-Mar-2011 Matthew Xie <mattx@google.com> Use mask_eighth_bit function to replace is_ascii check.

According to ITU V.250 section 5.1, IA5 7 bit chars are used, the eighth bit or higher bits are ignored if they exists.

bug: 3379257

Change-Id: Id46bda10702f4defa148b34b7538bd5b38ffc7fc
ndroid_bluetooth_HeadsetBase.cpp
ed6fcb034b44d9a6ac2fc72fee6030417811f234 21-Mar-2011 Romain Guy <romainguy@google.com> Add support for drawPoint() and drawPoints().

Change-Id: I01bef50c08ec3160f8d40dc060b2cf6c2e4d7639
ndroid_view_GLES20Canvas.cpp
173e445f3bbb7c85833848dea471fe4d091f3b70 21-Mar-2011 Albert Mojir <albert.mojir@sonyericsson.com> Bluetooth: correcting return value from cancelDiscovery

BluetoothAdapter.cancelDiscovery was previously always
returning false.

Change-Id: Ic1fd134d4b710438d95c5b8ca009104529dd1bf5
ndroid_server_BluetoothService.cpp
a168d7372132d6c87835878794b6ed43d0d282fd 19-Mar-2011 Romain Guy <romainguy@google.com> Correctly apply filters to Alpha8 bitmaps.

This change also removes unnecessary operations from display lists.

Change-Id: I627f85861982731f0ee7705b48b36d9c56f22f39
ndroid_view_GLES20Canvas.cpp
c5f94d8a4779050125145396ca83fbc862c7ed6b 18-Feb-2011 Eino-Ville Talvala <etalvala@google.com> Add support for timestamps into SurfaceTexture.

API addition: The timestamps are represented as nanoseconds from some
arbitrary time point. Like the SurfaceTexture transform matrix, the
timestamp retrieved by getTimestamp is for the last frame sent to the
GL texture using updateTexImage().

Camera HAL change: Expect vendors to set these timestamps using
native_window_set_buffers_timestamp(). For now, they are
autogenerated by SurfaceTextureClient if set_buffers_timestamp() is
never called, but such timing is likely not accurate enough to pass a
CTS test.

bug:3300707

Change-Id: Ife131a0c2a826ac27342e11b8a6c42ff49e1bea7
ndroid/graphics/SurfaceTexture.cpp
843e29d3751017267b96565c543df0301c31a9f7 16-Mar-2011 Jeff Brown <jeffbrown@google.com> Merge "Improve VelocityTracker numerical stability."
2ed2462aa29c564f5231f317c27b3188da875e52 15-Mar-2011 Jeff Brown <jeffbrown@google.com> Improve VelocityTracker numerical stability.

Replaced VelocityTracker with a faster and more accurate
native implementation. This avoids the duplicate maintenance
overhead of having two implementations.

The new algorithm requires that the sample duration be at least
10ms in order to contribute to the velocity calculation. This
ensures that the velocity is not severely overestimated when
samples arrive in bursts.

The new algorithm computes the exponentially weighted moving
average using weights based on the relative duration of successive
sample periods.

The new algorithm is also more careful about how it handles
individual pointers going down or up and their effects on the
collected movement traces. The intent is to preserve the last
known velocity of pointers as they go up while also ensuring
that other motion samples do not count twice in that case.

Bug: 4086785
Change-Id: I2632321232c64d6b8faacdb929e33f60e64dcdd3
ndroid.mk
ndroidRuntime.cpp
ndroid_view_InputQueue.cpp
ndroid_view_MotionEvent.cpp
ndroid_view_MotionEvent.h
ndroid_view_VelocityTracker.cpp
aa155b4bee043dbf8b7f89441c7bf5e08895605e 15-Mar-2011 Mike Lockwood <lockwood@android.com> am 6a20784e: am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1

* commit '6a20784e461b0c0b24ccd04acf9509565aec3e70':
SqliteDatabase: Fix local reference leak in custom_function_callback()
6a20784e461b0c0b24ccd04acf9509565aec3e70 15-Mar-2011 Mike Lockwood <lockwood@android.com> am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1

* commit 'afd1c0143dfa63bd133e3a4163cc9cc4216e3514':
SqliteDatabase: Fix local reference leak in custom_function_callback()
b0f72de87d1abdfec0cd188f277c48f65f7011a8 15-Mar-2011 Mike Lockwood <lockwood@android.com> SqliteDatabase: Fix local reference leak in custom_function_callback()

Caused a local reference table overflow, only when deleting a large number
of files in a single SQL transaction in the media provider.

Bug: 4093346

Change-Id: I10078a5d7537c2e577763d88e909e34321945a59
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_database_SQLiteDatabase.cpp
491d1fef99794d918178b73ad6a7ec67e51e356f 15-Mar-2011 Dianne Hackborn <hackbod@google.com> am f58f041b: am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread

* commit 'f58f041beb8a00db201eb3c8eb801dc1b702253d':
Add some debug code to try to track down issue 3183612
f58f041beb8a00db201eb3c8eb801dc1b702253d 15-Mar-2011 Dianne Hackborn <hackbod@google.com> am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread

* commit 'cffde30fc10ecdfca53877fbee61525028eb47ba':
Add some debug code to try to track down issue 3183612
cffde30fc10ecdfca53877fbee61525028eb47ba 15-Mar-2011 Dianne Hackborn <hackbod@google.com> am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread

* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
Add some debug code to try to track down issue 3183612
8329db39f2f55484352d58b1820eb31a22698f11 15-Mar-2011 Romain Guy <romainguy@google.com> am b245e31f: am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1

* commit 'b245e31fa8dd1ad6a59ccf858154f3c7b92e0eb8':
Fix rendering artifact in edge fades. Bug #4092053
ee7ace065f77b53a57cb6273b9f2f5d85caba90c 15-Mar-2011 Romain Guy <romainguy@google.com> Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1
7b5b6abf852c039983eded25ebe43a70fef5a4ab 15-Mar-2011 Romain Guy <romainguy@google.com> Fix rendering artifact in edge fades.
Bug #4092053

The problem always existed but was made visible by partial invalidation.
When saving a layer, the renderer would try to postpone glClear()
operations until the next drawing command. This however does not work
since the clip might have changed. The fix is rather simple and
simply gets rid of this "optimization" (that turned out to be
usless anyway given how View issues saveLayer() calls.)

This change also fixes an issue with gradients (color stops where
not properly computed when using a null stops array) and optimizes
display lists rendering (quickly rejects larger portions of the
tree to avoid executing unnecessary code.)

Change-Id: I0f5b5f6e1220d41a09cc2fa84c212b0b4afd9c46
ndroid/graphics/Shader.cpp
ndroid_view_GLES20Canvas.cpp
cf3004a46eabb49f3eee483067e75aef7b0a69e7 14-Mar-2011 Dianne Hackborn <hackbod@google.com> Add some debug code to try to track down issue 3183612

java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.

Change-Id: I3e84f8795941744e697824a5e5b2e651f565b253
ndroid_util_Binder.cpp
6f3a75e13b86a3f40fe34e3ebd17b118791a73a4 14-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "Throw errors on failures to set system properties."
977d1fbf47be1a95c1f39ec559ba60b32d0bf749 12-Mar-2011 Glenn Kasten <gkasten@google.com> am dd264f21: am 76470914: Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1

* commit 'dd264f21e6e9952b3d2ef53ea8a8a9e918e5ce96':
Bug 3515073 Add ANativeWindow_fromSurfaceTexture
7647091436c45af2d82f12c9ea9ec77fa309b49b 12-Mar-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1
b46ecb352617b4c2f2d5f716aa6af6f518d1f579 11-Mar-2011 Mike Lockwood <lockwood@android.com> am 75c95e9a: am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1

* commit '75c95e9a6d5a91b660af62f72b5a3bac0f5c3811':
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
acc29cc91be634070c92a807df412ced97b9b375 11-Mar-2011 Mike Lockwood <lockwood@android.com> UsbDevice: Move IO related methods to new UsbDeviceConnection class

UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.

Bug: 4067029

Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_UsbDevice.cpp
ndroid_hardware_UsbDeviceConnection.cpp
ndroid_hardware_UsbRequest.cpp
c25e6de94d3c18f4c0f98fe20db6494979a56067 11-Mar-2011 Ken Sumrall <ksumrall@android.com> am 9246e4ed: am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1

* commit '9246e4edbab5f24dc06df34992493c64c50fd380':
Teach the framework to use the new android_reboot() function.
c7fcc5076fb2988fba699a2167d19475fd58ed0b 11-Mar-2011 Ken Sumrall <ksumrall@android.com> Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
06f367437c88f0960ea093c99388a16d0292121d 11-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Throw errors on failures to set system properties.

Let's turn this on for awhile in master and see what happens
watching the crash reports.

I'd rather not silently ignore errors if possible.

Change-Id: Ia87cf4448df3a5b3f03c1df5c1fd59a204d02036
ndroid_os_SystemProperties.cpp
c01fd043a92462f12210d45a92d751b49e0e1f62 10-Mar-2011 TK MUN <tk.mun@samsung.com> am 4bdab175: DO NOT MERGE WiMAX support

* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
DO NOT MERGE WiMAX support
4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7 23-Feb-2011 TK MUN <tk.mun@samsung.com> DO NOT MERGE WiMAX support

- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX

Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
ndroid_net_NetUtils.cpp
0da47dae492323900ae10b50e7d3bcaef08156ae 08-Mar-2011 Ken Sumrall <ksumrall@android.com> Teach the framework to use the new android_reboot() function.

The new android_reboot() function is a nicer way to reboot.
It can optionally sync(2) and remount as read-only writable
filesystems. This fixes bug 3350709.

Change-Id: I792fa3f726f8d685a696f52cf760e731567ed8d4
ndroid_os_Power.cpp
1f507be1c1ff2ec022d2ced1ad38fc328c28d3bb 10-Mar-2011 Wei-Ta Chen <weita@google.com> am a2048056: am 2498b4b8: Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1

* commit 'a204805627eddeac0a1777c69ce62d31d339d4cd':
Fix 3510563: memory leak in BitmapRegionDecoder.
2498b4b8c6b02d553f46f9b48eee9d5295d36f16 10-Mar-2011 Wei-Ta Chen <weita@google.com> Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
18632db49a938ca1ec12fbb2e4377e3d776d3ac2 09-Mar-2011 Eric Laurent <elaurent@google.com> am 2dc78477: am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1

* commit '2dc78477364bd4accb9a603baaafca9a5523dcec':
Fix issue 3439872: video chat and bluetooth SCO
9b8c5f61432b7f12a216567409fa7baed6b74452 09-Mar-2011 Carl Shapiro <cshapiro@google.com> Merge "Remove unused JNI global references."
421ddc014b31478ba0ef115e098d8780a35af331 07-Mar-2011 Eric Laurent <elaurent@google.com> Fix issue 3439872: video chat and bluetooth SCO

This change fixes the stability problems experienced when using
a bluetooth headset supporting both A2DP and SCO. Problems occur
when starting the video chat at which time the A2DP output is being
stopped to start SCO. At that time, active AudioTracks are invalidated
by AudioFlinger so that a new AudioTrack binder interface can be
recreated by the client process on the new mixer thread with correct parameters.
The problem was that the process to restore the binder interface was not
protected against concurrent requests which caused 2 binder interfaces
to be created sometimes. This could lead to permanent client deadlock
if one of the client threads was waiting for a condition of the first
created binder interface while the second one was created (as the AudioFlinger
would only signal conditions on the last one created).
This concurrent request situation is more likely to happen when a client
uses the JAVA AudioTrack as the JNI implementation uses simultaneously the
native AudioTrack callback and write push mechanisms. By doing so, the code
that checks if the binder interface should be restored (in obtainBuffer()) is
much more likely to be called concurrently from two different threads.

The fix consists in protecting the critical binder interface restore phase
with a flag in the AudioTrack control block. The first thread acting upon the binder
interface restore request will raise the flag and the second thread will just wait for
a condition to be signaled when the restore process is complete.

Also protected all accesses to the AudioTrack control block by a mutex to prevent
access while the track is being destroyed and restored. If a mutex cannot be held
(e.g because we call a callback function), acquire a strong reference on the IAudioTrack
to prevent its destruction while the cblk is being accessed.

Modified AudioTrack JNI to use GetByteArrayElements() instead of
GetPrimitiveArrayCritical() when writing audio buffers. Entering a critical section would
cause the JNI to abort if a mediaserver crash occurs during a write due to the AudioSystem
callback being called during the critical section when media server process restarts.
Anyway with current JNI implementation, either versions do not copy data most of the times
and the criticial version does not guaranty no data copy.

The same modifications have been made to AudioRecord.

Change-Id: Idc5aa711a04c3eee180cdd03f44fe17f3c4dcb52
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
b1a04d545673a1eedbc679a65dd6942da8d33790 08-Mar-2011 Chih-Chung Chang <chihchung@google.com> Fix 3510563: memory leak in BitmapRegionDecoder.

Change-Id: If639d5974204f18fdfd119b9fc7a762977c66f26
ndroid/graphics/BitmapRegionDecoder.cpp
f7098ce95dde39a33ca280bd1ef9a13259e7b7e5 08-Mar-2011 Romain Guy <romainguy@google.com> am d00353fe: am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349" into honeycomb-mr1

* commit 'd00353fe3191571a6773ef2d11921cfcff260bc4':
Add support for partial invalidates in WebView Bug #3461349
5f4b02064d5dc1b2c888e59f1ea76d38bf1b877a 08-Mar-2011 Romain Guy <romainguy@google.com> am f018560c: am 25b81110: Merge "Fix EGL JNI bugs Bug #3461349" into honeycomb-mr1

* commit 'f018560cb57e47c3e4bc542e4c596c4d3be3d4c4':
Fix EGL JNI bugs Bug #3461349
cabfcc1364eb7e4de0b15b3574fba45027b45cfc 08-Mar-2011 Romain Guy <romainguy@google.com> Add support for partial invalidates in WebView
Bug #3461349

This change also fixes two bugs that prevented partial invalidates
from working with other views. Both bugs were in our EGL implementation:
they were preventing the caller from comparing the current context/surface
with another context/surface. This was causing HardwareRenderer to always
redraw the entire screen.

Change-Id: I33e096b304d4a0b7e6c8f92930f71d2ece9bebf5
ndroid_view_GLES20Canvas.cpp
9b7146db6d9c0586b98b062fbcdb3fac6cc54d19 08-Mar-2011 Romain Guy <romainguy@google.com> Fix EGL JNI bugs
Bug #3461349

Before this change, eglGetCurrent*() could not be used to compare
contexts, displays and surfaces at the Dalvik level.

Change-Id: I442037dae37bc357b64810ab10c779b5754e9153
om_google_android_gles_jni_EGLImpl.cpp
17cc33a35729733aaa0a7706f38b1c45f0b1590a 06-Mar-2011 Carl Shapiro <cshapiro@google.com> Remove unused JNI global references.

Change-Id: Ie4886ab66538e293832c3bc3d6023e34304a2d21
ndroid_app_NativeActivity.cpp
ndroid_content_res_Configuration.cpp
ndroid_content_res_ObbScanner.cpp
ndroid_os_MessageQueue.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_KeyCharacterMap.cpp
ndroid_view_MotionEvent.cpp
7e0907ce3ee478d63a343c03d80bb74df2586e59 05-Mar-2011 Mike Cleron <mcleron@google.com> am 646528c6: am 54bb9869: Merge "Don\'t fail unlinking death recipients on dead binders" into honeycomb-mr1

* commit '646528c6cff69433d58d01728ada12fd2a50cf84':
Don't fail unlinking death recipients on dead binders
79dd31f73d8ca4432d6f83bef1221cc3e93e932c 05-Mar-2011 Christopher Tate <ctate@google.com> Don't fail unlinking death recipients on dead binders

It's legal to call unlinkToDeath() *after* receiving binderDied(),
as long as the recipient being unlinked was in fact linked
previously. Don't throw an exception in this case. (The
exception was going unhandled in the system process, bringing
down the runtime. That's bad.)

The change here is a bit subtle. In the new implementation, the
lifetime of a JavaDeathRecipient -- the fundamental bridge between
IBinder objects and the Dalvik/JNI world -- is tied to the
lifetime of the Dalvik-side BinderProxy object it's associated
with. That means it's inappropriate for the JavaDeathRecipient
to disappear [for purposes of being referenced from the Dalvik
side] just because the IBinder has sent out its obituaries, and
instead the JavaDeathRecipient objects are kept around until
the Dalvik-side client code actually drops its reference to the
BinderProxy.

This boils down to a one-line change: we no longer unpin the
JavaDeathRecipients and free them immediately in response to
binderDied().

The rest of the CL is #ifdefed-out debugging that is invaluable
when bugs crop up.

Bug 3513703

Change-Id: I743fa49669c9252f71dcabfd8dcf42ed729b70a5
ndroid_util_Binder.cpp
846db33313aa0899fa7928256c6734964bd92520 04-Mar-2011 Glenn Kasten <gkasten@google.com> Bug 3515073 Add ANativeWindow_fromSurfaceTexture

This is similar to ANativeWindow_fromSurface.

Change-Id: Iaadc06a5d0d50685c34876aa89488c16e7cfaa65
ndroid/graphics/SurfaceTexture.cpp
13492c848f0fcf1ee3868228622641ca8bce6fb1 03-Mar-2011 Leon Scroggins <scroggo@google.com> Add ifdef to prevent header being added multiple times.

Change-Id: I92bb0667bea98e43fca20dceb4fff20e446c03cf
ndroid/graphics/NinePatchPeeker.h
332abc3055720afea153ef6a8eb29afadbcfd87c 04-Mar-2011 Carl Shapiro <cshapiro@google.com> Merge "Fix a compare of JNI references to use IsSameObject."
375aa0b09ba2c6d6951a89299c6a772a3f68aaa0 04-Mar-2011 Carl Shapiro <cshapiro@google.com> Fix a compare of JNI references to use IsSameObject.

Change-Id: I9932761271034ff5031730874daf7c147b6b008a
ndroid_view_Surface.cpp
d54952b451b2778629662cab100ac0a414c84583 03-Mar-2011 Carl Shapiro <cshapiro@google.com> Merge "Establish a global reference before saving a class into a global."
c1318babb44dded89b88fb5df950b5cd6c6f83da 03-Mar-2011 Carl Shapiro <cshapiro@google.com> Establish a global reference before saving a class into a global.

A local reference is obtained to the string class for the purpose of
using it later in another routine to create string object arrays.
However, the local reference is invalid by the time it is next used.
Making the string class reference a global reference eliminates the
problem.

Change-Id: I8a04642e0ed3060f2fff2cb63996559f004aacff
ndroid_util_AssetManager.cpp
6c3fd82107f9f59a1cca4f036d56f216c1b0f90b 03-Mar-2011 Carl Shapiro <cshapiro@google.com> Merge "Eliminate an assignment of a local reference to a global variable."
b16f769277e0d0998ffee71f33dfe0ddd4b0fd6e 03-Mar-2011 Carl Shapiro <cshapiro@google.com> Eliminate an assignment of a local reference to a global variable.

Change-Id: I8850685698d228658387afe6145e42ade0458e74
ndroid_os_FileUtils.cpp
1eb12937329d0fcdc29d9c5ab6c549c42d2dcd52 03-Mar-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Add TextLayout Cache"
b80cb0c5d44bd86060541651514c51fb687048bd 03-Mar-2011 Leon Scroggins <scroggo@google.com> Merge "Move NinePatchPeeker into its own file."
a06d86ab8177ee9e631e0ee4e39688bf42179bde 02-Mar-2011 Leon Scroggins <scroggo@google.com> Move NinePatchPeeker into its own file.

This way it can be used by other clients that want to draw
ninepatches. Ultimately the goal is to allow ninepatch
drawing from native code for WebView. Bug:3009375

Change-Id: Id13cef17ed7655a07e9f055586b686cf1e4af392
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/NinePatchPeeker.cpp
ndroid/graphics/NinePatchPeeker.h
56194ebec6212e229f4ccdaa4b187166d20013ef 03-Mar-2011 Jeff Brown <jeffbrown@google.com> Wake screen from external HID peripherals.

Added some plumbing to enable the policy to intercept motion
events when the screen is off to handle wakeup if needed.

Added a basic concept of an external device to limit the scope
of the wakeup policy to external devices only. The wakeup policy
for internal devices should be based on explicit rules such as
policy flags in key layout files.

Moved isTouchEvent to native.

Ensure the dispatcher sends the right event type to userActivity
for non-touch pointer events like HOVER_MOVE and SCROLL.

Bug: 3193114
Change-Id: I15dbd48a16810dfaf226ff7ad117d46908ca4f86
ndroid_view_MotionEvent.cpp
d313c665e618af3194f504064bcd284fe5368682 25-Feb-2011 Fabrice Di Meglio <fdimeglio@google.com> Add TextLayout Cache

- use GenerationCache for caching
- move GenerationCache.h from libs/hwui/utils to include/utils
- add #define for cache activation / deactivation

Change-Id: Ifaf519f0b5e33b087a453e4aa6430162d8438f20
ndroid.mk
ndroid/graphics/RtlProperties.h
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid/graphics/TextLayoutCache.cpp
ndroid/graphics/TextLayoutCache.h
bd8b6f25bb48daea4aeb0c7463661c8e69baece0 01-Mar-2011 Christopher Tate <ctate@google.com> Fix binder proxy death notice tracking

There was an issue with stale recipient tracking when BinderProxy weak
references had been purged and a new proxy object allocated for a
still-live underlying IBinder. The death recipient bookkeeping has
now been reworked so that it's fundmentally tied to the BinderProxy
instances, not maintained as global state, to prevent this sort of
confusion entirely.

Bug 3499939

Change-Id: I75c5216b6d53b90868ac969e32c9725201e51be3
ndroid_util_Binder.cpp
c4308f01c965571dc2354107c3574df113e397ee 01-Mar-2011 Mike Lockwood <lockwood@android.com> Move USB framework support from android.hardware to android.hardware.usb package

Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_hardware_UsbDevice.cpp
ndroid_hardware_UsbEndpoint.cpp
ndroid_hardware_UsbRequest.cpp
c9119f5034d36f548bbddd8f60291e24ab4e270b 01-Mar-2011 Dianne Hackborn <hackbod@google.com> Add ParcelFileDescriptor APIs to get raw fd.

Change-Id: I66ba72ffffd27237e60c9411453eef950ae62705
ndroid_os_ParcelFileDescriptor.cpp
ndroid_util_Binder.cpp
20ccb06a7c7fe368901c07b4acc70ad6513714cd 01-Mar-2011 Elliott Hughes <enh@google.com> Merge "Fix Parcel.writeNative to not ignore 'offset'."
a28b83ee04ca25100781f37a50665d6e1b05e3a2 28-Feb-2011 Elliott Hughes <enh@google.com> Fix Parcel.writeNative to not ignore 'offset'.

Also switch to using libcore's array bounds checking. (This variant had no
detail message and was missing the length check.)

Bug: http://code.google.com/p/android/issues/detail?id=15075
Change-Id: Icfc045bd59403b59f02d95c8514abf881d3996e5
ndroid_util_Binder.cpp
d5dac80fed2a85944060e8b1192eff9dee77ac4d 28-Feb-2011 Christopher Tate <ctate@google.com> Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"
8c8cfec0eade40b94f8151eb2e8e438837f896a5 28-Feb-2011 Mathias Agopian <mathias@google.com> Merge "Fix sp<> conversion operator / constructor"
0b41448506610f73302cc631677823fd8b865ea5 17-Feb-2011 Christopher Tate <ctate@google.com> Binder linkage no longer depends on JNI objrefs as persistent tokens

There are two areas that have changed to eliminate the assumption that
local jobject references are both canonical and persistent:

1. JavaBBinderHolder no longer holds onto and reuses it parent object
reference per se. Since the underlying JavaBBinder object holds a
real global ref, this was redundant anyway. Now, for purposes of its
transient need to perform JNI operations, it simply uses the current
jobject ref(s) passed during method invocation, and no longer attempts
to hold these refs beyond the scope of a single invocation.

2. Binder obituaries no longer assume that a jobject reference to a
recipient will always compare == as a 32-bit value with any future
reference to the same object. The implementation now asks Dalvik
whether object references match.

This amended patch fixes the earlier bug around races between
remote binder death cleanup and local explicit unregistration of
VM-side death recipients.

Bug 2090115

Change-Id: I70bd788a80ea953632b1f466f385ab6b78ef2913
ndroid_util_Binder.cpp
99aac7beca18b6d73e40db5e8e49f52f94be638e 26-Feb-2011 Dianne Hackborn <hackbod@google.com> You can now specify a custom display size as NxM.

Change-Id: Ieb6df51aab009689f0f19b8887025261c5ceb69f
ndroid_view_Display.cpp
02cafc9f6ec018ae31ca9032be67a2d8d410736a 27-Feb-2011 Jeff Brown <jeffbrown@google.com> Log errors reading input channel from parcel.

Bug: 3378634
Change-Id: I47908e48b8348f0366dcef545e828b65d99d81a6
ndroid_view_InputChannel.cpp
32a55cf66e12e5e56d2e05b73c6bef453477c2bb 26-Feb-2011 Mathias Agopian <mathias@google.com> Fix sp<> conversion operator / constructor

some of the conversion operators were not using the proper
pointer type when calling incStrong/decStrong, usually it
has no bad consequences, but for some implementation
of the ref-counted object it could lead to recording the wrong
owner id.

Change-Id: If574b9069b8a4cf6e0911a992c8f095aba799995
ndroid_view_Surface.cpp
e2ed9562fc6c88dfdeb924063f5d0ccea1912754 25-Feb-2011 Christopher Tate <ctate@google.com> Revert "Binder linkage no longer depends on JNI objrefs as persistent tokens"

This reverts commit c2d55dd89743c8a38deb809f3cdf1ad2d1dbac2b.
ndroid_util_Binder.cpp
e6044145bccf30e2b1785eb33a26de6496167986 25-Feb-2011 Vasu Nori <vnori@google.com> bug:3467948 if byteArray couldn't be allocated for blob, throw exception

Change-Id: I73e36c10f31086ea567debad536350316b2df67f
ndroid_database_CursorWindow.cpp
447ee77431ddd68634bd49508de8573ab6c7065a 24-Feb-2011 Eric Hassold <hassold@google.com> Merge "Detect out of memory in extractAlpha"
7e8a69ed5cbeb2bad630877a526ff0c06880d2c2 24-Feb-2011 Christopher Tate <ctate@google.com> Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"
c2d55dd89743c8a38deb809f3cdf1ad2d1dbac2b 17-Feb-2011 Christopher Tate <ctate@google.com> Binder linkage no longer depends on JNI objrefs as persistent tokens

There are two areas that have changed to eliminate the assumption that
local jobject references are both canonical and persistent:

1. JavaBBinderHolder no longer holds onto and reuses it parent object
reference per se. Since the underlying JavaBBinder object holds a
real global ref, this was redundant anyway. Now, for purposes of its
transient need to perform JNI operations, it simply uses the current
jobject ref(s) passed during method invocation, and no longer attempts
to hold these refs beyond the scope of a single invocation.

2. Binder obituaries no longer assume that a jobject reference to a
recipient will always compare == as a 32-bit value with any future
reference to the same object. The implementation now asks Dalvik
whether object references match.

Bug 2090115

Change-Id: If62edd554d0a9fbb2d2977b0cbf8ad7cc8e2e68d
ndroid_util_Binder.cpp
ef7be262e5859efdf805d1b9612bc2b250d5971e 24-Feb-2011 Eric Hassold <hassold@google.com> Detect out of memory in extractAlpha

When extractAlpha() native method in Skia fails to allocate pixels,
it resets target bitmap. This change detects when such empty bitmap
is returned, and throws a OutOfMemory Java exception.

Depends on https://android-git.corp.google.com/g/97793

Bug: 3418381
Change-Id: I65a84998be089c49ed5005f6995bdc4f4d1669bc
ndroid/graphics/Bitmap.cpp
62c7574c02f2d83bafe7fc91bba6dbdf01b92a62 24-Feb-2011 Derek Sollenberger <djsollen@google.com> Merge "Skia Merge (revision 808)"
47b8adec3904535c8d8ce2b6e42ecd736f2d90ce 24-Feb-2011 Romain Guy <romainguy@google.com> Add a new Camera API to control the camera's location

Change-Id: Id9a082d2def803eb527e1987875e0d8a22c6e8aa
ndroid/graphics/Camera.cpp
563db5343f93fec6897304443b501e397292401b 23-Feb-2011 Irfan Sheriff <isheriff@google.com> Merge "Add support for background scanning"
e00cab707dcaf6f05adb5ccb9c80fdf25c483427 18-Feb-2011 James Dong <jdong@google.com> Application-managed callback buffer support for raw image

bug - 3292153

Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
ndroid_hardware_Camera.cpp
1665da555d9795fbb8a91b22579e5dd9257a1220 23-Feb-2011 Kenny Root <kroot@google.com> Merge "Fix poll options for NativeActivity's hasEvents"
2bb10f4299f93f809bddb7683f6ba93277da6f28 23-Feb-2011 Kenny Root <kroot@google.com> Fix poll options for NativeActivity's hasEvents

NativeActivity created a pipe to wake up a Looper it's attached to, but
it failed to set the right options for the read part of the pipe. This
affects only the NativeActivity API call for AInputQueue_hasEvents

Change-Id: I02e5dad4e700f4c724b3187a4b7e0df931dd1eed
ndroid_app_NativeActivity.cpp
beefeb6151e458eae3775d1eb8506357fe817f54 23-Feb-2011 Fabrice Di Meglio <fdimeglio@google.com> Merge "Code cleaning"
dd347df9f85e04d8b08a5249b8db731300699cc4 17-Feb-2011 Fabrice Di Meglio <fdimeglio@google.com> Code cleaning

- use constants whenever possible
- better memory allocation of buffers
- add logging thru conditional compilation

Change-Id: I486195b1cb35046ea00971630832978c1b2e64a0
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
6062c5912dc79704b489fc8c289b78a400ed05ee 22-Feb-2011 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 808)

This is a companion CL to the one found in /external/skia

Change-Id: If81748545435cab20a5d8479329ab333cb973e16
ndroid.mk
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Xfermode.cpp
ndroid_view_Surface.cpp
om_google_android_gles_jni_EGLImpl.cpp
b7508df1f6c1dd187660de8ce310f3fbed22b26c 22-Feb-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Fix compiler errors when compiled with debug option."
2653a1e7ca55b03f5230dffa85dfe2705757e2b7 22-Feb-2011 Jaikumar Ganesh <jaikumar@google.com> Fix compiler errors when compiled with debug option.

The Logv statement was missing the format specifier.

Change-Id: Ibf986d28dabfdbb3fbfd75381cb349448c6e57e7
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
fcc0845cf9990470d498dcaa036f0ae6487ddf34 18-Feb-2011 Irfan Sheriff <isheriff@google.com> Add support for background scanning

Background scanning (preferred network offload) allows us the
host to sleep while the dongle monitors the presence of any
preferred networks. This allows us for significant power savings
since the system does not have to wake up often to initiate
a scan

Bug: 3453021
Change-Id: I7c1dbfd0c3f717df81e4da6091c4c5657c9ec9ca
ndroid_net_wifi_Wifi.cpp
cc0c159e9b3dd4e0f48da0ce3e33d2c68a651413 19-Feb-2011 Jeff Brown <jeffbrown@google.com> Add new hover move action and scroll wheel plumbing.

Added support for tracking the mouse position even when the mouse button
is not pressed. To avoid confusing existing applications, mouse movements
are reported using the new ACTION_HOVER_MOVE action when the mouse button
is not pressed.

Added some more plumbing for the scroll wheel axes. The values are
reported to Views but they are not yet handled by the framework.

Change-Id: I1706be850d25cf34e5adf880bbed5cc3265cf4b1
ndroid_view_MotionEvent.cpp
6f2fba428ca5e77a26d991ad728e346cc47609ee 19-Feb-2011 Jeff Brown <jeffbrown@google.com> Add new axes for joysticks and mouse wheels.

Added API on InputDevice to query the set of axes available.
Added API on KeyEvent and MotionEvent to convert keycodes and axes
to symbolic name strings for diagnostic purposes.
Added API on KeyEvent to query if a given key code is a gamepad button.
Added a new "axis" element to key layout files to specify the
mapping between raw absolute axis values and motion axis ids.
Expanded the axis bitfield to 64bits to allow for future growth.
Modified the Makefile for keyboard prebuilts to run the keymap
validation tool during the build.
Added layouts for two game controllers.
Added default actions for game pad button keys.
Added more tests.
Fixed a bunch of bugs.

Change-Id: I73f9166c3b3c5bcf4970845b58088ad467525525
ndroid_view_MotionEvent.cpp
3ca6d6bbfe614312ad936bce9ab5805615103267 17-Feb-2011 Irfan Sheriff <isheriff@google.com> Merge "data activity reporting on wifi"
227bec49157bc496f7c9e8e8f63c12728a448922 16-Feb-2011 Irfan Sheriff <isheriff@google.com> data activity reporting on wifi

Initial checkin, need icons to complete the feature

Bug: 3412258

Change-Id: I9a3ecc8159cc314d84707065dafe23d402409a84
ndroid_net_TrafficStats.cpp
ebbd5d14ad3b1e762d9fcfa026e19413cc857e05 17-Feb-2011 Jeff Brown <jeffbrown@google.com> Fix a regression with MotionEvent parceling.

Also added some more unit tests.

Change-Id: I413654294d1a998eec056884e6df5eaa50f3daf4
ndroid_view_MotionEvent.cpp
45708bf2f03f9f50c22f86cb794c2a088bab1c05 17-Feb-2011 Jeff Brown <jeffbrown@google.com> Merge "Add support for arbitrary axes in MotionEvents."
91c69ab01539f7ba28708f41ec1835cc2920d0a0 15-Feb-2011 Jeff Brown <jeffbrown@google.com> Add support for arbitrary axes in MotionEvents.

This change makes it possible to extend the set of axes that
are reported in MotionEvents by defining new axis constants.

The MotionEvent object is now backed by its C++ counterpart
to avoid having to maintain multiple representations of the
same data.

Change-Id: Ibe93c90d4b390d43c176cce48d558d20869ee608
ndroid_view_MotionEvent.cpp
a04ee9fa7efb24d49d6b1794a7f72110d7b892ba 15-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove some unused wifi dhcp code."
19f8ca846b5234278d3001782077b90aad61a85c 15-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Remove some unused wifi dhcp code.

Change-Id: I114b3772b334a41936c6ed4bb8304f6914481ef1
ndroid_net_wifi_Wifi.cpp
a44a1e77ef435942b2ff60e9e60d3a64b43d775b 11-Feb-2011 Jaikumar Ganesh <jaikumar@google.com> Distinguish between NAP and PAN role disconnections

Distinguish between NAP and PANU disconnect in BT tethering
and call appropriate functions. We were never disconnecting
NAP role devices.

ToDo: BluetoothService needs to be refactored, its become too big
1) BluetoothAdapter and BluetoothDevice properties need to be moved to separate
classes.
2) BluetoothPanProfile and BluetoothInputDeviceProfile which are handled
by BluetoothService need to be moved to a separate file.
3) Integrate PAN to the profile state machine.

Change-Id: I32a8d274f38c78931434bd9738c8f6570ba89fcf
ndroid_server_BluetoothService.cpp
8b4b97a14ad9b5b982d8fe92755efabec8ad0076 04-Feb-2011 Glenn Kasten <gkasten@google.com> Bug 3352047 Wrong message when adjusting volume

Add hidden AudioManager.getDevicesForStream and output device codes.

Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
ndroid_media_AudioSystem.cpp
ccc9d14d6c25aa9dd2f115f41c7567e5cf667640 09-Feb-2011 Andy McFadden <fadden@android.com> Merge "Use JNI helper function to get buffer address"
320b56dcdd0c2affc7436f4748e8bc0a4419dbe4 08-Feb-2011 Stan Chesnutt <chesnutt@google.com> Parse the rssi result string in case-insensitive manner. This matches similar
code in wpa-supplicant, driver_wext.c

Change-Id: Ibeff41f9ef9168e47c338513b4c8c8781254e068
ndroid_net_wifi_Wifi.cpp
90f4c18a868aa921feae953e380a2f9f6a4ade38 08-Feb-2011 Andy McFadden <fadden@android.com> Use JNI helper function to get buffer address

This replaces the Get/Release sequence with a call to
jniGetNonMovableArrayElements.

Bug 3409356

Change-Id: I847fd67ac71d904fef0c807ac25a29f802e6cd45
ndroid/graphics/Graphics.cpp
b31688eb05a2ef0b210a71c318629f786c4f3892 07-Feb-2011 Mike Cleron <mcleron@google.com> am a626eb18: am 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb

* commit 'a626eb18ae2c4a48c8770ece3a64eeee5974f455':
Fix crash when Paths are GCd in hw accelerated apps
5a7e828842c26f64bb6e0ef3e0019e1949b245ee 04-Feb-2011 Chet Haase <chet@google.com> Fix crash when Paths are GCd in hw accelerated apps

A recent change to optimize path rendering didn't account for
the destruction of native objects by the VM finalizer. We may be
done with the Java level version before we're done with the native
structure that's used by the display list. For example, a drawing
method on a View that creates a temporary path to render into the
canvas will implicitly create a native structure that is put onto
the GL display list. That temporary path may go away, but the native
version should stick around as long as the display list does.

The fix is to refcount the original native version of the path
and only delete it when the refcoutn reaches zero (which means that
it is no longer needed by any display list). This is a similar mechanism
used for bitmaps and shaders.

Change-Id: I4de1047415066d425d1c689aa60827f97729b470
ndroid/graphics/Path.cpp
2e8fbebff4e12581ed58e25fc98134e1124d6482 04-Feb-2011 Eric Laurent <elaurent@google.com> am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb

* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
Fix issue 3371080
25101b0b9a84571ead15b26e9f4cd9c4298d7823 02-Feb-2011 Eric Laurent <elaurent@google.com> Fix issue 3371080

Modified default volume control logic in AudioService:
1 IN_CALL volume if in video/audio chat
2 NOTIFICATION if notification is playing or was playing less than 5s ago.
3 MUSIC

Modified silent mode:
- now also affect MUSIC stream type
- entering silent mode when VOL- hard key is pressed once while selected
stream volume is already at 0 (except for VOICE_CALL stream).
- exiting silent mode when pressing VOL+ hard key while in silent mode

Play sound FX (audible selections, keyboard clicks) at a fixed volume.

Modified audio framework:
- isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger)
- iStreamActive() now specifies a time window during which the stream is considered
active after it actually stopped.

Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
ndroid_media_AudioSystem.cpp
929a1c219248b62778807cac8ea256c7ac0fda6a 02-Feb-2011 Brian Carlstrom <bdc@google.com> Removing android.security.MessageDigest

Bug: 3392028
Change-Id: I6b9732da17d086ba00c846c3ad1c7fb39baf9502
ndroid.mk
ndroidRuntime.cpp
ndroid_message_digest_sha1.cpp
ndroid_security_Md5MessageDigest.cpp
dd8b64c0a5b13c6606782d467beb48fd11bb36e0 28-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "Add support for synchronous bulk USB transfers"
89316a2f2a0f351b22c7195c385b0c4f4de7bdb7 28-Jan-2011 Ashish Sharma <ashishsharma@google.com> Merge "TrafficStats: Include UDP stats and packet count to API"
1fce24b241e386af19ba7c5bc29af5d18461f4ff 27-Jan-2011 Mike Lockwood <lockwood@android.com> Add support for synchronous bulk USB transfers

Change-Id: Id5de49e4d728a702fa1583ecc24f83f36cc57d21
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_hardware_UsbDevice.cpp
c39c1d4dee917560d174f6ba5402e4c6644edd47 28-Jan-2011 Ashish Sharma <ashishsharma@google.com> TrafficStats: Include UDP stats and packet count to API

Change-Id: I70063e6033d3c181bcc5b9e401f9474900e25281
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
ndroid_net_TrafficStats.cpp
e90a8b06b771881e08d04436d664417a865867f1 28-Jan-2011 Romain Guy <romainguy@google.com> am 01a58129: am 0250bc2f: Merge "Catch exception when ViewRoot\'s surface is not valid. Bug #3399426" into honeycomb

* commit '01a5812902668d0dbba51cd0efe22bfba3711230':
Catch exception when ViewRoot's surface is not valid. Bug #3399426
fea12b87f2988f20ea87314c4a1b47e1a0f4d95e 28-Jan-2011 Romain Guy <romainguy@google.com> Catch exception when ViewRoot's surface is not valid.
Bug #3399426

Change-Id: Id4e0b8714c9520c4e84e81c2978752d46c912b6b
ndroid_view_Surface.cpp
cf5afe9299f6a8b7d76935d8efabe36c2423cc27 26-Jan-2011 Romain Guy <romainguy@google.com> am 08cdf6fd: am 940df6dd: Merge "Remove unused API" into honeycomb

* commit '08cdf6fd9ac9bbbd77024518c45034d66b5830c6':
Remove unused API
2b1847ea60650a9f68372abe860415f18b55081d 26-Jan-2011 Romain Guy <romainguy@google.com> Remove unused API

Change-Id: I1714fd82a64b752f0350ef4ef9179ce19e089c6a
ndroid_view_GLES20Canvas.cpp
9e751f0fb55214feec7cf3aac2738739e49f7867 26-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Make the interface with DHCP IPv6 capable."
0216e618198393bfd7ac0625fa6ad251d5ea682f 15-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Make the interface with DHCP IPv6 capable.

It doesn't work (yet) for IPv6, but we can remove v4-centric notions from the framework.

bug:2542681
Change-Id: I21c058f5c88d07706c9265bf0ea902fc90357e56
ndroid_net_NetUtils.cpp
215532c579064d44e529acdc69d41455c2bb9ad5 26-Jan-2011 Erik Gilling <konkers@android.com> usb: correct return type of android_hardware_UsbDevice_claim_interface

Change-Id: I1e8bfb8d52b5bb87e5bb7249ab439740f57e63f3
ndroid_hardware_UsbDevice.cpp
e965dee34135e7bce186408d1265a5cfd05a9fb1 25-Jan-2011 Romain Guy <romainguy@google.com> am 4e1db6da: am 2ff6d705: Merge "Enable partial invalidates when rendering with OpenGL." into honeycomb

* commit '4e1db6dadd404c023b71ae1ab54e990fce56abc3':
Enable partial invalidates when rendering with OpenGL.
7d7b5490a0b0763e831b31bc11f17d8159b5914a 25-Jan-2011 Romain Guy <romainguy@google.com> Enable partial invalidates when rendering with OpenGL.

Change-Id: Ie8be06c4776b815e8737753eb8003b4fd8936130
ndroid_view_GLES20Canvas.cpp
3873da3c6ee0a63de0d91e6045b7546402f4ce3d 24-Jan-2011 Chet Haase <chet@google.com> am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb

* commit '2acb67ec9fe34316231519373f59dfb76c03d57b':
Use optimized display lists for all hwaccelerated rendering
daf98e941e140e8739458126640183b9f296a2ab 10-Jan-2011 Chet Haase <chet@google.com> Use optimized display lists for all hwaccelerated rendering

Previously, display lists were used only if hardware acceleration
was enabled for an application (hardwareAccelerated=true) *and* if
setDrawingCacheEnabled(true) was called. This change makes the framework
use display lists for all views in an application if hardware acceleration
is enabled.

In addition, display list renderering has been optimized so that
any view's recreation of its own display list (which is necessary whenever
the visuals of that view change) will not cause any other display list
in its parent hierarchy to change. Instead, when there are any visual
changes in the hierarchy, only those views which need to have new
display list content will recreate their display lists.

This optimization works by caching display list references in each
parent display list (so the container of some child will refer to its
child's display list by a reference to the child's display list). Then when
a view needs to recreate its display list, it will do so inside the same
display list object. This will cause the content to get refreshed, but not
the reference to that content. Then when the view hierarchy is redrawn,
it will automatically pick up the new content from the old reference.

This optimization will not necessarily improve performance when applications
need to update the entire view hierarchy or redraw the entire screen, but it does
show significant improvements when redrawing only a portion of the screen,
especially when the regions that are not refreshed are complex and time-
consuming to redraw.

Change-Id: I68d21cac6a224a05703070ec85253220cb001eb4
ndroid_view_GLES20Canvas.cpp
e3ba084285b96e69e7ccd09cd89f649fc7beac69 24-Jan-2011 Romain Guy <romainguy@google.com> am ff42d952: am 502d41d8: Merge "Add support for arcs." into honeycomb

* commit 'ff42d952ebb1d5393951f1644ee3d1b9e0fbc9e5':
Add support for arcs.
8b2f5267f16c295f12faab810527cd6311997e34 24-Jan-2011 Romain Guy <romainguy@google.com> Add support for arcs.

Change-Id: I96c057ff4eb1b464b03f132da0b85333777bee4f
ndroid_view_GLES20Canvas.cpp
1166e0f3adf1647ff1068f9ca3e8332d75bc891c 23-Jan-2011 Romain Guy <romainguy@google.com> am 22fdb6f3: am d182046e: Merge "Add support for ovals and stroked rectangles." into honeycomb

* commit '22fdb6f3e94f88687a2f624124ef678282588b75':
Add support for ovals and stroked rectangles.
c1cd9ba335b293f11e1082447ef08e474710a05f 23-Jan-2011 Romain Guy <romainguy@google.com> Add support for ovals and stroked rectangles.

Change-Id: I1292e241386763c82e6622c8f7ed90b0f5b7bd4f
ndroid_view_GLES20Canvas.cpp
e7d511e148bc901ef41ac44d7b3593e5d803f72f 30-Dec-2010 Mike Lockwood <lockwood@android.com> New APIs for USB host support:

UsbManager:
- is now a service retrievable via Context.getSystemService(Context.USB_SERVICE).
- provides support for returning a list all connected USB devices
- broadcasts ACTION_USB_DEVICE_ATTACHED and USB_DEVICE_DETACHED when devices
are added and removed from the USB host bus

UsbDevice:
- represents an attached USB device.

UsbInterface:
- represents an interface on a USB device
- devices may have multiple interfaces if they provide multiple
sets of functionality (for example, android phones typically have interfaces
for both USB mass storage and adb)

UsbEndpoint:
- represents an endpoint on a USB interface
- endpoints are used for sending or receiving data
(only in one or the other direction)

UsbRequest:
- encapsulates a send or receive request to be sent over an endpoint

Change-Id: Ieef3e434c62760770ea839070cf5eba1a705967a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_UsbDevice.cpp
ndroid_hardware_UsbEndpoint.cpp
ndroid_hardware_UsbRequest.cpp
a9a4f5cc88a373ffcea8902f178fe0a6572c0aa8 21-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Switch from NetworkUtils to netd for iface config."
27d3c5907cc6f4366a7af3f0941d8d29d9b2440b 20-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Switch from NetworkUtils to netd for iface config.

Moving more stuff to netd and getting rid of unused NetworkUtils.

Change-Id: Ibb5a11dca58d07291fe33e6d33027553f6158ea7
ndroid_net_NetUtils.cpp
99d49118b857df4051a864b35254e275bc8a68b6 21-Jan-2011 Romain Guy <romainguy@google.com> Merge "Add support for drawBitmapMesh()." into honeycomb
5a7b466a2b4b7ced739bd5c31e022de61650545a 21-Jan-2011 Romain Guy <romainguy@google.com> Add support for drawBitmapMesh().

Change-Id: Ic77f9c534bb90dc7b9458299544bd50b8b6ae6a5
ndroid_view_GLES20Canvas.cpp
7fbe4d2e7445ad4db07a42c74fe2934af46d1c7f 20-Jan-2011 Kenny Root <kroot@google.com> Don't pay attention to string block on @null

When someone referenced an empty string by putting in the special value
"@null" the string block was kept, but when filtering themes this wasn't
filtered because the framework thought it was actually a null string.

Bug: 3000940
Change-Id: I1e9a0479ef761b3e388b562ae728c5da0f4b5deb
ndroid_util_AssetManager.cpp
ed8f8dd8cf621d6046db7e083f8a36205ed55609 20-Jan-2011 Romain Guy <romainguy@google.com> Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb
01d58e43ede5ca98cbebdd166f9b0c545032c01b 20-Jan-2011 Romain Guy <romainguy@google.com> Add rounded rects and circles support to OpenGLRenderer.

Change-Id: I6cedf2b495d58de7c0437096809fa9e4518a1b8c
ndroid_view_GLES20Canvas.cpp
120856c50a56595c0954ae1bf6f05888386937b9 19-Jan-2011 Joe Onorato <joeo@google.com> Pass SkRegion::toString() through to java.

Change-Id: I3814b491c689313c1f8da811a104d913175f6268
ndroid/graphics/Region.cpp
7457b36b92490daa6cd7e346919fad74a4b92eb9 20-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Make connection / disconnect failure more robust." into honeycomb
b098f73556ae31f505782d2fe7028b83d1564147 19-Jan-2011 Carl Shapiro <cshapiro@google.com> Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb
fbe807d064ada99211b102914df514aa562256f8 19-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Make connection / disconnect failure more robust.

Add error codes so that the states can be tracked better.

Change-Id: Ic07a5d34589134b68dedeb4803ccb523aa01b567
ndroid_bluetooth_common.h
ndroid_server_BluetoothEventLoop.cpp
8cdf27c36a5b697396144925b3f61e4802dd3558 19-Jan-2011 Carl Shapiro <cshapiro@google.com> Add a property for specifying a dalvik heap growth limit.

Change-Id: I7334fb720277888df836414834ecf1e8d6b4b579
ndroidRuntime.cpp
2a83f001fdb189f945e82e81e717ba204824b112 19-Jan-2011 Romain Guy <romainguy@google.com> Recreate the EGL surface when ViewRoot's surface changes.
Bug #3306150

Change-Id: Ifbf0ab9deca7a34eff7d844ea7276d12d7284788
ndroid_view_Surface.cpp
89108d5c311d0cc6879fb41c6392f17c58644fee 18-Jan-2011 Romain Guy <romainguy@google.com> Merge "Add support for skew()" into honeycomb
807daf7df615b60ce6fc41355aabe3aa353cebab 18-Jan-2011 Romain Guy <romainguy@google.com> Add support for skew()

Change-Id: Ia3a9a867f74fd78b61f75179e3788fdc2f0cacd0
ndroid_view_GLES20Canvas.cpp
4b26247e8b45850afc78e414a7007266dbdc5d18 18-Jan-2011 Owen Lin <owenlin@google.com> Merge "Change to stream decoding mode if the file descriptor cannot support seek." into honeycomb
a9d0d47076ecf2d1739bb3534abc9deead8ebebd 18-Jan-2011 Owen Lin <owenlin@google.com> Change to stream decoding mode if the file descriptor cannot support seek.

bug: 3298498
Change-Id: Id7ae46bf8e885a417753edbd6648332052fee469
ndroid/graphics/BitmapFactory.cpp
1689c3459b27657b6900429ae64ac5323c584ce3 17-Jan-2011 Romain Guy <romainguy@google.com> Merge "Add BitmapFactory.Options.inMutable to load mutable bitmaps." into honeycomb
2361098da3b9d9c3eeed410dc72ba62c0e9177cf 17-Jan-2011 Romain Guy <romainguy@google.com> Add BitmapFactory.Options.inMutable to load mutable bitmaps.

Change-Id: Iaa222127520f3aa55072d44af12ee3477908b876
ndroid/graphics/BitmapFactory.cpp
5cdf07524132722e0db69db1ca8dcaf3f0073265 17-Jan-2011 Jeff Brown <jeffbrown@google.com> Merge "Support non-rectangular input regions." into honeycomb
fbf097732137a32930d151f7ba6816a5b870c32a 16-Jan-2011 Jeff Brown <jeffbrown@google.com> Support non-rectangular input regions.

This enables the system bar to carve out a region through which
events will be sent to the IME behind it.

Bug: 3238092
Change-Id: I69b855a8d9b5b3ee525266c0861826e53e5b5028
ndroidRuntime.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Region.h
805fd7ee0e5dc2939e85c84f78d9890a51982bc0 17-Jan-2011 Dianne Hackborn <hackbod@google.com> Add API to get path to OBBs.

Also hide the bitmap thumbnail stuff, we can't support it in its
current form.

And fix some bugs with propagating paths to native code. Yikes!

Change-Id: I13ab37ddbdba5c073489cba5eab035117d3c1574
ndroid_app_NativeActivity.cpp
376590d668e22a918439877b55faf075427b13f3 13-Jan-2011 Jamie Gennis <jgennis@google.com> Implement SurfaceTexture frame-available callback.

This change implements the onFrameAvailable callback for the
SurfaceTexture java class. It includes the C++ SurfaceTexture code as
well as the JNI and Java code to enable the callback.

Change-Id: Ifd8b8e7ad46ee70cba6da1c2e96dab8045d1ea30
ndroid/graphics/SurfaceTexture.cpp
c15c7a79a69733bd21d6548fd74c2874fdabe7e8 13-Jan-2011 Romain Guy <romainguy@google.com> Merge "Cleanup implementation of hardware layers." into honeycomb
ada830f639591b99c3e40de22b07296c7932a33f 13-Jan-2011 Romain Guy <romainguy@google.com> Cleanup implementation of hardware layers.

The new implementation relies on OpenGLRenderer's existing layer
code instead of duplicating it. The new code is much cleaner, with
simpler and better APIs and allows tracking of drawn regions inside
layers. Region tracking is not yet enabled but this will be done
in a future CL.

Change-Id: Ie826121a2227de8252c77b992a61218defea5143
ndroid_view_GLES20Canvas.cpp
62cd5c9788abbd5b715ec2a6eaf64dd3945fdbaf 13-Jan-2011 Wei-Ta Chen <weita@google.com> am 61d9ffbf: Merge "Do not merge." into gingerbread

* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
Do not merge.
9aba2324ac8d7216732b42346bfcaf0be71eb22e 13-Jan-2011 Jamie Gennis <jgennis@google.com> Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
57066eb64c9a190d1afc87bb060bbb2d31e5b86c 12-Jan-2011 Romain Guy <romainguy@google.com> Cleanup GL objects on the correct thread.

Change-Id: Iddfea6e08a6591a4fab147151098ef27005f373d
ndroid_view_GLES20Canvas.cpp
b0ba48c95ea8768a051100c5adb4c906caa1e080 10-Jan-2011 Jamie Gennis <jgennis@google.com> Add getTransformMatrix to the SurfaceTexture API.

Change-Id: Icd11ed4982220be9d08b00498aef02531610ce1f
ndroid/graphics/SurfaceTexture.cpp
25bce3a673afef6a7858270afae4395b4ab53de3 24-Dec-2010 Wei-Ta Chen <weita@google.com> Do not merge.

Backport changes related to BitmapRegionDecoder from HoneyComb to
Gingerbread.

Bug: 3309014

////////////////////////////////////////////////////
This is a combination of 7 commits.
Revert "Do not merge."

This reverts commit f7681f84918c27f6a626681ce37ed2a236c44e82.

Change-Id: I46fd710600b1649773eaea2d9abc2b21a592f9a6

Fix a initialization bug in BitmapRegionDecoder.

Change-Id: I6c1151fd34970a84d4de52d664d9a5dc464892c5

Fix segfault when tring to throw IOException.

Change-Id: I530cc4409ba4ca17cec933afad077c5f60ba554f

Fix 3122139, where previewing an attachment for the second time will
fail.

Use AutoFDSeek to mark and restore the position before we read data from
the descriptor.

Change-Id: I3d4f012dce486e19b113bc90a98b94031cfa8195

Add inPreferQualityOverSpeed into BitmapFactory.Options.

The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.

The field by default is not set and thus does not affect existing
applications.

Bug: 3238925
Change-Id: I93d55b7226e47a43e639325cd1a677694d6f2ee4

Unhide inPreferQualityOverSpeed in BitmapFactory.Options.

The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.

The field by default is not set and thus does not affect existing
applications.

Bug: 3238925

Related changes: https://android-git.corp.google.com/g/#change,83291 and
https://android-git.corp.google.com/g/#change,83294

Change-Id: I969f5c413f9b2179454aeb90e18ae8222ee583b4

Correct the API comments.

BitmapRegionDecoder supports PNG as well.
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapFactory.h
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
6c319ca1275c8db892c39b48fc54864c949f9171 11-Jan-2011 Romain Guy <romainguy@google.com> Better backend for hardware layers.

With this new backend, a hardware layer is only recreated when
its associated view is udpated. This offers fast composition
in GL and fast update of the layer in GL as well.

Change-Id: I97c43a612f5955c6bf1c192c8ca4af10fdf1d076
ndroid_view_GLES20Canvas.cpp
05554a4ee99ae4696929cb1b9a646dbd7a6c7e76 10-Jan-2011 Andy McFadden <fadden@android.com> Fix start-time setreuid complaints.

The code was checking errno instead of the return value from the call.
This fixes calls to setreuid(), setregid(), and setpgid().

Bug 3131052

Change-Id: I8b6155bd4fa9b941895b35fed62cfc163b420fff
om_android_internal_os_ZygoteInit.cpp
fd6f39e147dc077139a41b9c2a4039fbaa20224e 20-Dec-2010 Jamie Gennis <jgennis@google.com> Enable camera preview to a SurfaceTexture.

This change adds a public Java API to use a SurfaceTexture as the
destination of camera preview frames.

Change-Id: If537fed2df12c5c181e2af5f817985c1bda853fb
ndroid_hardware_Camera.cpp
aa0ce3396c096c97e3394c53e3912cb08b66fe20 07-Jan-2011 Jamie Gennis <jgennis@google.com> Add SurfaceTexture JNI registration.

Change-Id: I5441600b334e11e6ef88eb96ebb010df75080ad6
ndroidRuntime.cpp
d559ebbc3dd1a6b4b1bbecd30dd381b0b0328361 07-Jan-2011 Jamie Gennis <jgennis@google.com> Merge "Add the SurfaceTexture java class." into honeycomb
6714efc5e0c52953b65e774de0003e22377e7d39 20-Dec-2010 Jamie Gennis <jgennis@google.com> Add the SurfaceTexture java class.

This class exposes to Java the application-side interface to the
SurfaceTexture C++ class.

Change-Id: I0dba42aad90257c7adbde6fa362658c0717b70d0
ndroid.mk
ndroid/graphics/SurfaceTexture.cpp
5977baa1fa24125c148a72699b53e62abaf08960 06-Jan-2011 Chet Haase <chet@google.com> Reuse of native display list objects

Change-Id: Ia4553e23930ad20e56c11faa7809be788a1ad4bb
ndroid_view_GLES20Canvas.cpp
264f6cd0b9215f75dd5917252abea98e8fce6222 06-Jan-2011 Mike Lockwood <lockwood@android.com> Temporarily remove UsbManager support for USB host.

A new USB host API will be added in an upcoming commit

Change-Id: I5816c10c7acd236d31ab8ae255fc83c77121eea0
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_UsbManager.cpp
6b1f6e6ac1d8c8cff778ee161f430e077a82082e 05-Jan-2011 Romain Guy <romainguy@google.com> Merge "Keep a reference to the local matrix. Bug #3299324"
a9ebfa6bcce62d7fee69693fe3dee6027afd3f0e 05-Jan-2011 Romain Guy <romainguy@google.com> Keep a reference to the local matrix.
Bug #3299324

This is needed for ADT, which does not rely on Skia's reference counting
to correctly keep track of the native objects.

Change-Id: Ia2fc5c1ec2b80bad226bc549fefc6bb064784609
ndroid/graphics/Shader.cpp
dc3c9c4b85988f187d84386bac82448d534de6cf 04-Jan-2011 Vasu Nori <vnori@google.com> Merge "when cursorwindow allocation fails, print the number of cursors left open"
6141e13f6e84846ae531358a8bcbf6d2102b1bd4 24-Dec-2010 Vasu Nori <vnori@google.com> when cursorwindow allocation fails, print the number of cursors left open

the reason for bug:3281533, bug:3127159 is probably too many cursors are left
un-closed in the process.
print the info on the number of cursors left open when the exception
"cursorwindow allocation failed" occurs.
This should help us figure out if that indeed is the reason
and which process is leaving the cursors open.

Change-Id: I4b46be63f5dfbe9b102ad7a9cf9dd21e70f71e14
ndroid_database_CursorWindow.cpp
d07c9d5d920c261ef10efc825ee5225e83ad1c5b 29-Dec-2010 Mike Lockwood <lockwood@android.com> UsbManager: Add methods to convert between USB device names and IDs

Change-Id: I199a47805b629cc7b1714191d6af2fd70c2bda6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_hardware_UsbManager.cpp
34ad57f0e844cd97f59d4ab22087d60d58650ba4 21-Dec-2010 Vasu Nori <vnori@google.com> resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9

Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9 was reverted
due to a bug. fixed the bug and resubmitting it here
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteDatabase.cpp
5274e84e88d2cba20ad3cb21c55c1758b4da8af4 20-Dec-2010 Vasu Nori <vnori@google.com> Revert "bug:2448371 cursorwindow size moved to resource xml file."

This reverts commit 2594bae1f551d758c5c88771310d1ee3dc2c71ac.
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteDatabase.cpp
2594bae1f551d758c5c88771310d1ee3dc2c71ac 19-Dec-2010 Vasu Nori <vnori@google.com> bug:2448371 cursorwindow size moved to resource xml file.

let cursor window size be set per device in device resources file.
default is 1MB.
for SR, it is 2MB.
it can be set to any value (in kB) in the device resource
strings.xml file

Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteDatabase.cpp
4c7cc34127efa3308e1a09b28728868911b79789 17-Dec-2010 Dianne Hackborn <hackbod@google.com> Demo hack!

To make a 800 tall screen run like a 720:

adb shell setprop persist.demo.screensizehack 800=720

Note this is a persistent property, so it will (intentionally) remain across boots.

Change-Id: I8a8a9f937399327444e8fb154b91f0e642db116e
ndroid_view_Display.cpp
12d81c49a015ed8d5ef7af2d854eee1e80472219 18-Dec-2010 Carl Shapiro <cshapiro@google.com> Fix a constructor declaration to match its definition.

The second argument of the JavaPixelAllocator constructor was
eliminated by an earlier change but the class definition was not
updated to match that edit.

Change-Id: I27af0cc52c748cfdec02eb4edcf512dd13f72567
ndroid/graphics/GraphicsJNI.h
2118b25ad422e946d4d87e191c5710bfacd7503e 18-Dec-2010 Carl Shapiro <cshapiro@google.com> Eliminate tracked allocations and the inNativeAlloc option.

Change-Id: Ic10b2b41a26925d799e5d1e50be77fc480ec0f17
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
b7ec3e10194084e2a198602e20589c5bdecbda37 17-Dec-2010 Jaikumar Ganesh <jaikumar@google.com> Fix PANU - Bluetooth tethering - JNI calls.

Change-Id: Ia0b37a03e65be6632cc0bb8f1a98f268d42c9d87
ndroid_server_BluetoothService.cpp
a2f0e2d6b7f9dff3a52dd78d6db307070a71e9b2 16-Dec-2010 Patrick Dubroy <dubroy@google.com> Allow a JNI local ref to be passed directly into globalRef().

Change-Id: If3063e88ec1eba7a13c983f5f71be6a2d84c4d60
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
afde46ed008f150e45e1b0d7e1dc588fc047b74f 15-Dec-2010 Patrick Dubroy <dubroy@google.com> Turn fatal assertion in decodeRegion into a warning.
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
5d001ea0271eeedb05984ac00d5e41d767f0cb87 15-Dec-2010 Irfan Sheriff <isheriff@google.com> Use clear names for native API

Change-Id: I96c3089e10c75f433410f66c01204b7e5de2dc55
ndroid_net_wifi_Wifi.cpp
320a4beda312279e842a97d3af5b3f0b28cbe49d 15-Dec-2010 Irfan Sheriff <isheriff@google.com> Merge "Handle supplicant stop correctly"
96071a7031bac06e3f249610b010ad5651efe8ae 14-Dec-2010 Irfan Sheriff <isheriff@google.com> Handle supplicant stop correctly

- Use a clean terminate for a regular stop and on failure kill supplicant. This prevents
WifiMonitor from getting hung permanently on a socket in case of a kill

- When WifiMonitor exits, kill supplicant and cleanup sockets

Change-Id: I87c32e03d945433f33eed8c326d7f0368925bf55
ndroid_net_wifi_Wifi.cpp
982b71bf4713d57b0fdb9acaaf9f9465a817aacb 15-Dec-2010 Patrick Dubroy <dubroy@google.com> Merge "Allocate bitmap backing buffers in the Java heap."
e4ac2d6b5723c95e648c489b187ddde449452c13 01-Dec-2010 Patrick Dubroy <dubroy@google.com> Allocate bitmap backing buffers in the Java heap.

Change-Id: I60f6ccff13357c1c518e9d56b02fe0171637edd1
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_emoji_EmojiFactory.cpp
ndroid_view_GLES20Canvas.cpp
4e920f70f38d52d3a74c6a3133388a2e2cb6c175 14-Dec-2010 Brad Fitzpatrick <bradfitz@android.com> Add MODE_MULTI_PROCESS flag to Context.getSharedPreferences()

Also, changes to make this testable with CTS:

-- special PENALTY_DEATH StrictMode fast path that doesn't use
the Looper idling to "time" the violation. Only used when
death is the only violation,

-- make PENALTY_DEATH throw a RuntimeException instead of
killing its process with a signal. this means we can catch
it in CTS tests, but it's also more consistent with
PENALTY_NETWORK_DEATH in Honeycomb.

-- make FileUtils.getFileStatus() invoke StrictMode, which isn't
(yet?) aware of I/O in native code. so help it out.

CTS test for MODE_MULTI_PROCESS is in I6154edab

Change-Id: Icf93f9dfb0ece06b16781e4803dd2c17df3cf1b3
ndroid_os_FileUtils.cpp
0bd5243b751c9cad317758158f79b3347e7948af 14-Dec-2010 Brad Fitzpatrick <bradfitz@android.com> Framework-side support for Dalvik "isSensitiveThread" hook.

Used in lock contention stats.

Bug: 3226270
Change-Id: Ie6f58d130a29079a59bdefad40b80304d9bc3623
ndroidRuntime.cpp
d2835935d2df8be70d1b37d3ef3b2fe0155b3422 14-Dec-2010 Dianne Hackborn <hackbod@google.com> Fix issue #3258849: Grab thumbnail when exiting an app via back

Also issue #3281400: Rotating a retained instance fragment leaks the fragment manager

And turn off fragment debug logging.

Change-Id: Ibdd7db82bb35618021bcba421ba92ced7cd691c2
ndroid_view_Surface.cpp
32f4ab457d9f79251413357b75b7a233068a892c 14-Dec-2010 Irfan Sheriff <isheriff@google.com> Merge "WPS fixes and refactor"
dee4cb07a3652457e18a0bf4be57d2cedeca7359 13-Dec-2010 Jack Palevich <jackpal@google.com> Avoid SIGSEGV in Bitmap_writeToParcel.

SkBitmap::getPixels() can return NULL. The rest of the JNI Bitmap
code treats this NULL as if the SkBitmap has transparent black
pixels. Bitmap_writeToParcel now does the same.

Change-Id: I5e70b42b3d22a8aea898ce342e590000325bd0f9
ndroid/graphics/Bitmap.cpp
02fb46a297c4f645f2a30b574151401dd0978521 08-Dec-2010 Irfan Sheriff <isheriff@google.com> WPS fixes and refactor

- Allow IP and proxy set up for WPS
- Use string for WPS pin to avoid losing leading zeros
- Add a seperate WPS state machine and WpsConfiguration class

Change-Id: I87f43fff8bba0ae8ff02e5fc495a8bc628a8c8cf
ndroid_net_wifi_Wifi.cpp
aecb2c5f709d38a46cf448f986b60f590651d3fa 13-Dec-2010 Jaikumar Ganesh <jaikumar@google.com> Remove function when Bluetooth is not present in the hardware.

Change-Id: I3892044723402597b7db1f7df683c08804c1fb96
ndroid_server_BluetoothService.cpp
84690c88f37f395094147d27ace8319a2803a522 10-Dec-2010 Jaikumar Ganesh <jaikumar@google.com> Add direct calls to Bluez to add SDP records.

This helps Settings app to enable just the Headset service.

Change-Id: Ia9c39467df1e83d665e377313e16e6c54991f6d6
ndroid_server_BluetoothService.cpp
decc8cd41eca3770c8f5ee13d81b9cd5f0c25ccd 11-Dec-2010 Chet Haase <chet@google.com> Add ability to reuse bitmaps when decoding PNG content

Change-Id: Ic74b62c6280954ff80bcf64f3989a36c7c0b5615
ndroid/graphics/BitmapFactory.cpp
37f74cad46c6f1799aec3c52e8f47598237f43d4 09-Dec-2010 Chet Haase <chet@google.com> Add ability to reuse bitmaps when loading new content

Change-Id: Ic5f5f40ee39787403977fb372b335dc21cf07243
ndroid/graphics/BitmapFactory.cpp
1542af35976ce121b8a69812ab8dec7b71a0b283 08-Dec-2010 Kenny Root <kroot@google.com> Merge "Change assets to use 64-bit API"
9e4c884e7a7acd6b75399b180dc339295cda5a43 08-Dec-2010 Carl Shapiro <cshapiro@google.com> Add a comment regarding the sizing of the Dalvik heap.

Change-Id: I07a3267531580f034e78b5316162bfb553f1f819
ndroidRuntime.cpp
ddb76c4644756b31be948d70aaa8ee541dd94999 24-Nov-2010 Kenny Root <kroot@google.com> Change assets to use 64-bit API

The asset system and supporting libraries were using off_t instead of
off64_t to access files larger than 2GB (32-bit signed). This change
replaces all off_t with off64_t and lseek64.

There is a new utils/Compat.h added for Mac OS compatibility.

Also fixed some size-related compiler warnings.

Bug: 3205336
Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
ndroid_util_AssetManager.cpp
ca7e1ed81ce44090aac17c9599578b1c23db7863 08-Dec-2010 Carl Shapiro <cshapiro@google.com> Remove stale code and unneeded '\n' chars from findClass.

Change-Id: I496d56105a0889eb0a8c492985f8a324a200edc6
ndroidRuntime.cpp
77019fa4f9e74c0630effd9daaf13f977550e4ed 08-Dec-2010 Jeff Brown <jeffbrown@google.com> Merge "Add support for fallback keycodes."
49ed71db425c5054e3ad9526496a7e116c89556b 07-Dec-2010 Jeff Brown <jeffbrown@google.com> Add support for fallback keycodes.

This change enables the framework to synthesize key events to implement
default behavior when an application does not handle a key.
For example, this change enables numeric keypad keys to perform
their associated special function when numlock is off.

The application is informed that it is processing a fallback keypress
so it can choose to ignore it.

Added a new keycode for switching applications.

Added ALT key deadkeys.

New default key mappings:
- ESC -> BACK
- Meta+ESC -> HOME
- Alt+ESC -> MENU
- Meta+Space -> SEARCH
- Meta+Tab -> APP_SWITCH

Fixed some comments.
Fixed some tests.

Change-Id: Id7f3b6645f3a350275e624547822f72652f3defe
ndroid.mk
ndroid_text_KeyCharacterMap.cpp
ndroid_view_KeyCharacterMap.cpp
38cfa8ca8bc67f4342431cea7e35643ddf9254cc 08-Dec-2010 Carl Shapiro <cshapiro@google.com> Add a property to set the starting size of a VM.

Change-Id: I3c981417baadfef64990fd90b4a275ed706a0b5b
ndroidRuntime.cpp
953f9094a2ec14594fa8501d5f3e2d9e300b1b62 03-Dec-2010 Wei-Ta Chen <weita@google.com> Add inPreferQualityOverSpeed into BitmapFactory.Options.

The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.

The field by default is not set and thus does not affect existing
applications.

Bug: 3238925
Change-Id: I93d55b7226e47a43e639325cd1a677694d6f2ee4
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapFactory.h
ndroid/graphics/BitmapRegionDecoder.cpp
1f2451007c660091b7b090c1ea332f9044515d2d 19-Nov-2010 Jeff Brown <jeffbrown@google.com> Ensure the ShortcutManager uses the correct key character map.

The ShortcutManager used to only receive the key code of the key event
that triggered the shortcut. This change now provides the shortcut
manager with the whole key event so it can look up the associated
character using the correct key character map.

To make this more efficient, added a mechanism for recycling
key events. At the moment it is only used by key events owned by the
system process, since clients of the existing API (such as Views)
might continue to hold on to key events after dispatch has finished so
they would break if the key event were recycled by the framework.

Deprecated KeyCharacterMap.BUILT_IN_KEYBOARD.

Change-Id: I4313725dd63f2be01c350c005a41c7fde9bc67e8
ndroid_app_NativeActivity.cpp
ndroid_view_KeyEvent.cpp
ndroid_view_KeyEvent.h
ndroid_view_MotionEvent.cpp
ndroid_view_MotionEvent.h
997d15e1a6e4a74c69c03f164973b7ddd21c6fff 30-Nov-2010 Olivier Bailly <olivier@google.com> Merge "fix int vs. pointer mismatch in return statement. Add missing include header for compilation on x86 target."
e26092e2023e1326acf6d63f76878a7d0a1793fb 29-Nov-2010 Dianne Hackborn <hackbod@google.com> Merge "Don't leak."
1f5b195ed0f7f4a3398903fc064af1788c108bad 29-Nov-2010 Dianne Hackborn <hackbod@google.com> Don't leak.

Change-Id: I756d54feeef4ff73f17c80d4b4405de56a5787a6
ndroid_view_Surface.cpp
b37f8a8af15425ed3e65104e8556099d33a9c1ce 29-Nov-2010 Vasu Nori <vnori@google.com> fix messages from sqlite layer in c++ code to be useful.

Change-Id: Ib13f86f3481aae391f5e887bb14877f12bf48034
ndroid_database_CursorWindow.cpp
a111187a5b4dc5d287e29ced7d65e8d20edca140 24-Nov-2010 Dianne Hackborn <hackbod@google.com> Change rotation freeze to all be implemented in window manager.

Lots of work for no visible change in behavior, but now we can
do some fancier stuff...

Also allow rotation in all 4 directions.

Change-Id: I7e5e9537c5e359f69b83c10f65cc1ce95f371461
ndroid_view_Surface.cpp
33710fc4a95df602cffc338fdfe79e27eaea4f06 19-Nov-2010 Brad Fitzpatrick <bradfitz@android.com> am 096c4c44: am 251384a7: Merge "Improve performance when getting styled string."

* commit '096c4c448d8110c21108f2db4a19a85099e78557':
Improve performance when getting styled string.
096c4c448d8110c21108f2db4a19a85099e78557 19-Nov-2010 Brad Fitzpatrick <bradfitz@android.com> am 251384a7: Merge "Improve performance when getting styled string."

* commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5':
Improve performance when getting styled string.
d7c8672ccc8ccd1f99da60accc63d6817d41ac52 18-Nov-2010 Olivier Bailly <olivier@google.com> fix int vs. pointer mismatch in return statement.
Add missing include header for compilation on x86 target.

Change-Id: I3651fb3be0178b888c5ada3d3754fb379b55a847
ndroid_util_AssetManager.cpp
6b53e8daa69cba1a2a5a7c95a01e37ce9c53226c 11-Nov-2010 Jeff Brown <jeffbrown@google.com> Added support for full PC-style keyboards.

BREAKING CHANGE: Redesigned the key character map format to
accomodate full keyboards with more comprehensive suite of modifiers.
Old key character maps will not work anymore and must be updated.
The new format is plain text only and it not compiled to a binary
file (so the "kcm" tool will be removed in a subsequent check-in).

Added FULL keyboard type to support full PC-style keyboards.

Added SPECIAL_FUNCTION keyboard type to support special function
keypads that do not have any printable keys suitable for typing
and only have keys like HOME and POWER

Added a special VIRTUAL_KEYBOARD device id convention that maps
to a virtual keyboard with a fixed known layout. This is designed
to work around issues injecting input events on devices whose
built-in keyboard does not have a useful key character map (ie.
when the built-in keyboard is a special function keyboard only.)

Modified several places where events were being synthesized
to use the virtual keyboard.

Removed support for the "qwerty" default layout.
The new default layout is "Generic". For the most part "qwerty"
was being used as a backstop in case the built-in keyboard did
not have a key character map (probably because it was a special
function keypad) and the framework needed to be able to inject
key events anyways. The latter issue is resolved by using the
special VIRTUAL_KEYBOARD device instead of BUILT_IN_KEYBOARD.

Added the concept of a key modifier behavior so that
MetaKeyKeyListener can distinguish between keyboards that use
chorded vs. toggled modifiers.

Wrote more robust key layout and key character map parsers
to enable support for new keyboard features and user installable
key maps.

Fixed a bug in InputReader generating key ups when keys
are released out of sequence.

Updated tons of documentation.

Currently QwertyKeyListener is being used for full keyboards
with autotext and capitalization disabled. This mostly works
but causes some problems with character pickers, etc.
These issues will be resolved in subsequent changes.

Change-Id: Ica48f6097a551141c215bc0d2c6f7b3fb634d354
ndroid_text_KeyCharacterMap.cpp
ac4a181d2e02f2dd375c61ce231d35e50d0d1836 18-Nov-2010 Peter Eliasson <peter.eliasson.x@sonyericsson.com> Improve performance when getting styled string.

The style used in the composing text for input methods
takes a long time to create. This is experienced as a
lag when composing the first word.

The bottleneck lies in the 10 calls to
nativeIndexOfString which does a linear search through
thousands of strings.

Change-Id: I3184b2be3673d384cca19e9a70ad94b4d3085576
ndroid_util_StringBlock.cpp
a8079bfb9a738a7f24f103cd640e5317c4fd2510 16-Nov-2010 Andreas Huber <andih@google.com> Apparently SystemProperties jni native support must now be registered before Binder's.

Change-Id: Ia7197f41052c4d47dbecec400a7c789317f743a0
ndroidRuntime.cpp
b763fa1d7c7de7ee33ab359e3105accafe5a2fdc 15-Nov-2010 Kenny Root <kroot@google.com> Merge "Split UTF functions from String8/16"
300ba6846949f5b21c6d93d7698dbc39716cf832 09-Nov-2010 Kenny Root <kroot@google.com> Split UTF functions from String8/16

Split out all the UTF-8/16/32 handling code from String8/16 to its own
file to allow better reuse of code.

Change-Id: If9ce63920edc75472c38da4adce0d13cda9ad2f7
ndroid_emoji_EmojiFactory.cpp
fe48f65922d4a3cc4aefe058cee5acec51504a20 12-Nov-2010 Romain Guy <romainguy@google.com> Free resources only from the GL context thread.
Bug #3179882

Resources were freed following garbage collections on a worker thread.
This worker thread had no EGL context, which would cause the renderer
to incorrectly assume that the memory was liberated.

Change-Id: Ifdb51f94ddf42641e8654522787bfac532976c7c
ndroid/graphics/Path.cpp
5314335c9e28673923ad034e5f8a5ba765552a08 11-Nov-2010 Jeff Brown <jeffbrown@google.com> am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread

* commit '00e5dd44f6d014fff8c65b9c718f5641f5eae4bb':
Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
00e5dd44f6d014fff8c65b9c718f5641f5eae4bb 11-Nov-2010 Jeff Brown <jeffbrown@google.com> Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
e7f339613002ada65b220117ff87cd3c1ea41cf1 09-Nov-2010 Jeff Hamilton <jham@android.com> am cc798d96: am 2e2983c6: Merge "Reduce log clutter." into gingerbread

* commit 'cc798d9675b105775c9736fc68b68d7c8cd0c5a7':
Reduce log clutter.
cc798d9675b105775c9736fc68b68d7c8cd0c5a7 09-Nov-2010 Jeff Hamilton <jham@android.com> am 2e2983c6: Merge "Reduce log clutter." into gingerbread

* commit '2e2983c6efe0e4223086e4675b715ed0e20e8d26':
Reduce log clutter.
8f6068e63ec93c671412bafee44e69fb73adecf6 09-Nov-2010 Jeff Brown <jeffbrown@google.com> Fix JNI reference leak in NativeActivity. (DO NOT MERGE)

This change ensures that the native activity releases the KeyEvent
objects that it allocates since they will not be released
automatically and eventually the JNI slot table will overflow
and crash the process.

Bug: 3170494
Change-Id: I2ea527f056096fae9bc9e7685dccb56ec7a0e8b4
ndroid_app_NativeActivity.cpp
d8acf9b68235c9c9a73f797cf520b9384d1c9368 08-Nov-2010 Romain Guy <romainguy@google.com> Merge "Support nested display lists."
3915bb845b032dc184dba5e60970b803390ca3ed 05-Nov-2010 Jeff Brown <jeffbrown@google.com> Tell system server whether the app handled input events.

Refactored ViewRoot, NativeActivity and related classes to tell the
dispatcher whether an input event was actually handled by the application.

This will be used to move more of the global default key processing
into the system server instead of the application.

Change-Id: If06b98b6f45c543e5ac5b1eae2b3baf9371fba28
ndroid_app_NativeActivity.cpp
ndroid_view_InputQueue.cpp
0fe478ea04720a57ef3919dbc23711bc7eba517f 08-Nov-2010 Romain Guy <romainguy@google.com> Support nested display lists.

Change-Id: I3815a2832fc0f722c668ba8f51c5f177edb77c94
ndroid_view_GLES20Canvas.cpp
5629d51f221adad107a509570ab2c739d1bf1a23 08-Nov-2010 Jeff Hamilton <jham@android.com> Reduce log clutter.

Change-Id: Ia034b563b028d74b4878f1af7db9188c82d03548
ndroid_nfc.h
ndroid_nfc_NdefMessage.cpp
ndroid_nfc_NdefRecord.cpp
5be894e636522addc40dad3b631f0249e6cc25cf 03-Nov-2010 Vasu Nori <vnori@google.com> add API to return Uri for the given downloaded file id & get mimetype

Change-Id: I1f5dd734e394db0056579a3a0c26862fee27981e
ndroid_database_SQLiteDatabase.cpp
6e0ecb4eed5cd2e1f15766d7028467129974a12d 04-Nov-2010 Chet Haase <chet@google.com> Adding JNI methods as a faster reflection mechanism

This approach is only for the common cases of void-return,
single-argument float/int methods.

Change-Id: Ifb31535a6f717b85417eced93c579be6e461e039
ndroid.mk
ndroidRuntime.cpp
ndroid_animation_PropertyValuesHolder.cpp
8dc287de7f111fe96b953e459c6d25877538fb5c 03-Nov-2010 Bryan Mawhinney <bryanmawhinney@google.com> Merge "Avoid copying byte arrays when just decoding bounds."
2a3d754549abc4b55e6cfc2d0c986d29782b2492 03-Nov-2010 Bryan Mawhinney <bryanmawhinney@google.com> Avoid copying byte arrays when just decoding bounds.

Currently, if a caller specifies both "purgeable" and "just decode
bounds" options when passing a byte array to decode, we create an
unnecessary copy of the byte array. This is probably not common,
but we may as well avoid the copy.

Change-Id: I27e573b0e1fb8f8516729882a84efa02b6da08a5
ndroid/graphics/BitmapFactory.cpp
ed4f28b492da3ff140bbaabbbda798a08c40ea5b 30-Oct-2010 Irfan Sheriff <isheriff@google.com> Set country code in the driver and remove channel set

With dual band support, using country code
settings is the way to go

Bug: 2936741
Change-Id: I760dce4c43b1af19ee205c28f0d287420c8d9e85
ndroid_net_wifi_Wifi.cpp
55fc850cf992cdcb0993cb109d2f716613c0dbdd 28-Oct-2010 Kenny Root <kroot@google.com> Add path to get different DPI drawables

Allow a caller to request a different density than their current display
allows. This can mean a device displaying mdpi can get a resource that's
in hdpi and have it pretend to be in mdpi resolution. If a drawable
that's returned is not in the requested density, it will set it at the
appropriate density to be scaled up later on.

The API for this is hidden currently.

Bug: 3134688
Change-Id: I6c3908cbdef4907b8d3f1576df9e3b0e7af1755a
ndroid_util_AssetManager.cpp
a8413beb39b6b75e9b77ded4388e73f22bda556e 27-Oct-2010 Irfan Sheriff <isheriff@google.com> Merge "WifiLock extensions for high performance mode"
5876a4273e67271f0eca607af9520f7e5abbe4f3 13-Aug-2010 Irfan Sheriff <isheriff@google.com> WifiLock extensions for high performance mode

Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: Id394d265b9876bf0230efb3d222056e9b80b44fd
ndroid_net_wifi_Wifi.cpp
9440083be22ec13e252aa347e654911d33e50086 26-Oct-2010 Chet Haase <chet@google.com> Merge "Optimizing ColorFilter in display lists"
ad93c2bb63dfc813b2eefa1043aa63afbddce655 23-Oct-2010 Chet Haase <chet@google.com> Optimizing ColorFilter in display lists

Change-Id: Ie4d5e5b0bc45e0ce47bba144049303c270762e54
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/Shader.cpp
bb8300e155755afba6c51bbd790bd5599f0ae7cc 26-Oct-2010 Patrick Scott <phanna@android.com> Merge "Fix debug statements and aapt assert."
f235c5ab91b040b88ceb61beb819e15f1b19e9e4 22-Oct-2010 Irfan Sheriff <isheriff@google.com> add wps pin from device capability

Bug: 3119043
Bug: 3112178
Change-Id: Iaae6bcf53e11f7fac82b3c604ddc27ff05e00542
ndroid_net_wifi_Wifi.cpp
4f145c9674f814939cc91f699efe538b6c18cba0 21-Oct-2010 Patrick Scott <phanna@android.com> Fix debug statements and aapt assert.

ENABLE_PSEUDOLOCALIZE seems to not exist.

Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
ndroid_app_NativeActivity.cpp
dcaff67a807de225bc7e5b6dccc98fa15b329512 26-Oct-2010 Chet Haase <chet@google.com> Merge "DisplayList optimizations and fixes."
d98aa2de9ab18e09c2be1997f41212740f51f6e6 26-Oct-2010 Chet Haase <chet@google.com> DisplayList optimizations and fixes.

We now use a copy of SkPaint objects to avoid having it changed from under us.
We reuse copies that have not changed. We also copy the SkMatrix every time to
avoid the same problem.

Change-Id: If3fd80698f2d43ea16d23302063e0fd8d0549027
ndroid/graphics/Matrix.cpp
ndroid/graphics/Paint.cpp
b1ef24473297410872654a6c4ad51c8341b2c40b 26-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Clean up some logging to make it more useful to debug.

Change-Id: Ic30210ea6886b1c4630d7671a4b01736512e9da8
ndroid_server_BluetoothEventLoop.cpp
ff7db40be166844000749de17382e424617e11b2 26-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Make setting the adapter properties asynchronous.

1. These involve disk operations and multiple processes.
2. onPropertyChange already informs us asychronously.
3. Settings app is the only user, will have to revisit the function
if we make them public.

Change-Id: If019a83c05a0c9e625f27faf99063d33f369f0d8
ndroid_server_BluetoothService.cpp
6ab84eeb0fad723d6e3e1e9fc63a4896a5905248 25-Oct-2010 Dianne Hackborn <hackbod@google.com> am c2f78020: am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread

Merge commit 'c2f78020d3887539fc90230d96465e4b1dc84d8e'

* commit 'c2f78020d3887539fc90230d96465e4b1dc84d8e':
Fix issue #3126018: No way to specify NativeActivity's native method
c2f78020d3887539fc90230d96465e4b1dc84d8e 25-Oct-2010 Dianne Hackborn <hackbod@google.com> am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread

Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp

* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
Fix issue #3126018: No way to specify NativeActivity's native method
e21d91c694e828e6285cc50e79b2a6be6e8c692b 24-Oct-2010 Dianne Hackborn <hackbod@google.com> Fix issue #3126018: No way to specify NativeActivity's native method

Change-Id: I59de6a543e7f7f45d963a905829a3f56f32bf8cf
ndroid_app_NativeActivity.cpp
50db92c452ece8d52d898d1ed289bbb3c43859ed 22-Oct-2010 Wei-Ta Chen <weita@google.com> Merge "Fix 3122139, where previewing an attachment for the second time will fail."
d29c99087466ed14ace7901c85d4977cfbd9fd52 22-Oct-2010 Nick Pelly <npelly@google.com> am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread

Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e'

* commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e':
Attempt to fix simulator build.
c81ec79d1f88ae8a80e08560a56845655a74f67e 22-Oct-2010 Nick Pelly <npelly@google.com> am 0592832c: Merge "Attempt to fix simulator build." into gingerbread

Merge commit '0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp

* commit '0592832c5e61b9c0008a4410f263ea0b0b991f05':
Attempt to fix simulator build.
27f0b17d853d8bef918c3d869044e50cf3904ee3 22-Oct-2010 Chet Haase <chet@google.com> Fix native resource leak when OpenGL renderer is not being used.

Native resources (bitmaps, matrices, paints, shaders) are shared when display lists
are used, and a refcounting system is in place to take care of disposing when all
clients are finished with them. But the cache where these refcounts are tracked is
not enabled when the Open GL renderer is not being used. This results in the native
destructors not being called, and the resources are leaked.

Change-Id: Ic7aeb55e4636dcad229846601407e596160346e6
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Paint.cpp
1af97f0b78663eae0877644cc5f19bdbd9d033c7 22-Oct-2010 Nick Pelly <npelly@google.com> Attempt to fix simulator build.

Change-Id: I7f912ce58292bdd03fa683d2e5c203480d94e945
Signed-off-by: Nick Pelly <npelly@google.com>
ndroid_nfc_NdefMessage.cpp
ndroid_nfc_NdefRecord.cpp
58c1579ce2634de31d24429c1b870d4256ee4f21 22-Oct-2010 Wei-Ta Chen <weita@google.com> Fix 3122139, where previewing an attachment for the second time will
fail.

Use AutoFDSeek to mark and restore the position before we read data from
the descriptor.

Change-Id: I3d4f012dce486e19b113bc90a98b94031cfa8195
ndroid/graphics/BitmapRegionDecoder.cpp
de8635e4c4c9f674b52cb6041380c3ef2812630c 22-Oct-2010 Jeff Hamilton <jham@android.com> am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.

Merge commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp

* commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
Backport ParcelFileDescriptor.createPipe() from master.
389a440ad13f7b16e8f7c7f1670bdd55f1e2112a 21-Oct-2010 Jeff Hamilton <jham@android.com> Backport ParcelFileDescriptor.createPipe() from master.

This allows content providers to expose arbitraty data
through the ContentResolver open* APIs.

Change-Id: I408a0b7cee9cdba5654a962098386c012d6b3549
ndroid_os_ParcelFileDescriptor.cpp
bff26d156d23e55e2428e19b3fb7f52acf03f79f 22-Oct-2010 Dianne Hackborn <hackbod@google.com> am 86f1b643: am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread

Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295'

* commit '86f1b643d10e0b5b17ae01db3b81020db87b3295':
Fix issue #3117918: No way to finish a native activity
86f1b643d10e0b5b17ae01db3b81020db87b3295 22-Oct-2010 Dianne Hackborn <hackbod@google.com> am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread

Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp

* commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc':
Fix issue #3117918: No way to finish a native activity
db28a94d499f995b467b07cee5c9b9119f538b1c 22-Oct-2010 Dianne Hackborn <hackbod@google.com> Fix issue #3117918: No way to finish a native activity

Change-Id: Ic53e712f7ab5412d72a31b96ecba252344b91644
ndroid_app_NativeActivity.cpp
bdccfe4ac4b3c727febecd7443dda7828533e554 21-Oct-2010 Chet Haase <chet@google.com> Merge "Optimizing display lists by referencing pointers to resources instead of copying them"
5c13d89c1332fcc499379b9064b891187b75ca32 08-Oct-2010 Chet Haase <chet@google.com> Optimizing display lists by referencing pointers to resources instead of copying them

Change-Id: I81ad3551d74aa1e5bb64d69e33d2eb29a6c1eb6a
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Shader.cpp
ndroid_view_GLES20Canvas.cpp
3317c6db00144b9dfef3d59abac2f7403e54f5a1 21-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 2cead908: am db723ea0: Merge "jni: Remove duplicated jniThrowException()"

Merge commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102'

* commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102':
jni: Remove duplicated jniThrowException()
2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102 20-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am db723ea0: Merge "jni: Remove duplicated jniThrowException()"

Merge commit 'db723ea0f70392f712542edb1114fc15e782cdb7' into gingerbread-plus-aosp

* commit 'db723ea0f70392f712542edb1114fc15e782cdb7':
jni: Remove duplicated jniThrowException()
ca2a75ad5640efc22873ee14043c586444358997 19-Oct-2010 Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> am 824de4b3: am dd7341f7: Added missing implementation for NdefRecord.

Merge commit '824de4b3e378a5ef41de1704ee3f50a49d408a66'

* commit '824de4b3e378a5ef41de1704ee3f50a49d408a66':
Added missing implementation for NdefRecord.
824de4b3e378a5ef41de1704ee3f50a49d408a66 19-Oct-2010 Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> am dd7341f7: Added missing implementation for NdefRecord.

Merge commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d' into gingerbread-plus-aosp

* commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d':
Added missing implementation for NdefRecord.
dd7341f775ca4d86091f4106d6dfef9214073a7d 18-Oct-2010 Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> Added missing implementation for NdefRecord.

Implemented constructor using a byte array to parse.
Added missing exception in method declaration, leading to update api/current.xml

Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
ndroid_nfc_NdefRecord.cpp
1b04ed793a64ff1bf3cd2b71bee1fdfb228b44fe 18-Oct-2010 Brian Carlstrom <bdc@google.com> Merge "Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents"
dd70133ceb314b2753b6b0e7d22565d56eaf9785 18-Oct-2010 Eric Laurent <elaurent@google.com> am 1a326022: am 208bb08a: Merge "Fix issue 3098880." into gingerbread

Merge commit '1a32602212bad146990418094b0ffcab05c5eb7b'

* commit '1a32602212bad146990418094b0ffcab05c5eb7b':
Fix issue 3098880.
393b84c137fe52f42205cef7e63b7a04b4bfd789 18-Oct-2010 Brian Carlstrom <bdc@google.com> Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents

Change-Id: I86da98bc48111007d8226d8d0dbc7be470bde877
ndroid_os_Debug.cpp
cd0e839a2448deea50f79bddeba782c546b33893 14-Oct-2010 Nick Pelly <npelly@google.com> NFC: Move NFC service implementation out of system_server.

NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_nfc.h
ndroid_nfc_NdefMessage.cpp
ndroid_nfc_NdefRecord.cpp
1fc4d880909362127af9873dbacae1d00eb39d8b 17-Oct-2010 Jim Huang <jserv@0xlab.org> jni: Remove duplicated jniThrowException()

Change-Id: I73a910e4efbf84393b3ce5d7f6e58e61ca88d484
ndroid_text_AndroidBidi.cpp
ndroid_text_AndroidCharacter.cpp
1a32602212bad146990418094b0ffcab05c5eb7b 16-Oct-2010 Eric Laurent <elaurent@google.com> am 208bb08a: Merge "Fix issue 3098880." into gingerbread

Merge commit '208bb08a8b4896bc51b44aeec41b91d4726007cf' into gingerbread-plus-aosp

* commit '208bb08a8b4896bc51b44aeec41b91d4726007cf':
Fix issue 3098880.
36e7790b6b3c2c36c67fbe5dc2e2313cdd537349 16-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge a851d8d0 from gingerbread

Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
fcab0f5502410b975afe045354bbae31ccba68a5 15-Oct-2010 Kenny Root <kroot@google.com> am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread

Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84'

* commit '8fda1636e3e35f060b9046294efd3c062a1fdb84':
OBB: use PBKDF2 for key generation.
0e7a4d9edcee63c6b770db9b6fe792abad5d7b53 15-Oct-2010 Eric Laurent <elaurent@google.com> Fix issue 3098880.

Test value returned by getJNIEnv() in android_media_AudioSystem_error_callback()
and exit if NULL.

Change-Id: If30e5a05c585f34c66e6ad8cece3f7b46ef4be8e
ndroid_media_AudioSystem.cpp
bc21fdefdfbeba1754c6cd339c7dd8e8f1d6fd48 14-Oct-2010 Nick Pelly <npelly@google.com> NFC: Move NFC service implementation out of system_server.

NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_nfc.h
ndroid_nfc_NdefMessage.cpp
ndroid_nfc_NdefRecord.cpp
c9332fa3e9e9e0897482a9c26cf9d997e57376b7 13-Oct-2010 Bjorn Bringert <bringert@android.com> Delete unused WebView drag tracking code

This also removes android.graphics.utils.BoundaryPatch
which was only used by the Browser for the unused drag
tracking (and by a demo app that I'm also removing).

Change-Id: I48253ae005ab11cb4c70d132bc1ea4f2692e2bd2
ndroid/graphics/Canvas.cpp
8fda1636e3e35f060b9046294efd3c062a1fdb84 14-Oct-2010 Kenny Root <kroot@google.com> am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread

Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp

* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
OBB: use PBKDF2 for key generation.
3b1abba6bbc895d63da3e82e9b158c01bd12eddd 14-Oct-2010 Kenny Root <kroot@google.com> OBB: use PBKDF2 for key generation.

Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.

Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
ndroid_content_res_ObbScanner.cpp
41030da16856c8869e1e51d4a0405432fa96614e 13-Oct-2010 Romain Guy <romainguy@google.com> Add a getNativeMatrix() API.

This API can be used by WebView to apply the appropriate transform
on its rendering.

Change-Id: I79aa39a29805f462fb08226370328815e74bdc52
ndroid_view_GLES20Canvas.cpp
4bb942083a0d4db746adf95349108dd8ef842e32 13-Oct-2010 Romain Guy <romainguy@google.com> Optimize 9patch rendering.

This change detects empty quads in 9patches and removes them from
the mesh to avoid unnecessary blending.

Change-Id: I4500566fb4cb6845d64dcb59b522c0be7a0ec704
ndroid_view_GLES20Canvas.cpp
d5da367024c36b317b101fc066a7a4cf992c7d58 10-Oct-2010 Jeff Brown <jeffbrown@google.com> am 22cb4ef8: am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread

Merge commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5'

* commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5':
Switch Looper back to using poll() instead of epoll().
22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5 08-Oct-2010 Jeff Brown <jeffbrown@google.com> am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread

Merge commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db' into gingerbread-plus-aosp

* commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db':
Switch Looper back to using poll() instead of epoll().
415d8c38199e258dfce92cdb0c69e056b3b51ef8 06-Oct-2010 Jeff Brown <jeffbrown@google.com> Switch Looper back to using poll() instead of epoll().

Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.

Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.

Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
ndroid_os_MessageQueue.cpp
6b7bd24659fb175fe1f0e97c86c18969918b496a 07-Oct-2010 Romain Guy <romainguy@google.com> Don't clear the framebuffer when not needed.
ndroid_view_GLES20Canvas.cpp
060e25bf124c530423c589622c220828a7f35086 05-Oct-2010 Vasu Nori <vnori@google.com> don't print informational messages from sqlite in log

right now, all messages from sqlite are printed in the logfile.
if the error code = 0, then sqlite message is just an informational
message that usually has no meaning to the developers
and ends up confusing the developers.
discard such messages

Change-Id: I961f1b33a745d5e9b20c85ee8a0071c92c253d96
ndroid_database_SQLiteDatabase.cpp
bdb801ca993bcccbf2a4c2401d1720c3fa523777 05-Oct-2010 Romain Guy <romainguy@google.com> Remove logs to reduce logcat spam.

Change-Id: I5fc295b05b5d82bb86827b88e94dd51e8bcdc7d3
ndroid_view_GLES20Canvas.cpp
eeac43ad3c9b41c1679f3ab36064fa611106faf2 01-Oct-2010 Wei-Ta Chen <weita@google.com> am f7681f84: Do not merge.

Merge commit 'f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp

* commit 'f7681f84918c27f6a626681ce37ed2a236c44e82':
Do not merge.
f7681f84918c27f6a626681ce37ed2a236c44e82 01-Oct-2010 Wei-Ta Chen <weita@google.com> Do not merge.

Fix 3052285 by not publishing the BitmapRegionDecoder API until the honeycomb release.

Bug: 3052285
Change-Id: Ie339e414c1a5581e1d38684621e0e97162616977
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
20e987bfc35d0ae6cb6344ead65ed44ee7cf8750 23-Aug-2010 Jeff Brown <jeffbrown@google.com> Add MotionEvent Matrix transformations.

Fixed issued in ViewGroup's transformation of MotionEvents to ensure
that the entire historical trace is transformed, not just the current
pointer.

Simplified the code in ViewGroup for splitting events across Views.
The new code also handles the case where some pointers are dispatched
to the ViewGroup in addition to its children whereas the previous
code would drop some pointers on the floor.

Change-Id: I56ac31903e1de8a9c376d9c935b7217b0c42d93e
ndroid/graphics/Matrix.cpp
ndroid/graphics/Matrix.h
ndroid_view_MotionEvent.cpp
e224fabb2c59e9f1274c3569c04b91787824add0 30-Sep-2010 Owen Lin <owenlin@google.com> Fix segfault when tring to throw IOException.

Change-Id: I530cc4409ba4ca17cec933afad077c5f60ba554f
ndroid/graphics/Graphics.cpp
a9164cbb3092d4edebd9f20e7da533e169e8d3c6 30-Sep-2010 Owen Lin <owenlin@google.com> Merge "Fix a initialization bug in BitmapRegionDecoder."
e17c054d34676c25f03b4eb0d8daebe41b84bf6e 29-Sep-2010 Romain Guy <romainguy@google.com> Merge "Add display lists caching."
b051e895ccb696604349c6c5efe7c4747e1d1ab6 29-Sep-2010 Romain Guy <romainguy@google.com> Add display lists caching.

Change-Id: Iac3a248a81ed8cb076a83ef9d186b8ebba685b4c
ndroid_view_GLES20Canvas.cpp
4715bd91f5949a1919156a5a5cb50f0cccda645e 29-Sep-2010 Nick Pelly <npelly@google.com> resolved conflicts for merge of f4c3b7e9 to master

Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
0ab9851308c02928c34e7261c4d4521c07e64f0e 29-Sep-2010 Owen Lin <owenlin@google.com> Fix a initialization bug in BitmapRegionDecoder.

Change-Id: I6c1151fd34970a84d4de52d664d9a5dc464892c5
ndroid/graphics/BitmapRegionDecoder.cpp
f4c3b7e916b417fabb468ec0a565dc79cd7ba2b3 29-Sep-2010 Nick Pelly <npelly@google.com> am 038cabe0: NFC integration

Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
NFC integration
038cabe0247ee46df62f9363f1a303bc5b9c1028 24-Sep-2010 Nick Pelly <npelly@google.com> NFC integration

Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

core/java/android/app/ApplicationContext.java
core/java/android/provider/Settings.java
core/jni/Android.mk
core/jni/AndroidRuntime.cpp
core/res/AndroidManifest.xml
include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
ndroid.mk
ndroidRuntime.cpp
bff405f91001237ec94ec64f86fa2370c4509559 29-Sep-2010 Kenny Root <kroot@google.com> resolved conflicts for merge of d8e8186c to master

Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
d8e8186c887fe47977721315f439465771a96374 29-Sep-2010 Kenny Root <kroot@google.com> am 05105f7a: Update OBB API to include callbacks

Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp

* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
Update OBB API to include callbacks
05105f7abe02b2dff91d6260b3628c8b97816bab 23-Sep-2010 Kenny Root <kroot@google.com> Update OBB API to include callbacks

Add a callback for users of the StorageManager API to be able to receive
notifications when the requested operation completes for mountObb and
unmountObb.

Add NDK API to get to ObbInfo like the Java API has.

Also update the docs for the API and remove the "STOPSHIP" comments.

Change-Id: I23a4409c7f8b74d3169614beba920b4d667990a4
ndroid_content_res_ObbScanner.cpp
f7ebe8e8564108c020fc0d89b833635d210b38a8 27-Sep-2010 Vasu Nori <vnori@google.com> bug:2868568 reduce the message level from error to warning

it is a rather harmless message. no need to set ERROR level
and no need to make it sound so fatal

Change-Id: I9d00563a3b869d8223cb21a98014c02535021d11
ndroid_database_SQLiteDatabase.cpp
4aa90573bbf86db0d33a3a790c5dbd0d93b95cfe 27-Sep-2010 Romain Guy <romainguy@google.com> Adding display lists to the GL renderer (checkpoint.)

Change-Id: Iaa49757600a53b39369dbb23f8c3feab282518e6
ndroid_view_GLES20Canvas.cpp
1c1797acff49857b41ea1e3630d23d940882791c 25-Sep-2010 Romain Guy <romainguy@google.com> Merge "Add debug mode to measure performance."
e2d345ea67e2960b37bfdc0fc8626d1bfa747404 25-Sep-2010 Romain Guy <romainguy@google.com> Add debug mode to measure performance.

Change-Id: I9d4c84034dc200b99c8266165942a7cdbcb5c0c5
ndroid_view_GLES20Canvas.cpp
a7936a5d6d3c989055fffa74f6c5a4b4a8c83114 25-Sep-2010 Eric Laurent <elaurent@google.com> am f3ae63ee: am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread

Merge commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7'

* commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7':
fix problem in AudioEffect JNI setup.
f3ae63eef2d7f55c793b2e76d1371f82cea0aab7 24-Sep-2010 Eric Laurent <elaurent@google.com> am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread

Merge commit '52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp

* commit '52f58e96a723a56e6619c237c814a07503745de9':
fix problem in AudioEffect JNI setup.
2fb43ef8c0b922c1bd0d7cb6867e30d702d4bdb8 24-Sep-2010 Eric Laurent <elaurent@google.com> fix problem in AudioEffect JNI setup.

There is a problem in AudioEffect and Visualizer native_setup() methods
that causes a crash in the application after the mediaserver process
has crashed and restarted.
The problem is that the native AudioEffect/Visualizer constructor is
called while the JNI is in critical state after calling
GetPrimitiveArrayCritical(). As the mediaserver process just restarted, the
first call to AudioSystem will cause the binder IAudioflinger interface to
be reteived and a callback send to AudioSystem JNI to clear the mediaserver
error state. This will call env->FindClass() and crash due to the JNI being
in critical state.

Also fixed a similar problem in AudioTrack JNI

Change-Id: I4a9026a3e26c7f78d9b4b4bec1aac90fbee2ab62
ndroid_media_AudioTrack.cpp
c6c9a7df582f68a924238592573a45674d3fd0ce 23-Sep-2010 Irfan Sheriff <isheriff@google.com> Merge "Add Wifi Protected Setup support"
5ee89800bee7c6c755778795a536e0e2f12b85ff 17-Sep-2010 Irfan Sheriff <isheriff@google.com> Add Wifi Protected Setup support

Add WPS PBC and WPS pin method support with pin obtained
from AP

Bug: 2277571

Change-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610
ndroid_net_wifi_Wifi.cpp
a23cdda0a5fad7798454ecb05a7855cb9211ea22 23-Sep-2010 Wei-Ta Chen <weita@google.com> am ac487f70: am 6b849e21: Unhide BitmapRegionDecoder.

Merge commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe'

* commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe':
Unhide BitmapRegionDecoder.
ac487f708f7b58dbd4f3021b520c6ed5975daebe 23-Sep-2010 Wei-Ta Chen <weita@google.com> am 6b849e21: Unhide BitmapRegionDecoder.

Merge commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952' into gingerbread-plus-aosp

* commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952':
Unhide BitmapRegionDecoder.
6b849e2123be98eb2a1a25b8abf0b13a279ce952 07-Sep-2010 Wei-Ta Chen <weita@google.com> Unhide BitmapRegionDecoder.

1. Rename LargeBitmap to BitmapRegionDecoder
2. Move the instantiations of BitmapRegionDecoder out of BitmapFactory.
3. Remove the use of MemoryFile in BitmapRegionDecoder, since MemoryFile's API had been modified in master. Otherwise, the change will break the master build.
4. Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.

Most of the modifications, except for (2) and (3), were reviewed in https://android-git.corp.google.com/g/#change,64716 .
However, that change broke the master build due to (3) and was reverted eventually.
So, instead of withdrawing this change and waiting for that change to be checked in again, I merge the two changes into one.

Change-Id: I2202c0fbbbd6d6676bbd9637e690023ea4099c40
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/LargeBitmap.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
76f609118574a76b10cb90bcf061b15546bc38ee 22-Sep-2010 Romain Guy <romainguy@google.com> Merge "Add support for circular gradients to the GL renderer."
ddb80bebb0776e6d852aab6e8bba5d5591847a55 21-Sep-2010 Romain Guy <romainguy@google.com> Add support for circular gradients to the GL renderer.

This change also adds full support for local transformation matrices on
sweep and radial gradients.

Change-Id: Id8773bc0766575190e3f3d51984fc5e57b266c3f
ndroid/graphics/Shader.cpp
399542a7a30aa691c4923961c557fc99960786fd 21-Sep-2010 Romain Guy <romainguy@google.com> Merge "Add support for SweepGradient in the GL renderer."
ee916f14cbd1fe1422c063ce2ef7b185e2bc5c6f 21-Sep-2010 Romain Guy <romainguy@google.com> Add support for SweepGradient in the GL renderer.

Change-Id: I7aa397ed4e34655ead9ba1f5b4ce087665e0f022
ndroid/graphics/Shader.cpp
4e874edf69ce9900eb847629dc4d3616972a3468 16-Sep-2010 Vasu Nori <vnori@google.com> don't compile statement for certain SQL statements

SQL statements such as Create table, Pragma, Begin, Commit, Rollback
etc don't need a compiled statement.

Change-Id: I55f5e4e6cbb41cbe83e592e25ba852fe23e2b39f
ndroid_database_SQLiteStatement.cpp
a977120681904ee6309f3e90f51c6cc43615c007 17-Sep-2010 Romain Guy <romainguy@google.com> Merge "Add support for drawLines(), with anti-aliasing"
759ea80dca64ad652110a129e0d8bf93fea79f61 17-Sep-2010 Romain Guy <romainguy@google.com> Add support for drawLines(), with anti-aliasing

Change-Id: I16c0593c5671490909dec13a85df601e1428a1a6
ndroid_view_GLES20Canvas.cpp
3bf23a7b9f59e0ae38b728461f5f755b0be6883c 17-Sep-2010 Carl Shapiro <cshapiro@google.com> am b0abf3ea: am 4b164c1b: Kill off the remaining GC-specific system properties.

Merge commit 'b0abf3ea47b74296fd790843e789cfd101f58a00'

* commit 'b0abf3ea47b74296fd790843e789cfd101f58a00':
Kill off the remaining GC-specific system properties.
b0abf3ea47b74296fd790843e789cfd101f58a00 17-Sep-2010 Carl Shapiro <cshapiro@google.com> am 4b164c1b: Kill off the remaining GC-specific system properties.

Merge commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c' into gingerbread-plus-aosp

* commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c':
Kill off the remaining GC-specific system properties.
4b164c1bf3592d4d83d93a5de58bb09676f1462c 17-Sep-2010 Carl Shapiro <cshapiro@google.com> Kill off the remaining GC-specific system properties.

Change-Id: Ib09ef132c6fb99b9eb22ecfd75a910c9c0f01e25
ndroidRuntime.cpp
885b1f21d95c5c356d7dbe40a4d033d558c2c772 16-Sep-2010 Romain Guy <romainguy@google.com> Merge "Better error handling in the OpenGL renderer."
b025b9c8b4efefadb01937db61a1f8ee7d2452bf 16-Sep-2010 Romain Guy <romainguy@google.com> Better error handling in the OpenGL renderer.

Add a glGetError() check on every frame
Don't attempt to create textures larger than the maximum size allowed

Change-Id: Iee4afae16089406dbe8bf10fc93b674f1271a0ca
ndroid_view_GLES20Canvas.cpp
606c3de595629dd9988e5d78412419f50bb6ecc2 16-Sep-2010 Wu-cheng Li <wuchengli@google.com> am d63d7474: am 3fd5fa4c: Fix the runtime restart due to name change.

Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f'

* commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f':
Fix the runtime restart due to name change.
d63d74749f068f93ead2f8c37ad3fe025dfd312f 16-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 3fd5fa4c: Fix the runtime restart due to name change.

Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp

* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
Fix the runtime restart due to name change.
3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5 16-Sep-2010 Wu-cheng Li <wuchengli@google.com> Fix the runtime restart due to name change.

bug:3001395
bug:3001399
Change-Id: I73fd1a63fea0807531b01ae2a754b32efffd41b1
ndroid_hardware_Camera.cpp
49478536b6b8b28f33398393bed5e939085af7af 15-Sep-2010 Jeff Brown <jeffbrown@google.com> am 14bc6b5d: am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread

Merge commit '14bc6b5d0677e5c454a67775c852f90389bb4567'

* commit '14bc6b5d0677e5c454a67775c852f90389bb4567':
Replace epoll() with poll() and rename PollLoop to Looper.
77267fc68f2c05ca7cdd1f6b6a9d9b2d4479f8bb 15-Sep-2010 Vasu Nori <vnori@google.com> fix bugs in exception throwing code in native_fillwindow

when exceptions are thrown, they are not being handled correctly
and the end result is some random errors/exceptions.
also change LOGD to LOGD_IF(cond,...) in keeping with Android
standards

Change-Id: Ie7f5e5e4b071ca6b2a6aa899c678c81f9ccd8e71
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteQuery.cpp
14bc6b5d0677e5c454a67775c852f90389bb4567 15-Sep-2010 Jeff Brown <jeffbrown@google.com> am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread

Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp

* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
Replace epoll() with poll() and rename PollLoop to Looper.
09340a4bb99507d9b6bfbfc68a450d4d4f354d73 15-Sep-2010 Jeff Brown <jeffbrown@google.com> Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
707952ecd4b6cae25aabcf51f94d702a65847e9e 14-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Rework Bluetooth tethering networking configuration.

Limit it to 5 for now, and store the iface.

Change-Id: Ia6044b8e8f886dcd587ab0bb57273e0c11b6cd74
ndroid_server_BluetoothEventLoop.cpp
4fe6c3e51be77e35f40872cdbca6c80f8f8b7ecb 14-Sep-2010 Jeff Brown <jeffbrown@google.com> Replace epoll() with poll() and rename PollLoop to Looper.

As part of this change, consolidated and cleaned up the Looper API so
that there are fewer distinctions between the NDK and non-NDK declarations
(no need for two callback types, etc.).

Removed the dependence on specific constants from sys/poll.h such as
POLLIN. Instead looper.h defines events like LOOPER_EVENT_INPUT for
the events that it supports. That should help make any future
under-the-hood implementation changes easier.

Fixed a couple of compiler warnings along the way.

Change-Id: I449a7ec780bf061bdd325452f823673e2b39b6ae
ndroid_app_NativeActivity.cpp
ndroid_hardware_SensorManager.cpp
ndroid_os_MessageQueue.cpp
ndroid_os_MessageQueue.h
ndroid_view_InputQueue.cpp
20c8f47330e7d4f5f191264f0d7ca67f6532adc2 13-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> resolved conflicts for merge of 0522f5e9 to master

Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2
0522f5e9b7dac0dc0229c9ddb07e7e5482846b1a 13-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> am cc5494c9: Out Of Band API for Secure Simple Pairing.

Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp

* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
Out Of Band API for Secure Simple Pairing.
cc5494c9996f809e36539b24e8b6b67683383d29 10-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Out Of Band API for Secure Simple Pairing.

Change-Id: I54ded27ab85d46eef3d2cca84f2394b1ffe88ced
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
bcd3387eed8910c540d92f26fb6680e9e0ce0588 10-Sep-2010 Vasu Nori <vnori@google.com> Merge "Return count of rows in a resultset only once (when startPos = 0)"
b18f27dbf43ee9028a11cafbca23d3fa318e278b 13-Aug-2010 Vasu Nori <vnori@google.com> Return count of rows in a resultset only once (when startPos = 0)

If a query returns 100 rows and say only 10 rows fit in 1MB, then client
receiving the cursor from the ContentProvider needs to paginate.
ContentProvider returns count of total data everytime it returns a page
(= 1MB) of data to the client.
Returning total count causes reading (and skipping unwanted) data
from sqlite.
Instead, it should be sufficient to get total count once
and re-use the count value during the life of the cursor
until a requery is performed on the cursor.
(Count won't change unless data is changed - in which case
the cursor is asked to perform requery anyway. So doing count
once and reusing it should work)
Change-Id: I3520d94524dda07be9bcff56b6fbae5276af1d3b
ndroid_database_SQLiteQuery.cpp
94b19d37066a7739991bc73381f9296abad69265 10-Sep-2010 Joseph Wen <josephwen@google.com> am 94db0238: am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread

Merge commit '94db0238a3b6cba3cbf0e037af74e898a4741204'

* commit '94db0238a3b6cba3cbf0e037af74e898a4741204':
Fix bug in JNI BitmapFactory
94db0238a3b6cba3cbf0e037af74e898a4741204 10-Sep-2010 Joseph Wen <josephwen@google.com> am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread

Merge commit '219eb7ec8403ef9b98125f2b58cc27669ae69712' into gingerbread-plus-aosp

* commit '219eb7ec8403ef9b98125f2b58cc27669ae69712':
Fix bug in JNI BitmapFactory
219eb7ec8403ef9b98125f2b58cc27669ae69712 10-Sep-2010 Joseph Wen <josephwen@google.com> Merge "Fix bug in JNI BitmapFactory" into gingerbread
2dcfbefbbeac406d16ec379c6430dd9ee9fd23a1 10-Sep-2010 Joseph Wen <josephwen@google.com> Fix bug in JNI BitmapFactory

In nativeCreateLargeBitmapFromFileDescriptor() if the file descriptor
can not be rewinded isShareable should be set to false.

Change-Id: I7dd545c9d52d21c226e11b8921e35a1d9bba9515
ndroid/graphics/BitmapFactory.cpp
41506304b86a9c9a605e8b96318e61f0f8f6a235 10-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread

Merge commit '166aeb290be234531ba049b6702f558a02317393' into gingerbread-plus-aosp

* commit '166aeb290be234531ba049b6702f558a02317393':
DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
cf8905620fa0526cd644d5bd145dc7677f6423be 10-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> DO NOT MERGE: Remove Device Bluez-Dbus interface watch.

Change-Id: I6bc04efd1292784bae5fc4786949d9da79e4aa22
ndroid_server_BluetoothEventLoop.cpp
9584a542e345fa18fc62eb0b5947f250226f211d 09-Sep-2010 Romain Guy <romainguy@google.com> Merge "Purge Skia objects from GL caches as needed."
a2341a9f6addcd79723965ec5b1a1c5ae0f8bd65 09-Sep-2010 Romain Guy <romainguy@google.com> Purge Skia objects from GL caches as needed.

Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/Shader.cpp
53e7ae9065e506da2f0337c7c77cf2749d9ee970 09-Sep-2010 Romain Guy <romainguy@google.com> Merge "Fix possible infinite loop when purging textures."
9aaa8269a3e7291aab84d01c3fc9c744d8f2d2f4 09-Sep-2010 Romain Guy <romainguy@google.com> Fix possible infinite loop when purging textures.

Change-Id: Ib05b398ae03e734da2dab0496df416fed4570b1c
ndroid/graphics/Bitmap.cpp
b380c4d7edc158788a85c906900232675c0164ac 08-Sep-2010 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of a05088c1 to master

Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
a05088c18d22f822e78e7b91d60f518dc3dc06fc 08-Sep-2010 Jeff Brown <jeffbrown@google.com> am 85a31767: Add support for secure views.

Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp

* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
Add support for secure views.
85a3176704b5bfbeece9bd928369fbb76eec7dc6 02-Sep-2010 Jeff Brown <jeffbrown@google.com> Add support for secure views.

Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.

Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.

Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
ndroid_view_MotionEvent.cpp
cfa590392660fc4a50dc90c456d1fab69e6e0662 08-Sep-2010 Elliott Hughes <enh@google.com> am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread

Merge commit '664c48e991a70d07646d54125e97f579f3a33be4'

* commit '664c48e991a70d07646d54125e97f579f3a33be4':
Remove dead code: NIOBuffer.
664c48e991a70d07646d54125e97f579f3a33be4 08-Sep-2010 Elliott Hughes <enh@google.com> am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread

Merge commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp

* commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
Remove dead code: NIOBuffer.
4c7d3f28898f4e0d8e9f54537fb92948e650df7f 08-Sep-2010 Elliott Hughes <enh@google.com> Merge "Remove dead code: NIOBuffer." into gingerbread
7b29804ba2b0db1a627b680b3fe2c5036139513b 08-Sep-2010 Wei-Ta Chen <weita@google.com> am 8fc6f8b2: am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread

Merge commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16'

* commit '8fc6f8b2152564cab6ede025644f9bc3ee61ce16':
Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
8fc6f8b2152564cab6ede025644f9bc3ee61ce16 08-Sep-2010 Wei-Ta Chen <weita@google.com> am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread

Merge commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp

* commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49':
Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
340ce75b446f6a6afc12b0582be3fc34ac3a5364 08-Sep-2010 Wei-Ta Chen <weita@google.com> Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."

This reverts commit 50ba3d2c09a9131f3578d271adf2bc8258ca1742.
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/LargeBitmap.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
50cb7dc458e65b75fb69a3a3fed972e7ed913703 08-Sep-2010 Wei-Ta Chen <weita@google.com> am a295a390: am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread

Merge commit 'a295a3908befeb9dd30203c612d95411d68492ed'

* commit 'a295a3908befeb9dd30203c612d95411d68492ed':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
347262622b86410ff8a4ff3530ab3688b6a20b21 08-Sep-2010 Dianne Hackborn <hackbod@google.com> am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread

Merge commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7'

* commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7':
Modify native ALooper to take an explicit ident.
59a5d2d5772f41578c72f48df08c0af918b6519c 08-Sep-2010 Dmitry Shmidt <dimitrysh@google.com> am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread

Merge commit 'd0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp

* commit 'd0f74ae081bac9a9c8f7faf9288305647735d743':
Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
d0f74ae081bac9a9c8f7faf9288305647735d743 08-Sep-2010 Dmitry Shmidt <dimitrysh@google.com> Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
a295a3908befeb9dd30203c612d95411d68492ed 08-Sep-2010 Wei-Ta Chen <weita@google.com> am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread

Merge commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp

* commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628 08-Sep-2010 Wei-Ta Chen <weita@google.com> Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
1907bd2f6cf0ad7358ecc001ef7a134a19d4b67c 08-Sep-2010 Irfan Sheriff <isheriff@google.com> Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE

Bug: 2973101
Change-Id: I874381eeb12bb796382717285750d700e9b181ce
ndroid_net_wifi_Wifi.cpp
a1205f07a6f0c745e8f42f16fe38c06af04143c7 08-Sep-2010 Dianne Hackborn <hackbod@google.com> am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread

Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp

* commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea':
Modify native ALooper to take an explicit ident.
42c03e579aade011b451e2a13ea3f44a2ef0056a 08-Sep-2010 Dianne Hackborn <hackbod@google.com> Modify native ALooper to take an explicit ident.

The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd. This allows
the APIs that had the fd to be a little more sane.

Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
ndroid_app_NativeActivity.cpp
edf7223bc2972b99306e31c5b424c365d9248817 08-Sep-2010 Elliott Hughes <enh@google.com> Remove dead code: NIOBuffer.

Working on speeding up our NIO implementation, I came across this suboptimal
code. Happily, it turns out to be unused.

Bug: 2935622
Change-Id: I07ae6e573d63e439f496d55af215b34598d8258a
ndroid.mk
ndroid/graphics/Graphics.cpp
ndroid/graphics/NIOBuffer.cpp
ndroid/graphics/NIOBuffer.h
49706753163e5da5d2484685ab74aee3e5cf8069 07-Sep-2010 Dianne Hackborn <hackbod@google.com> am b8bcfed5: am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread

Merge commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4'

* commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4':
Add system property to turn off scheduling groups.
422dad0f5069a96c002faf31540bf471a7052585 04-Sep-2010 Vasu Nori <vnori@google.com> android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff

Change-Id: Icf221a8e8d4c281f7719875816835ad7dfe7f3d1
ndroid_database_SQLiteDatabase.cpp
b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4 07-Sep-2010 Dianne Hackborn <hackbod@google.com> am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread

Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp

* commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7':
Add system property to turn off scheduling groups.
84bb52ed614f3a13370c923a8bc2a8b7c6db8d30 04-Sep-2010 Dianne Hackborn <hackbod@google.com> Add system property to turn off scheduling groups.

Do this:

adb shell setprop debug.sys.noschedgroups 1

Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
ndroid_util_Process.cpp
50ba3d2c09a9131f3578d271adf2bc8258ca1742 07-Sep-2010 Wei-Ta Chen <weita@google.com> Rename LargeBitmap to BitmapRegionDecoder for having a better API.

Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because
BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.

Change-Id: I3e60c7fe4abd0289e1384e69a08fd20fe6fb0e10
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapRegionDecoder.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/LargeBitmap.cpp
ndroid/graphics/Utils.cpp
ndroid/graphics/Utils.h
ee923072eb65cbf4f007458450e182a1289c2b7b 03-Sep-2010 Irfan Sheriff <isheriff@google.com> Merge "Add set/get band in WifiNative"
25c9bf2396ceb48fc5cfd5c1dd58aa4d4750d056 02-Sep-2010 Irfan Sheriff <isheriff@google.com> Add set/get band in WifiNative

Add support for set and get band and set the default
to 2GHz for now till we get a fix on issues
with 11A

Change-Id: Icb9bddc353e4bf013bdb8a08d9b4ee3451c282f4
ndroid_net_wifi_Wifi.cpp
33570c8bf68f1e7004c1b37dc52d0565db7d0af8 02-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Use the new signals sent by Bluez for PAN."
c1520ecb41600cd364f03c4c100f927a98924e6a 01-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Use the new signals sent by Bluez for PAN.

Change-Id: I092b5d6b23bacb37a5bc2ca6d8c47bc6a99467ec
ndroid_server_BluetoothEventLoop.cpp
8eb1bfe0f63f12235518d11a236dd11e352e48b2 02-Sep-2010 Vasu Nori <vnori@google.com> Merge "fix isIntegrityCheck() & add a sample impl class and test for DatabaseErrorHandler"
949498de6630c22ee15821bd07ac816b9fe79702 02-Sep-2010 Dianne Hackborn <hackbod@google.com> am 14d56840: am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread

Merge commit '14d56840eeec537c037bebaeaebf1b37f48d8dad'

* commit '14d56840eeec537c037bebaeaebf1b37f48d8dad':
Improve messages when java process is starting.
14d56840eeec537c037bebaeaebf1b37f48d8dad 02-Sep-2010 Dianne Hackborn <hackbod@google.com> am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread

Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp

* commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
Improve messages when java process is starting.
08e60f2a165d23b53f41993374aa074165bb5863 02-Sep-2010 Dianne Hackborn <hackbod@google.com> Improve messages when java process is starting.

Change-Id: I33e401eb240a454845987c10d44e3520e419721b
ndroidRuntime.cpp
1423f51ec5fe2c9bf5fa44866443b2c52db165be 01-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread

Merge commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80'

* commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80':
Don't propagate StrictMode over one-way Binder calls.
ae087369c56a270c33c1c1af5be7d3c5d7f94e80 01-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread

Merge commit '63070856d034a2819a26560bc7f2881e501c78b7' into gingerbread-plus-aosp

* commit '63070856d034a2819a26560bc7f2881e501c78b7':
Don't propagate StrictMode over one-way Binder calls.
0234376503ce421c4b871d5d811c541f5094301a 31-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> Don't propagate StrictMode over one-way Binder calls.

This was causing stack stitching problems where a one-way call with
violations followed by a two-way call without violations was getting
the previous one-way call's violation stack stitched on to the second
caller's stack.

The solution is a little more indirect than I would've liked
(preserving the binder's onTransact flags until enforceInterface) but
was seemingly necessary to work without changing the AIDL compiler.
It should also be sufficiently cheap, since no new calls to
thread-local IPCThreadState lookups were required. The additional
work is just same-thread getter/setters on the existing
IPCThreadState.

Change-Id: I4b6db1d445c56e868e6d0d7be3ba6849f4ef23ae
ndroid_util_Binder.cpp
da8532c6f48b4c10b5e2ccb9e08690341efa1616 31-Aug-2010 Romain Guy <romainguy@google.com> Add hooks for hardware accelerated WebView.

Change-Id: I907cdec8a67594f87749ac46bda85f04af5a2003
ndroid_view_GLES20Canvas.cpp
bfe1dc27944c80dcb81f0eb313987999ecd7b6fa 26-Aug-2010 Vasu Nori <vnori@google.com> fix isIntegrityCheck() & add a sample impl class and test for DatabaseErrorHandler

fixed a bug in SQLiteDatabase.isDatabaseIntegrityOk()
and added a new class to demonstrate use of
android.database.DatabaseErrorHandler
and a bunch of nits

Change-Id: Ia81870853fa3bd84074637f6d823a9fd22b66c7e
ndroid_database_SQLiteQuery.cpp
fc40701c8b170706a87eed9a758bf3307c572b99 28-Aug-2010 Robert Greenwalt <robdroid@android.com> Merge "resolved conflicts for merge of 4ea54f44 to master"
71eaac0880b8a7841c743cd512cbe6bdf8996b7b 28-Aug-2010 Gilles Debunne <debunne@google.com> am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbread

Merge commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85'

* commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85':
Broken build. Missing ;
a16fb779d5bd9b25d81d9981cc23bfc58c6bb9cc 28-Aug-2010 Gilles Debunne <debunne@google.com> am 084dd872: am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread

Merge commit '084dd872b1bf9f7de87554d40d89df1f30b11c45'

* commit '084dd872b1bf9f7de87554d40d89df1f30b11c45':
Fix for 512 limit in assetManager.list
95464c9aa063d2e36a0385a60edd6ee519ed2d85 27-Aug-2010 Gilles Debunne <debunne@google.com> am 445ab76c: Merge "Broken build. Missing ;" into gingerbread

Merge commit '445ab76c49779998543bb78881f5d9f8ae81e598' into gingerbread-plus-aosp

* commit '445ab76c49779998543bb78881f5d9f8ae81e598':
Broken build. Missing ;
0db187a3e62074af6a22802bded52a921f69e7df 27-Aug-2010 Gilles Debunne <debunne@google.com> Broken build. Missing ;

Change-Id: Ic266e491a73fb3df00e77111a4ad9f270741c28b
ndroid_util_AssetManager.cpp
585ac0fc8dde3fe35ec4c71c8f215f2c84139b8b 27-Aug-2010 Robert Greenwalt <robdroid@android.com> resolved conflicts for merge of 4ea54f44 to master

Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56
ndroid_net_NetUtils.cpp
084dd872b1bf9f7de87554d40d89df1f30b11c45 27-Aug-2010 Gilles Debunne <debunne@google.com> am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread

Merge commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1' into gingerbread-plus-aosp

* commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1':
Fix for 512 limit in assetManager.list
4d4040b7b3c46ea29a42878c14b325f09f0029ad 27-Aug-2010 Gilles Debunne <debunne@google.com> Fix for 512 limit in assetManager.list

Also replaced all doThrow by jniThrow.

OutOfMemory after string creation were removed: should have been thrown before.

Bug http://b/issue?id=2949164

Change-Id: Idea8e27fdedeb43e3976776c477766e4dcdebcf8
ndroid_util_AssetManager.cpp
b21b62327c10e92baf1a88e77f1c6d5576a17d62 26-Aug-2010 Robert Greenwalt <robdroid@android.com> resolved conflicts for merge of b998f311 to gingerbread-plus-aosp

Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
78448edcdddaff98cf738a4ae9663917d0397951 25-Aug-2010 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of 50d35946 to master

Change-Id: Ia8c3312d626952c378fc4e7fec1d46119e2ccf42
171ea89fb99385146e159ef75849a87c49ffee76 25-Aug-2010 Brian Carlstrom <bdc@google.com> Update AndroidRuntime with dalvik-dev changes

This change is the result of three cherry-picks:

- Add dalvik.vm.gc.preverify dalvik.vm.gc.postverify properties.
git cherry-pick --no-commit 0ef82fcf

- Add the property dalvik.vm.gc.verifycardtable to set the -Xgc:-Xgc:verifycardtable option for the vm.
git cherry-pick --no-commit 8b4faf54

- Eliminate short JIT debugging properties
git cherry-pick --no-commit 57a673fc3db9d84908467ae6d245fd60d4637b2f

Change-Id: I5f8002ed1e431344570add02f58e2641c8fae549
ndroidRuntime.cpp
a84e02ce3cc392ccf23bbe89cdfbef650047ffe7 25-Aug-2010 Romain Guy <romainguy@google.com> Merge "Use only one GL context per process, share chaches."
fb8b763f762ae21923c58d64caa729b012f40e05 24-Aug-2010 Romain Guy <romainguy@google.com> Use only one GL context per process, share chaches.

Change-Id: Ieabaa25338d2f4b8d4fd90e7401ad6e7452eae11
ndroid_view_GLES20Canvas.cpp
bb2c2c14edd3a1315111803bf46ffd4fecc5a811 23-Aug-2010 Chia-chi Yeh <chiachi@android.com> am 3a91abcb: am d3aaad0e: Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread

Merge commit '3a91abcb4cd06751009c155bfdce6c0a15a704df'

* commit '3a91abcb4cd06751009c155bfdce6c0a15a704df':
Use getMinFrameCount() instead of querying AudioSystem directly.
e49564e0f710ba4a1405cfdfde068cb776ee474e 21-Aug-2010 Kenny Root <kroot@google.com> am 821afa9a: am 54d41379: Merge "Add OBB flags to support overlays" into gingerbread

Merge commit '821afa9aec8d3a4ffd2e72ce797d8097eaf13973'

* commit '821afa9aec8d3a4ffd2e72ce797d8097eaf13973':
Add OBB flags to support overlays
ce53603a4fdf07df8b6d993e1332a28321b5593b 21-Aug-2010 Wei-Ta Chen <weita@google.com> am 9f7257f0: am 8d124f70: Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread

Merge commit '9f7257f0a14cd17d8b55bc3bd1584dac2f9dd1b2'

* commit '9f7257f0a14cd17d8b55bc3bd1584dac2f9dd1b2':
Fix a bug, where one thread is using JNIEnv associated with another thread.
d3aaad0e2a30030db49ddc1a1cdd40011446938c 20-Aug-2010 Chia-chi Yeh <chiachi@android.com> Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread
18ef37258d897928c68b89535a93b99d8a817d3c 20-Aug-2010 Romain Guy <romainguy@google.com> DO NOT MERGE. Fix the build.

Change-Id: I3322faa948af015f7d8df31b9a4c281f5311f067
ndroid/graphics/BitmapFactory.cpp
4f0a8df9fe70b44e82eca40263b11e9331f38939 20-Aug-2010 Romain Guy <romainguy@google.com> Fix the build.

Change-Id: I71e77cb3c124b31b81d952dc3897ebc414a1f701
ndroid/graphics/BitmapFactory.cpp
288471d8a57e1c318742cbfc28697877436fdb87 19-Aug-2010 Romain Guy <romainguy@google.com> DO NOT MERGE. Load assets in place instead of deferring until draw.

Before this change, all framework assets would be decoded at drawing time
outside of zygote. This was forcing all apps to re-decode the assets and
zygote to keep an in-memory copy of each asset. This behavior is now
opt-in by setting the inPurgeable flag on BitmapFactory.Options.

Change-Id: Ief823139163d8071b8ee1267746622faf52eb8ec
ndroid/graphics/BitmapFactory.cpp
207b3ab604bcbe47fa55f26f358cde60cf8a784d 19-Aug-2010 Romain Guy <romainguy@google.com> Load assets in place instead of deferring until draw.

Before this change, all framework assets would be decoded at drawing time
outside of zygote. This was forcing all apps to re-decode the assets and
zygote to keep an in-memory copy of each asset. This behavior is now
opt-in by setting the inPurgeable flag on BitmapFactory.Options.

Change-Id: Ic703f57adb26b2a701ecff0a653d35a93e26d47c
ndroid/graphics/BitmapFactory.cpp
9bc709d46e1165ca0c9a02bd970767c401b990e5 10-Aug-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> Add an API to request route to an IPv6 host.

Add API to create a route to an IPv6 host through a particular
interface.

Change-Id: I7649051e94832576e02b5f5ad17abe093d21d48e
ndroid_net_NetUtils.cpp
54d41379357d1d800d0a7bd7c5dc56111710482a 19-Aug-2010 Kenny Root <kroot@google.com> Merge "Add OBB flags to support overlays" into gingerbread
c3308074cd6f06bbb35c1999b5260f938742a9e7 19-Aug-2010 Chia-chi Yeh <chiachi@android.com> Use getMinFrameCount() instead of querying AudioSystem directly.

Change-Id: I6c4d2f1778703c1fd1ba5610c46e77c857418bff
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
291303ba3dbb3a0173bcc82ded595ca75df7b50e 18-Aug-2010 Wei-Ta Chen <weita@google.com> Fix a bug, where one thread is using JNIEnv associated with another thread.

We see abort messages like this when using JavaPixelAllocator and JavaMemoryUsageReporter.
W/dalvikvm( 680): JNI WARNING: threadid=2 using env from threadid=10
W/dalvikvm( 680): in Landroid/graphics/LargeBitmap;.nativeClean (I)V (CallVoidMethodV)

To fix it, we keep JavaVM, rather than JNIEnv, in JavaPixelAllocator and JavaMemoryUsageReporter,
because JavaVM allows us to get the JNIEnv corresponds to the current thread.

Change-Id: Ibd4b394a53dd3fdccc5a442eeb0dedf836479575
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
6fdd0c6274c81b337ad35b70480f881daf7354c3 11-Aug-2010 Danica Chang <danicachang@google.com> bluetooth tethering

Change-Id: Id6d5fb1922facc7013abc29214d3e1141995b767
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
671cc0ec30dfd73e17c3f3bd0170341c06ac945e 18-Aug-2010 Jeff Brown <jeffbrown@google.com> am 8fd80e92: am 72ce4235: Merge "Fix possible race conditions during channel unregistration." into gingerbread

Merge commit '8fd80e924a2f40f6a785f834914f8a6f18a3aa9d'

* commit '8fd80e924a2f40f6a785f834914f8a6f18a3aa9d':
Fix possible race conditions during channel unregistration.
02ca31fbae9f35dd30f79de6927fae11b549391a 12-Aug-2010 Kenny Root <kroot@google.com> Add OBB flags to support overlays

* Add flags field in OBB footer to support overlays.

* Remove unused 'crypto' and 'filesystem' fields in obbtool (could
later be supported in the "flags" field of the OBB footer).

* Add notes to document OBB classes before shipping.

Change-Id: I386b43c32c5edef55210acb5d3322639c08010ba
ndroid_content_res_ObbScanner.cpp
a006b47298539d89dc7a06b54c070cb3e986352a 14-Apr-2010 Bjorn Bringert <bringert@android.com> New API and implementation of DB and memory-backed FDs

This depends on a kernel patch that implements read(2)
in the ashmem driver.

Bug http://b/issue?id=2595601

Change-Id: Ie3b10aa471aada21812b35e63954c1b2f0a7b042
ndroid_database_SQLiteStatement.cpp
72ce42352c1c229e05d910b4176f3cddb608e814 18-Aug-2010 Jeff Brown <jeffbrown@google.com> Merge "Fix possible race conditions during channel unregistration." into gingerbread
2cbecea4c9627d95377fc3e3b8a319116cee7feb 18-Aug-2010 Jeff Brown <jeffbrown@google.com> Fix possible race conditions during channel unregistration.

Previously, the input dispatcher assumed that the input channel's
receive pipe file descriptor was a sufficiently unique identifier for
looking up input channels in its various tables. However, it can happen
that an input channel is disposed and then a new input channel is
immediately created that reuses the same file descriptor. Ordinarily
this is not a problem, however there is a small opportunity for a race
to arise in InputQueue.

When InputQueue receives an input event from the dispatcher, it
generates a finishedToken that encodes the channel's receive pipe fd,
and a sequence number. The finishedToken is used by the ViewRoot
as a handle for the event so that it can tell the InputQueue when
the event has finished being processed.

Here is the race:

1. InputQueue receives an input event, assigns a new finishedToken.
2. ViewRoot begins processing the input event.
3. During processing, ViewRoot unregisters the InputChannel.
4. A new InputChannel is created and is registered with the Input Queue.
This InputChannel happens to have the same receive pipe fd as
the one previously registered.
5. ViewRoot tells the InputQueue that it has finished processing the
input event, passing along the original finishedToken.
6. InputQueue throws an exception because the finishedToken's receive
pipe fd is registered but the sequence number is incorrect so it
assumes that the client has called finish spuriously.

The fix is to include a unique connection id within the finishedToken so
that the InputQueue can accurately confirm that the token belongs to
the currently registered InputChannel rather than to an old one that
happened to have the same receive pipe fd. When it notices this, it
ignores the spurious finish.

I've also made a couple of other small changes to avoid similar races
elsewhere.

This patch set also includes a fix to synthesize a finished signal
when the input channel is unregistered on the client side to
help keep the server and client in sync.

Bug: 2834068
Change-Id: I1de34a36249ab74c359c2c67a57e333543400f7b
ndroid_view_InputQueue.cpp
8c11e952305327183db9f7be719e4c94fde15a7c 13-Aug-2010 Irfan Sheriff <isheriff@google.com> DO NOT MERGE WifiLock extensions for high performance mode

Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: I8b33d307f3d569bc92ba2139b9ed224ffc147547
ndroid_net_wifi_Wifi.cpp
1b10d3d23512f9f9a091e1f4c27bb3dc47806f6c 17-Aug-2010 Joseph Wen <josephwen@google.com> am 81dcea60: am f1f48bc7: Do JPEG tile-based decoding.

Merge commit '81dcea6093dfcdadd52982505249a5eacf47a81b'

* commit '81dcea6093dfcdadd52982505249a5eacf47a81b':
Do JPEG tile-based decoding.
81dcea6093dfcdadd52982505249a5eacf47a81b 17-Aug-2010 Joseph Wen <josephwen@google.com> am f1f48bc7: Do JPEG tile-based decoding.

Merge commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375' into gingerbread-plus-aosp

* commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375':
Do JPEG tile-based decoding.
f1f48bc7f200f54c76b22d845d8ba8419879b375 19-Jul-2010 Joseph Wen <josephwen@google.com> Do JPEG tile-based decoding.

Change-Id: I5c1b4ac3c02eb4350ef0ba9a7877b22cfd730cfb
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/AutoDecodeCancel.cpp
ndroid/graphics/AutoDecodeCancel.h
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/BitmapFactory.h
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.h
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/LargeBitmap.cpp
1e45aae5de003657e5d18f74d34998f5de5db5b7 14-Aug-2010 Romain Guy <romainguy@google.com> Add drop shadows.

Change-Id: Ic6a72409d4785968d1fbdff229f17ee5c00b240b
ndroid/graphics/Paint.cpp
ndroid_view_GLES20Canvas.cpp
876247784ee6202066abdefd8366f2e09e681fab 07-Apr-2010 Mikael Kanstrup <mikael.kanstrup@sonyericsson.com> DO NOT MERGE WLAN: Reset power save mode to startup value after DHCP response.

When the driver was configured to run with power save mode disabled the
power save mode incorrectly got reverted back to AUTO mode right after
DHCP response. The power save mode value is now saved so that the device
properly reverts back to a previous mode after DHCP response.

Change-Id: Ie68cd107872d233bf422e24130a1eb9f6432db91
Bug: 2834260
ndroid_net_wifi_Wifi.cpp
7b6d0d99b6904b511996267efae215fe9cb5e98f 11-Aug-2010 Dianne Hackborn <hackbod@google.com> am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread

Merge commit '679ac09a5c22175354f3a04b28456b323839530e'

* commit '679ac09a5c22175354f3a04b28456b323839530e':
More native work.
679ac09a5c22175354f3a04b28456b323839530e 11-Aug-2010 Dianne Hackborn <hackbod@google.com> am a5ae50cd: Merge "More native work." into gingerbread

Merge commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp

* commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb':
More native work.
08d5b8fad8d46ccb64db2fdcb4d66972ec87bf48 04-Aug-2010 Dianne Hackborn <hackbod@google.com> More native work.

Implement save/restore of state, and add native APIs for
configuration information.

Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
ndroid.mk
ndroidRuntime.cpp
ndroid_app_NativeActivity.cpp
ndroid_content_res_Configuration.cpp
48daa54d31fc59ec969dcff65eb3cbb0ce879a8d 11-Aug-2010 Romain Guy <romainguy@google.com> Add extra blending modes.

This change adds the following blending modes for shaders and color filters:
Add
Multiply
Screen
Overlay
Darken
Lighten

Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
ndroid/graphics/Shader.cpp
a48a1a87ba17f20f7006eaab21dcedf86c015c13 10-Aug-2010 Romain Guy <romainguy@google.com> Fast text selection drawing.

Change-Id: I93fb1312b47bc05345defa9b6cfe47c0658bb329
ndroid_view_GLES20Canvas.cpp
61c8c9c5b2006d18e9310b6521c65b36ffe75ce4 10-Aug-2010 Romain Guy <romainguy@google.com> Fix tons of bugs and add new text rendering support.

Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
ndroid/graphics/Shader.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid_view_GLES20Canvas.cpp
23fdaf6fb62a9b5154b2508916a21c678462c5d0 06-Aug-2010 Dianne Hackborn <hackbod@google.com> Add new ContentProvider for doing conversions to data streams.

This introduces basic infrastructure that should allow content
providers holding complex data to perform on-demand conversion
of their data to streams of various types. It is achieved through
two new content provider APIs, one to interrogate the possible
stream MIME types the provider can return, and the other to
request a stream of data in a particular MIME type.

Because implementations of this will often need to do on-demand
data conversion, there is also a utility intoduced in ContentProvider
for subclasses to easily run a function to write data into a
pipe that is read by the client.

This feature is mostly intended for cut and paste and drag and
drop, as the complex data interchange allowing the source and
destination to negotiate data types and copy (possible large)
data between them. However because it is fundamental facility
of ContentProvider, it can be used in other places, such as for
more advanced GET_CONTENT data exchanges.

An example implementation of this would be in ContactsProvider,
which can now provider a data stream when a client opens certain
pieces of it data, to return data as flat text, a vcard, or other
format.

Change-Id: I58627ea4ed359aa7cf2c66274adb18306c209cb2
ndroid_os_ParcelFileDescriptor.cpp
163935113919a184122b8b3bd672ef08c8df65dc 08-Aug-2010 Romain Guy <romainguy@android.com> Make libhwui entirely optional.

The makefile variable USE_OPENGL_RENDERER must be set to true to compile
libhwui and the related code in the JNI layer.

This change also removes obsolete APIs from Canvas that must not be used
and would be confusing if left in. These APIs were remnants of our first
attempt at an OpenGL renderer for the view hierarchy and had not been
taken out before Android 1.0 was released.

Change-Id: I2475ff1307212bab26c926724f3c508681c7dae1
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/Shader.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_HardwareRenderer.cpp
b83f9c3027e7f9e5ef55e95bd831b77560320d99 06-Aug-2010 Mike Lockwood <lockwood@android.com> Merge "Set umask of system server to 0077"
90960e87ecae696f73ae18e46c2f003fc3f592cc 06-Aug-2010 Mike Lockwood <lockwood@android.com> Set umask of system server to 0077

This matches the previous behavior of java.io.File file and directory creation.

BUG: 2898660

Change-Id: Ie8978a3fc44abfd22f8046e66742e715354220a8
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_os_FileUtils.cpp
a8bc19901c4a48ad821f6bdd94ebbf7d145d573d 06-Aug-2010 Carl Shapiro <cshapiro@google.com> Remove overwritefree property. The underlying flag no longer exists.

Change-Id: Iecd1710887a7b16536cdbd52846952cc72cc0727
ndroidRuntime.cpp
8cc44cb6696995d8387226cd131fc22386aa4f7f 06-Aug-2010 Romain Guy <romainguy@google.com> Merge "Add support for paths."
7fbcc0492fca03857e3c45064f4aa040af817d55 05-Aug-2010 Romain Guy <romainguy@google.com> Add support for paths.

Rendering is implementing by rasterizing the paths into A8 textures.
This cna be extremely inefficient if the path changes often.

Change-Id: I609343f304ae38e0d319359403ee73b9b5b3c93a
ndroid_view_GLES20Canvas.cpp
c5bb8d8de5297c610c0c75897e025cbd6aec8dda 05-Aug-2010 Mike Lockwood <lockwood@android.com> Clean up error handling in custom sqlite function dispatching

Change-Id: I54036bb5defd8c887a9b878e012f0b1d4afe9966
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_database_SQLiteDatabase.cpp
56b6fcaa7a264edfb351eeb3b10bfb2aa7acd39b 05-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> am c4ed734b: am 737998f5: Merge "Add Blocked Device property." into gingerbread

Merge commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c'

* commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c':
Add Blocked Device property.
1b7e4d5adcc2737bc11bfbf42a88a02d6df984e0 05-Aug-2010 Brian Carlstrom <bdc@google.com> am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread

Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
Tracking merge of dalvik-dev to gingerbread
3c7c351a6217ac48b741740167c201a679a0ca65 05-Aug-2010 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
ndroidRuntime.cpp
c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c 04-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> am 737998f5: Merge "Add Blocked Device property." into gingerbread

Merge commit '737998f5955aa14f1b21967f6f559bca60cb1844' into gingerbread-plus-aosp

* commit '737998f5955aa14f1b21967f6f559bca60cb1844':
Add Blocked Device property.
6eb300e650a0e3ca0e802203e1718ab5abbb7ce9 04-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> Add Blocked Device property.

Change-Id: I76b3c361af95ac9d5fb43178965763f873c0fbf9
ndroid_bluetooth_common.cpp
db1938e0e6ef816e228c815adccebd5cb05f2aa8 03-Aug-2010 Romain Guy <romainguy@google.com> Add support for ColorFilters.

Color filters are fully supported and can be used with shaders.

Change-Id: Id90ccf1c81cb462f2431f366f3f8f710d7971e04
ndroid/graphics/ColorFilter.cpp
ndroid_view_GLES20Canvas.cpp
06f96e2652e4855b6520ad9dd70583677605b79a 31-Jul-2010 Romain Guy <romainguy@google.com> Refactor Skia shaders handling.

With this change, Skia shaders can easily be applied to any mesh. This change also
supports ComposeShader. For instance, this can be used to blend a gradient and a
bitmap togehter and paint a string of text with the result.

Change-Id: I701c2f9cf7f89b2ff58005e8a1d0d80ccf4a4aea
ndroid/graphics/Shader.cpp
ndroid_view_GLES20Canvas.cpp
e4d81f25bd4dc1a5c909b56ab56a56406290da30 15-Jul-2010 Andy McFadden <fadden@android.com> Add support for dalvik.vm.extra-opts property.

The goal here is to avoid the dalvik.vm.* property explosion by
having a single property that takes an arbitrary collection of Dalvik
command-line options. This is intended for testing of various
configurations by the Dalvik team, not industrial use.

Options should be separated by spaces, e.g.

adb shell setprop dalvik.vm.extra-opts "-showversion -Xmx4m"

will print the version banner and set the heap max to 4MB, which won't
get you very far.

The extra-opts options will appear last, which allows them to override
values set earlier (like the heap max).

Bug 2838629.

(cherry-pick from dalvik-dev branch)

Change-Id: Ibcbb1b62367cf2152798583e8722ef7e461ad19a
ndroidRuntime.cpp
ce49d03aa40123a086d6017052873bed83835298 30-Jul-2010 Mathias Agopian <mathias@google.com> resolved conflicts for merge of 02513855 to master

Change-Id: Ie33d57798d3d5b800edde753dac86de062bc270c
02513855530b80dd554b13852db75f3adde2c9f4 30-Jul-2010 Mathias Agopian <mathias@google.com> am 050b5624: Added SensorManager.getMinDelay()

Merge commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9' into gingerbread-plus-aosp

* commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9':
Added SensorManager.getMinDelay()
050b56244ff46d43e4886018d7cd20f0b1dc02b9 30-Jul-2010 Mathias Agopian <mathias@google.com> Added SensorManager.getMinDelay()

Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).

Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.

Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
ndroid_hardware_SensorManager.cpp
dea9713387460c560b67106ab913f686f7d16af2 29-Jul-2010 Vasu Nori <vnori@google.com> expose more sqlite errors as exceptions

this should help developers figure out what various sqlite errors mean
and possibly programmatically handle them.

Change-Id: I5c313be1b17b6c5171929bf04e19a16ea92bb357
ndroid_database_SQLiteDatabase.cpp
84fabc0ce3d7c3da73903380d0d6141d60fa4448 27-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> am 245cb784: am 84c924a6: Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread

Merge commit '245cb7846c82f7c0840e13f0b994d356846b1678'

* commit '245cb7846c82f7c0840e13f0b994d356846b1678':
Replace several IPCThreadState::get() lookups with one.
245cb7846c82f7c0840e13f0b994d356846b1678 27-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> am 84c924a6: Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread

Merge commit '84c924a6c53cb63ca018013c9fda0077413d0005' into gingerbread-plus-aosp

* commit '84c924a6c53cb63ca018013c9fda0077413d0005':
Replace several IPCThreadState::get() lookups with one.
7bcad8a315f12bd6251a998781efac7b11c2ca84 27-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> Replace several IPCThreadState::get() lookups with one.

Also, make StrictMode's ThreadLocal final.

Change-Id: I08d400ed254fa67bb7a3dae1227f205a54c00df0
ndroid_util_Binder.cpp
a2a1b911a31dd94ee75e94845f762b91f1db1368 07-Jun-2010 Irfan Sheriff <isheriff@google.com> Refactor WifiStateTracker

Implement WifiStateTracker as a HSM.

Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb
ndroid_net_wifi_Wifi.cpp
fb16cbd9b2e86d6878d4bff820422bc09c8938de 26-Jul-2010 Vasu Nori <vnori@google.com> add new API in SQLiteStatement to deprecate another.

1. SQLIteStatement.executeUpdateDelete() replaces execute() - and returns the
number of rows changed.
2. let SQLiteDatabase.execSQL() call the above new API - which
means all CRUD statements by execSQL() are stored in prepared statement cache.
3. remove the following from SQLiteDatabase
lastrowId
lastchangecount()
native_execSQL()

Change-Id: I4e93a09dc381f425c3ae6ccc331a7bf227491e22
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteStatement.cpp
d24ac17121b23efb17219f355e5dd38f933352ff 26-Jul-2010 Gilles Debunne <debunne@google.com> am 8cd48574: Fixed bug in BitmapFactory.decodeStream

Merge commit '8cd48574a755bea86243e9f9eabaee341ecf9c60' into gingerbread-plus-aosp

* commit '8cd48574a755bea86243e9f9eabaee341ecf9c60':
Fixed bug in BitmapFactory.decodeStream
9226298891119acff6b5e8b65fb7074fb99dc0c0 26-Jul-2010 Romain Guy <romainguy@google.com> Fix text corruption when rendering RTL enabled text.

Change-Id: I5450fd9cad1c5a66875affdbcd34308aea4c36ac
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid_view_GLES20Canvas.cpp
e8e62a4a032a80409114a37908b5f18ab0080848 24-Jul-2010 Romain Guy <romainguy@google.com> Add text alignment support to drawText().

This change also integrates better support for RTL text.

Change-Id: I6da8f5cf5dc28ca7cf1b22e27b0d853c919e8481
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
ndroid_view_GLES20Canvas.cpp
8cd48574a755bea86243e9f9eabaee341ecf9c60 16-Jul-2010 Gilles Debunne <debunne@google.com> Fixed bug in BitmapFactory.decodeStream

Downloading images over a slow connection could result in errors and
null images.

The JavaInputStreamAdaptor::do_skip method was correctly called in a
loop (to handle the EOF case using read()), but the amount that was
skipped at each time was not decreased by the amount already skipped.

Bug http://code.google.com/p/android/issues/detail?id=6066

Cherry picked from master CL57808

Change-Id: Ie6856898b21ba31de1209e1f995b4ae784c919b9
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
236d4ee896c831183ca8b873406e3fe7b5fa3058 22-Jul-2010 Romain Guy <romainguy@google.com> Merge "Add text rendering."
694b519ac647fe998fd396fe0784cc8e179aadc4 22-Jul-2010 Romain Guy <romainguy@google.com> Add text rendering.

Change-Id: Ibe5a9fa844d531b31b55e43de403a98d49f659b9
ndroid_view_GLES20Canvas.cpp
5c49ec30b57a18ac022601473c9524f40554c9cf 22-Jul-2010 Mathias Agopian <mathias@google.com> am 1f2ec407: am 23e8de26: propagate sensor event rate properly

Merge commit '1f2ec4070aa9c999d41dc50a892a896e894c5710'

* commit '1f2ec4070aa9c999d41dc50a892a896e894c5710':
propagate sensor event rate properly
50558b956157dad980441bf4fb44931ce834e36b 22-Jul-2010 Mathias Agopian <mathias@google.com> resolved conflicts for merge of bc54e63c to master

Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
1f2ec4070aa9c999d41dc50a892a896e894c5710 22-Jul-2010 Mathias Agopian <mathias@google.com> am 23e8de26: propagate sensor event rate properly

Merge commit '23e8de26b7b3d04daf08526f314c2fdd2f8fee65' into gingerbread-plus-aosp

* commit '23e8de26b7b3d04daf08526f314c2fdd2f8fee65':
propagate sensor event rate properly
bc54e63c84a517f0dca88ba900ff2b56719f685b 22-Jul-2010 Mathias Agopian <mathias@google.com> am e4764521: Merge "new SensorService" into gingerbread

Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp

* commit 'e4764521353e898554931a557460fc49209fb0a9':
new SensorService
23e8de26b7b3d04daf08526f314c2fdd2f8fee65 22-Jul-2010 Mathias Agopian <mathias@google.com> propagate sensor event rate properly

Change-Id: I32e67d30e4295285a6827956cc8161b2025d70bc
ndroid_hardware_SensorManager.cpp
e4764521353e898554931a557460fc49209fb0a9 22-Jul-2010 Mathias Agopian <mathias@google.com> Merge "new SensorService" into gingerbread
679fc4e9850489ce46a378ce3c22bc036dfa6409 21-Jul-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Add HID to the state machine and add native call backs."
de07503a382e81ba82f4cd4dee81ff2fbf3295bc 20-Jul-2010 Jaikumar Ganesh <jaikumar@google.com> Add HID to the state machine and add native call backs.

Change-Id: Ib9f3e476d4176bc04e23e7674dc54aa5a6417308
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
0119ba5bd3335fe026927eeb65de535a7bd8c838 21-Jul-2010 Eric Laurent <elaurent@google.com> am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.

Merge commit '34161132030254bac7dd64c9713832e2f961a061'

* commit '34161132030254bac7dd64c9713832e2f961a061':
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
34161132030254bac7dd64c9713832e2f961a061 21-Jul-2010 Eric Laurent <elaurent@google.com> am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.

Merge commit '7070b36549d511d6627538c73dfbab23fbae5b43' into gingerbread-plus-aosp

* commit '7070b36549d511d6627538c73dfbab23fbae5b43':
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
7070b36549d511d6627538c73dfbab23fbae5b43 16-Jul-2010 Eric Laurent <elaurent@google.com> Added support for auxiliary audio effects to AudioTrack and MediaPlayer.

Added methods to AudioTrack and MediaPlayer java classes to enable use of
auxiliary audio effects. The effect can be attached and detached by specifying its
ID and the send level controlled.

Change-Id: Ie74ff54a453096a742688476f612ce355543b6f3
ndroid_media_AudioTrack.cpp
2a0a47892db7025f1dafae24f72172572de82475 21-Jul-2010 Romain Guy <romainguy@google.com> Merge "Add preliminary support for text rendering."
a1db574036c9bc2d397b69f8200594027e1fff16 20-Jul-2010 Romain Guy <romainguy@google.com> Add preliminary support for text rendering.

Change-Id: I547eb631dbda24d13960d54b4144fb8908fd8a49
ndroid/graphics/Typeface.cpp
ndroid_view_GLES20Canvas.cpp
ndroid_view_HardwareRenderer.cpp
c242a5aa93466e7879036ff21652cf7040c932ea 20-Jul-2010 Danica Chang <danicachang@google.com> delete ScoSocket

Change-Id: Ib941ca2d817e0a788638a5e72f1eb2e1fc4739e9
ndroidRuntime.cpp
bcfdb32839d1fa4c1c793913d60574674910c042 20-Jul-2010 Danica Chang <danicachang@google.com> Merge "deleted android_bluetooth_ScoSocket.cpp from makefile"
72a6b1c389606761c559bb0bd740220b140d4447 20-Jul-2010 Danica Chang <danicachang@google.com> deleted android_bluetooth_ScoSocket.cpp from makefile

Change-Id: I40d107c9efa415de29977fa0998a746d9c24240e
ndroid.mk
eaeffac5fc8244d8fe03de786baa3ca76f5553b8 20-Jul-2010 Danica Chang <danicachang@google.com> Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp"
c0ac193b9415680f0a69e20a3f5f22d16f8053be 20-Jul-2010 Romain Guy <romainguy@google.com> Add support for linear gradients.

Change-Id: Id15329da065045b3f06fdaed615f33cd57608496
ndroid_view_GLES20Canvas.cpp
1bf797857e025e8a71db86fb9e79765a767ec1eb 15-Jul-2010 Mathias Agopian <mathias@google.com> new SensorService

remove old sensor service and implement SensorManager
on top of the new (native) SensorManger API.

Change-Id: Iddb77d498755da3e11646473a44d651f12f40281
ndroid.mk
ndroid_hardware_SensorManager.cpp
b6a45e39931e0094edb18534815c1a182261e8c8 17-Jul-2010 Romain Guy <romainguy@android.com> Merge "Add program for linear gradient."
f9764a4f532561f6e2e985ff3b25112f1132ce44 17-Jul-2010 Romain Guy <romainguy@android.com> Add program for linear gradient.

This change adds a new DrawLinearGradientProgram class to enable the drawing
of linear gradients. Two new vertex and fragment shaders are introduced,
based on DrawTextureProgram's shaders.

Change-Id: I885afc076bb6cef8cd3962ae21a086fa6a03bf96
ndroid_view_GLES20Canvas.cpp
ea2604d966dfc62f50922a516caaa9cc411d9c64 17-Jul-2010 Romain Guy <romainguy@android.com> Merge "Add plumbing to support gradients in OpenGL renderer."
7fac2e18339f765320d759e8d4c090f92431959e 17-Jul-2010 Romain Guy <romainguy@android.com> Add plumbing to support gradients in OpenGL renderer.

The LinearGradient class keeps a copy of the various parameters that
define the gradient. The copies are native arrays to avoid copying
Java arrays on every draw call. The gradient code path is implemented
until OpenGLRenderer::drawRect() (see TODO.) The actual gradient
implementation will be added in a latter change.

Change-Id: I9300d250ef5e2e9c2e097c3116ee71dfc9d752d8
ndroid/graphics/Shader.cpp
ndroid_view_GLES20Canvas.cpp
24bf20cf1ecd0f336a28c52f3b42c392aa6ea970 17-Jul-2010 Jeff Brown <jeffbrown@google.com> am e2fb11b9: am ace999b0: Ignore attempts to finish events on unregistered channels.

Merge commit 'e2fb11b9b02518126ace1a998ae7f824fc76068a'

* commit 'e2fb11b9b02518126ace1a998ae7f824fc76068a':
Ignore attempts to finish events on unregistered channels.
691a9fcb2bc1b78f1f1048c3d7a39143be9dcdd7 17-Jul-2010 Jamie Gennis <jgennis@google.com> am 04b95313: am c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread

Merge commit '04b953132edb5482f0aa6d992f89e7016961528c'

* commit '04b953132edb5482f0aa6d992f89e7016961528c':
Re-use existing Surface objects when reading them from parcels.
e2fb11b9b02518126ace1a998ae7f824fc76068a 17-Jul-2010 Jeff Brown <jeffbrown@google.com> am ace999b0: Ignore attempts to finish events on unregistered channels.

Merge commit 'ace999b096739d376d4845c0ba94599197ff8477' into gingerbread-plus-aosp

* commit 'ace999b096739d376d4845c0ba94599197ff8477':
Ignore attempts to finish events on unregistered channels.
ace999b096739d376d4845c0ba94599197ff8477 17-Jul-2010 Jeff Brown <jeffbrown@google.com> Ignore attempts to finish events on unregistered channels.

This is a common race that happens during application shutdown where the window
may be removed before the input event is finished. The input dispatcher
already recovers from this condition gracefully so there are no benefits to
throwing an exception on the client side.

Bug: 2834068

Change-Id: I53dcc3230464d7f528ac8a1cc9f01b5bb642f428
ndroid_view_InputQueue.cpp
04b953132edb5482f0aa6d992f89e7016961528c 17-Jul-2010 Jamie Gennis <jgennis@google.com> am c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread

Merge commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82' into gingerbread-plus-aosp

* commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82':
Re-use existing Surface objects when reading them from parcels.
9a89b0e1b9d4d7ebc9496442b219f2f58f30f5e8 16-Jul-2010 Romain Guy <romainguy@android.com> Merge "Improve clip support (add intersect, union and replace.)"
079ba2c85b15e882629b8d188f5fbdb42f7f8eea 16-Jul-2010 Romain Guy <romainguy@android.com> Improve clip support (add intersect, union and replace.)

This change also modifies the way the clip is stored. The clip is now
always stored in screen-space coordinates.

Change-Id: I96375784d82dfe975bc6477a159e6866e7052487
ndroid_view_GLES20Canvas.cpp
5ee65f0d441ca558bc95b60c1468f2aadfeeddbd 16-Jul-2010 Jamie Gennis <jgennis@google.com> Re-use existing Surface objects when reading them from parcels.

This change adds a process-global cache of previously deserialized Surface
objects so that if a Surface object wrapping the same ISurface gets received
again the same Surface can be used. This is important because the 'tail'
pointer in the SharedBufferClient is stored only on the client side, and needs
to be the same for all the Surface objects wrapping an ISurface instance. This
solves the problem by making there only be one Surface object wrapping an
ISurface per process.

Change-Id: I4bf0b8787885c56277622fca053022d2bb638902
ndroid_view_Surface.cpp
c0eb6d6388ad4e7301a6813b4cf2edf6845bedba 16-Jul-2010 Gilles Debunne <debunne@google.com> Merge "Fixed bug in BitmapFactory.decodeStream"
781d34747941f3534b2a985ff57368ad89855d7d 16-Jul-2010 Dianne Hackborn <hackbod@google.com> am 9c37e5ad: am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread

Merge commit '9c37e5add9d7678a29b4e0d1e178fe78a13db961'

* commit '9c37e5add9d7678a29b4e0d1e178fe78a13db961':
Implement native key pre-dispatching to IMEs.
fb4e1e24a93c7e6bc0fcdb3f5cfadfbc19503cd8 16-Jul-2010 Kenny Root <kroot@google.com> resolved conflicts for merge of 181bb0ab to master

Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
b75fa30aaf03d9e425d150b452501e5df0621351 16-Jul-2010 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of aca672ba to master

Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08
ffb0cef2a8ae895ebb10c9a87783666c8dcb76ac 16-Jul-2010 Christopher Tate <ctate@google.com> am 2c43b6ce: am d9452ecd: Merge "Fix jni registration typo" into gingerbread

Merge commit '2c43b6cee14cde6721689239e47d32319dbbf6ee'

* commit '2c43b6cee14cde6721689239e47d32319dbbf6ee':
Fix jni registration typo
9555a1323e846aba16e6a7f2e5d9a9227523e595 16-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> am cc52121c: am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread

Merge commit 'cc52121c4f88e9feb8404937bcbfff6e73084666'

* commit 'cc52121c4f88e9feb8404937bcbfff6e73084666':
More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
6ba776ad34a8029e4d0c784ce0092f1fcbc91bef 16-Jul-2010 Christopher Tate <ctate@google.com> am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread

Merge commit '078ccbdbb98c118aa87cab2fef61ff90dd128358'

* commit '078ccbdbb98c118aa87cab2fef61ff90dd128358':
Add native C APIs for working with the Asset Manager
9c37e5add9d7678a29b4e0d1e178fe78a13db961 16-Jul-2010 Dianne Hackborn <hackbod@google.com> am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread

Merge commit '75a91389f1938214397aaee262f4136e6bb6b094' into gingerbread-plus-aosp

* commit '75a91389f1938214397aaee262f4136e6bb6b094':
Implement native key pre-dispatching to IMEs.
75a91389f1938214397aaee262f4136e6bb6b094 16-Jul-2010 Dianne Hackborn <hackbod@google.com> Merge "Implement native key pre-dispatching to IMEs." into gingerbread
2c6081ce3593712f30dacd990a97209c791d6ced 16-Jul-2010 Dianne Hackborn <hackbod@google.com> Implement native key pre-dispatching to IMEs.

This significantly re-works the native key dispatching code to
allow events to be pre-dispatched to the current IME before
being processed by native code. It introduces one new public
API, which must be called after retrieving an event if the app
wishes for it to be pre-dispatched.

Currently the native code will only do pre-dispatching of
system keys, to avoid significant overhead for gaming input.
This should be improved to be smarted, filtering for only
keys that the IME is interested in. Unfortunately IMEs don't
currently provide this information. :p

Change-Id: Ic1c7aeec8b348164957f2cd88119eb5bd85c2a9f
ndroid_app_NativeActivity.cpp
181bb0ab461b1c8a6bf608f19c136fc0bbee7a3d 16-Jul-2010 Kenny Root <kroot@google.com> am 02c8730c: Add API to call to vold for mounting OBBs

Merge commit '02c8730c1bf19daf48bec8c6995df676a00a73b1' into gingerbread-plus-aosp

* commit '02c8730c1bf19daf48bec8c6995df676a00a73b1':
Add API to call to vold for mounting OBBs
02c8730c1bf19daf48bec8c6995df676a00a73b1 01-Jul-2010 Kenny Root <kroot@google.com> Add API to call to vold for mounting OBBs

* Unhide StorageService class; hide all the USB-related items

* Add application-visible API to StorageManager for OBB files

* Add class for parceling OBB info across binders (ObbInfo)

* Add a JNI glue class to libutils/ObbFile (ObbScanner)

* Add API to MountService to deal with calling into vold and checking
permissions

Change-Id: I33ecf9606b8ff535f3a2ada83931da6bbef41cfd
ndroid.mk
ndroidRuntime.cpp
ndroid_content_res_ObbScanner.cpp
aca672ba2eea19420df16906851d56077a3fd3b2 16-Jul-2010 Jeff Brown <jeffbrown@google.com> am c5ed5910: Add support for new input sources.

Merge commit 'c5ed5910c9ef066cec6a13bbb404ec57b1e92637' into gingerbread-plus-aosp

* commit 'c5ed5910c9ef066cec6a13bbb404ec57b1e92637':
Add support for new input sources.
c5ed5910c9ef066cec6a13bbb404ec57b1e92637 15-Jul-2010 Jeff Brown <jeffbrown@google.com> Add support for new input sources.

Added several new coordinate values to MotionEvents to capture
touch major/minor area, tool major/minor area and orientation.

Renamed NDK input constants per convention.

Added InputDevice class in Java which will eventually provide
useful information about available input devices.

Added APIs for manufacturing new MotionEvent objects with multiple
pointers and all necessary coordinate data.

Fixed a bug in the input dispatcher where it could get stuck with
a pointer down forever.

Fixed a bug in the WindowManager where the input window list could
end up containing stale removed windows.

Fixed a bug in the WindowManager where the input channel was being
removed only after the final animation transition had taken place
which caused spurious WINDOW DIED log messages to be printed.

Change-Id: Ie55084da319b20aad29b28a0499b8dd98bb5da68
ndroid_app_NativeActivity.cpp
ndroid_view_InputQueue.cpp
ndroid_view_KeyEvent.cpp
ndroid_view_KeyEvent.h
ndroid_view_MotionEvent.cpp
ndroid_view_MotionEvent.h
2c43b6cee14cde6721689239e47d32319dbbf6ee 16-Jul-2010 Christopher Tate <ctate@google.com> am d9452ecd: Merge "Fix jni registration typo" into gingerbread

Merge commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405' into gingerbread-plus-aosp

* commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405':
Fix jni registration typo
fc224b3e5397f8a9246d373c866be55a7cbb6188 16-Jul-2010 Gilles Debunne <debunne@google.com> Fixed bug in BitmapFactory.decodeStream

Downloading images over a slow connection could result in errors and
null images.

The JavaInputStreamAdaptor::do_skip method was correctly called in a
loop (to handle the EOF case using read()), but the amount that was
skipped at each time was not decreased by the amount already skipped.

Bug http://code.google.com/p/android/issues/detail?id=6066

Change-Id: Id897cdbe027e2d8c56df9fc399b3c92affb89c59
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
b87e22d300180ed34d0a4187c6538ddc32df566d 16-Jul-2010 Christopher Tate <ctate@google.com> Fix jni registration typo

Change-Id: I930fe00edec4e19f643a6de5b1bfd0d59e0846db
ndroid_app_NativeActivity.cpp
28a8467e51d052e1b3c52ba414633601e47e7530 16-Jul-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Handle Input and network signal changes for HID and tethering."
56d26139659c2414d289194c63860ff27ab80da0 16-Jul-2010 Jaikumar Ganesh <jaikumar@google.com> Handle Input and network signal changes for HID and tethering.

Change-Id: I7f0c2884bb766189b41093bdcd6241f4540a31f3
ndroid_server_BluetoothEventLoop.cpp
cc52121c4f88e9feb8404937bcbfff6e73084666 16-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread

Merge commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122' into gingerbread-plus-aosp

* commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122':
More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
c4b204bdc4ab974f1f96814c93d8eaa750c15122 16-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> Merge "More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync." into gingerbread
078ccbdbb98c118aa87cab2fef61ff90dd128358 16-Jul-2010 Christopher Tate <ctate@google.com> am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread

Merge commit '2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp

* commit '2c40582a6c3a5781b39d0504d5aa8934982989d2':
Add native C APIs for working with the Asset Manager
c96cdc9844d60d54683fb7700fc5908fdb8ff856 15-Jul-2010 Romain Guy <romainguy@google.com> Merge "Add support for BitmapShader."
d27977d1a91d5a6b3cc9fa7664ac7e835e7bd895 15-Jul-2010 Romain Guy <romainguy@google.com> Add support for BitmapShader.

This change also fixes an issue with the clip and layers.

Change-Id: I5fd9832098d8cf7ae8eb781ff9bffe7defaea279
ndroid_view_GLES20Canvas.cpp
6cce32b6adbb3a9725fc730ba0e0068a74657e60 13-Jul-2010 Christopher Tate <ctate@google.com> Add native C APIs for working with the Asset Manager

Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
ndroid_app_NativeActivity.cpp
727de40c6bc7c6521a0542ea9def5d5c7b1c5e06 08-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.

Change-Id: Ia67cabcc17a73a0f15907ffea683d06bc41b90e5
ndroid_util_Binder.cpp
0dff8d4afdc1b1ab545196dc21c2bf524f91ef88 15-Jul-2010 Joe Onorato <joeo@android.com> am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

Merge commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe'

* commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe':
The ICU data is no longer compiled directly into the shared library.
a6be4e01b23610cbcc27c6f26cfa390beabfa1fe 15-Jul-2010 Joe Onorato <joeo@android.com> am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp

* commit '3a053db28451858162f3dd84f18fae2f245b07f1':
The ICU data is no longer compiled directly into the shared library.
3a053db28451858162f3dd84f18fae2f245b07f1 15-Jul-2010 Joe Onorato <joeo@android.com> Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
9d9c1be296db26c6ad36b8593fb77ca263422665 14-Jul-2010 Mike Lockwood <lockwood@android.com> SQLiteDatabase: Add mechanism for registering custom sqlite3 functions

This allows you to define a callback in Java that can be called from
sqlite3 database triggers.

Change-Id: I09fdbd38c9807b6b0dd19c2761b01e8db76f1adc
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_database_SQLiteDatabase.cpp
26dd7b3bb381ba06ce3a7eb17205e54fdd7becfc 14-Jul-2010 Robert Greenwalt <robdroid@android.com> Merge "Pass network properties to ConnectivityService."
3aa513c0ee3794a030c157ba746309f005413e46 14-Jul-2010 Andy McFadden <fadden@android.com> Merge "Implement native dump for "am dumpheap -n"."
2388ad9eef109fa7f63c196c819c83f0376f0645 14-Jul-2010 Dianne Hackborn <hackbod@google.com> am f8d9379b: am d76b67c3: IME events are now dispatched to native applications.

Merge commit 'f8d9379bd834573feca085284970cf686993c330'

* commit 'f8d9379bd834573feca085284970cf686993c330':
IME events are now dispatched to native applications.
aa1933ac4cb135be5469db275af7a758cdfdf744 14-Jul-2010 Joe Onorato <joeo@android.com> The ICU data is no longer compiled directly into the shared library.

Change-Id: I1f6adf66a28b62a6f45c1622d669cb8c519adcbb
ndroid.mk
f8d9379bd834573feca085284970cf686993c330 14-Jul-2010 Dianne Hackborn <hackbod@google.com> am d76b67c3: IME events are now dispatched to native applications.

Merge commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320' into gingerbread-plus-aosp

* commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320':
IME events are now dispatched to native applications.
d76b67c340d1564abf8d14d976fdaf83bf2b3320 14-Jul-2010 Dianne Hackborn <hackbod@google.com> IME events are now dispatched to native applications.

And also:

- APIs to show and hide the IME, and control its interaction with the app.
- APIs to tell the app when its window resizes and needs to be redrawn.
- API to tell the app the content rectangle of its window (to layout
around the IME or status bar).

There is still a problem with IME interaction -- we need a way for the
app to deliver events to the IME before it handles them, so that for
example the back key will close the IME instead of finishing the app.

Change-Id: I37b75fc2ec533750ef36ca3aedd2f0cc0b5813cd
ndroid_app_NativeActivity.cpp
47f69fe2999e46004f2f2463b70d38de9ff7079a 16-Jun-2010 Robert Greenwalt <robdroid@android.com> Pass network properties to ConnectivityService.

Used as a bag to hold ipaddr, gateway, dns, proxy info.
addr's are InetAddresses for v4/v6 use. Cleaning up some old v4-only code

bug:2655015
Change-Id: I7ac886fe5c519e8bab42f49cd82a5189d9c9ab59
ndroid_net_NetUtils.cpp
06a6b558bd03d8f0fed8f94f1dcfc03c5a51bd1c 14-Jul-2010 Andy McFadden <fadden@android.com> Implement native dump for "am dumpheap -n".

This adds the ability to generate a trivial heap dump on demand. If
the appropriate system properties aren't set, the output file will
instead contain instructions for enabling them.

The data returned by get_malloc_leak_info() is processed and written
to the specified file. The output looks something like:

Android Native Heap Dump v1.0

Total memory: 2981301
Allocation records: 2152

z 1 sz 65557 num 1 bt 8010dd78 afd12618 ...
z 1 sz 52008 num 3 bt 8010dd78 afd12618 ...
z 1 sz 24428 num 1 bt 8010dd78 8010de84 ...
...2149 more...
END

(the "..." is actually the remaining entries in the stack backtrace;
I truncated it here)

"z" indicates whether the allocation was made pre- or post-zygote,
"sz" is the size allocated, and "num" is the number of allocations
made of that size with the specified backtrace.

Change-Id: I2d60f07444fce5f7178b3f51c928c8faa0b051bd
ndroid_os_Debug.cpp
f5574e0f8ca5624c822737eae497e27b60e33662 14-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> am 706623dd: am c0a7e690: Add Parcel::readExceptionCode() and Parcel::writeNoException()

Merge commit '706623ddb8314850c0551f0b66e24b5f0bd28620'

* commit '706623ddb8314850c0551f0b66e24b5f0bd28620':
Add Parcel::readExceptionCode() and Parcel::writeNoException()
706623ddb8314850c0551f0b66e24b5f0bd28620 14-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> am c0a7e690: Add Parcel::readExceptionCode() and Parcel::writeNoException()

Merge commit 'c0a7e690bfd32dd897ceccd04dd0fa6bf6e9cee6' into gingerbread-plus-aosp

* commit 'c0a7e690bfd32dd897ceccd04dd0fa6bf6e9cee6':
Add Parcel::readExceptionCode() and Parcel::writeNoException()
c0a7e690bfd32dd897ceccd04dd0fa6bf6e9cee6 14-Jul-2010 Brad Fitzpatrick <bradfitz@android.com> Add Parcel::readExceptionCode() and Parcel::writeNoException()

Add native Parcel methods analogous to the Java versions.

Currently, these don't do much, but upcoming StrictMode work changes
the RPC calling conventions in some cases, so it's important that
everybody uses these consistently, rather than having a lot of code
trying to parse RPC responses out of Parcels themselves.

As a summary, the current convention that Java Binder services use is
to prepend the reply Parcel with an int32 signaling the exception
status:

0: no exception
-1: Security exception
-2: Bad Parcelable
-3: ...
-4: ...
-5: ...

... followed by Parceled String if the exception code is non-zero.

With an upcoming change, it'll be the case that a response Parcel can,
non-exceptionally return rich data in the header, and also return data
to the caller. The important thing to note in this new case is that
the first int32 in the reply parcel *will not be zero*, so anybody
manually checking for it with reply.readInt32() will get false
negative failures.

Short summary: If you're calling into a Java service and manually
checking the exception status with reply.readInt32(), change it to
reply.readExceptionCode().

Change-Id: I23f9a0e53a8cfbbd9759242cfde16723641afe04
ctivityManager.cpp
f35c96bb498ffa7b3348b4bf17e9e7475f6bb324 13-Jul-2010 Kenny Root <kroot@google.com> Merge "Support bidi/shaping for getTextPath"
f7cb1f75fdaedf996cab7c4690b080adc7bc5b97 02-Jul-2010 Doug Felt <dougfelt@google.com> Support bidi/shaping for getTextPath

Move layout-related code into separate class since it's needed by both
canvas and paint.

Change-Id: Iba89a1d94d7cca650255ffa3cbc952b988a51b54
ndroid.mk
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/TextLayout.cpp
ndroid/graphics/TextLayout.h
8445ca6c3ba9b7cee6d20f5919e3b3ba8e6b8c96 10-Jul-2010 Dianne Hackborn <hackbod@google.com> am b14f325a: am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.

Merge commit 'b14f325a0118ffce286155caaabaae149653462c'

* commit 'b14f325a0118ffce286155caaabaae149653462c':
Add ANativeWindow API for directly drawing to the surface bits.
b14f325a0118ffce286155caaabaae149653462c 10-Jul-2010 Dianne Hackborn <hackbod@google.com> am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.

Merge commit '289b9b62372ef52a06113b83dfb870e2c2fb325a' into gingerbread-plus-aosp

* commit '289b9b62372ef52a06113b83dfb870e2c2fb325a':
Add ANativeWindow API for directly drawing to the surface bits.
289b9b62372ef52a06113b83dfb870e2c2fb325a 09-Jul-2010 Dianne Hackborn <hackbod@google.com> Add ANativeWindow API for directly drawing to the surface bits.

Also other cleanup and fixes:

- We now properly set the default window format to 565.
- New APIs to set the window format and flags from native code.
- Tweaked glue for simpler handling of the "destroy" message.
- Um, other stuff.

Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
ndroid_app_NativeActivity.cpp
ndroid_view_Surface.cpp
ndroid_view_Surface.h
om_google_android_gles_jni_EGLImpl.cpp
dbd77cd444f89d94ec5333223c1bc17dbe0c90cd 09-Jul-2010 Romain Guy <romainguy@google.com> Remove support for density compatibility in the hardware renderer.

Change-Id: I535e919986e5ccfb344ede8516ccd84c02642823
ndroid_view_GLES20Canvas.cpp
d8a6271bb1da4ee2a8ae126b532f1b5f302decb8 09-Jul-2010 Dianne Hackborn <hackbod@google.com> am 49159f07: am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread

Merge commit '49159f0748c704e53a7bd754f26113d9ab844a97'

* commit '49159f0748c704e53a7bd754f26113d9ab844a97':
Add new glue code for writing native apps.
49159f0748c704e53a7bd754f26113d9ab844a97 08-Jul-2010 Dianne Hackborn <hackbod@google.com> am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread

Merge commit '74bf59b450daf9e7e6bf234f01db164099edbfd5' into gingerbread-plus-aosp

* commit '74bf59b450daf9e7e6bf234f01db164099edbfd5':
Add new glue code for writing native apps.
85448bbecd4e0909eecfab15b7c3605f114d0427 07-Jul-2010 Dianne Hackborn <hackbod@google.com> Add new glue code for writing native apps.

This factors out the boiler-plate code from the sample
app to a common glue code that can be used for everyone
writing this style of app: a dedicated app thread that
takes care of waiting for events and processing them.

As part of doing this, ALooper has a new facility to allow
registration of fds that cause ALooper_pollOnce() to return
the fd that has data, allowing the app to drive the loop
without callbacks. Hopefully this makes some people feel better. :)

Also do some other cleanup of the ALooper API, plus some
actual documentation.

Change-Id: Ic53bd56bdf627e3ba28a3c093faa06a92be522b8
ndroid_os_MessageQueue.cpp
deba785f122a47915756ffd991f5540d952cf937 08-Jul-2010 Romain Guy <romainguy@google.com> Add support to draw 9patches in OpenGL.

This change only adds the necessary API and stubs. The implementation
will be added in another change.

Change-Id: Ie50b8aff5868e78796cee331df15bdbf990d2ea1
ndroid_view_GLES20Canvas.cpp
4beb8ff7175ebd14b96942724a658f407d0b9951 09-Jun-2010 Doug Felt <dougfelt@google.com> Support bidi layout for drawTextOnPath.

Change-Id: Ie5867fdb66fe15336774e20d65fa63e0d05bf6fe
ndroid/graphics/Canvas.cpp
97250d5c4ab5c36dc4f7cf1d9d48157ed934615d 07-Jul-2010 Dianne Hackborn <hackbod@google.com> am e24901d3: am 68267415: Add new native Looper API.

Merge commit 'e24901d3adb28fff72821d4e8e2ccc25b2184550'

* commit 'e24901d3adb28fff72821d4e8e2ccc25b2184550':
Add new native Looper API.
e24901d3adb28fff72821d4e8e2ccc25b2184550 07-Jul-2010 Dianne Hackborn <hackbod@google.com> am 68267415: Add new native Looper API.

Merge commit '682674154e3fe88f6061245145f934f25f1a2eb8' into gingerbread-plus-aosp

* commit '682674154e3fe88f6061245145f934f25f1a2eb8':
Add new native Looper API.
682674154e3fe88f6061245145f934f25f1a2eb8 03-Jul-2010 Dianne Hackborn <hackbod@google.com> Add new native Looper API.

This allows us to avoid exposing the file descriptor of
the event queue; instead, you attach an event queue to
a looper. This will also should allow native apps to be
written without the need for a separate thread, by attaching
the event queue to the main thread's looper and scheduling
their own messages there.

Change-Id: I38489282635895ae2cbfacb88599c1b1cad9b239
ndroid_app_NativeActivity.cpp
ndroid_os_MessageQueue.cpp
4847e630e5e740f6bf0e87b3cccbb655346edcb7 02-Jul-2010 Dianne Hackborn <hackbod@google.com> am 39c921c6: am 8ae5a8e7: Get to the point of being able to do native drawing.

Merge commit '39c921c6e5316696d8c61d1ee465f9b5f894c4ed'

* commit '39c921c6e5316696d8c61d1ee465f9b5f894c4ed':
Get to the point of being able to do native drawing.
39c921c6e5316696d8c61d1ee465f9b5f894c4ed 02-Jul-2010 Dianne Hackborn <hackbod@google.com> am 8ae5a8e7: Get to the point of being able to do native drawing.

Merge commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb' into gingerbread-plus-aosp

* commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb':
Get to the point of being able to do native drawing.
8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb 02-Jul-2010 Dianne Hackborn <hackbod@google.com> Get to the point of being able to do native drawing.

A little cleanup.

Change-Id: I37ef0557abf330d91d6fe47e81d062206b3bc346
ndroid_app_NativeActivity.cpp
738639ccd0f12b06d17df3d3b3ee68f506311331 02-Jul-2010 Dianne Hackborn <hackbod@google.com> am 58f35ff4: am 54a181b1: Make real API for native code to get its window.

Merge commit '58f35ff41601769ca4f357575a9385f16c01b991'

* commit '58f35ff41601769ca4f357575a9385f16c01b991':
Make real API for native code to get its window.
58f35ff41601769ca4f357575a9385f16c01b991 02-Jul-2010 Dianne Hackborn <hackbod@google.com> am 54a181b1: Make real API for native code to get its window.

Merge commit '54a181b1a2b1517a9479b21fbf7705a688232faf' into gingerbread-plus-aosp

* commit '54a181b1a2b1517a9479b21fbf7705a688232faf':
Make real API for native code to get its window.
37f447338e4633461253539e62c9b8eae04de3b3 02-Jul-2010 Romain Guy <romainguy@google.com> Merge "Don't use full screen FBOs, this dramatically increase performance."
f86ef57f8bcd8ba43ce222ec6a8b4f67d3600640 01-Jul-2010 Romain Guy <romainguy@google.com> Don't use full screen FBOs, this dramatically increase performance.

The next step will be to add an FBO cache to avoid churning memory on every
frame we draw. This change also adds support for drawBitmap(Bitmap, Matrix, Paint).

Change-Id: I7825cdcf0cad9bffe6219e05d8328a53d4a6e583
ndroid_view_GLES20Canvas.cpp
54a181b1a2b1517a9479b21fbf7705a688232faf 01-Jul-2010 Dianne Hackborn <hackbod@google.com> Make real API for native code to get its window.

Added implementation to use ANativeWindow and provide
it to a NativeActivity.

Change-Id: I890d71b6e15d4af71e6cf81b327961d7061ec1c2
ndroid_app_NativeActivity.cpp
ndroid_view_Surface.cpp
ndroid_view_Surface.h
om_google_android_gles_jni_EGLImpl.cpp
8dfabd9c6ffc64a9f558610e98ae19fbe41940fb 01-Jul-2010 Christopher Tate <ctate@google.com> resolved conflicts for merge of d3233ae9 to master

Change-Id: I59ecf8f2d3bd253f51457c11ec15f022ac5fdeb6
8ba548f81d1ab5f1750cbf86098c4a14e0b8bead 01-Jul-2010 Romain Guy <romainguy@google.com> Add implementation for drawBitmap(Bitmap, Rect, Rect, Paint)

Change-Id: I10904d2325a5431d15801aebcec1048715678e8c
ndroid_view_GLES20Canvas.cpp
d3233ae9027cd0459bdcb6f574ee1ffe02736109 01-Jul-2010 Christopher Tate <ctate@google.com> am 160edb36: Add ability to guard a thread against setting its own prio to bg

Merge commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b' into gingerbread-plus-aosp

* commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b':
Add ability to guard a thread against setting its own prio to bg
160edb3645f8b7012bab70ae6e6e8c4a5733082b 01-Jul-2010 Christopher Tate <ctate@google.com> Add ability to guard a thread against setting its own prio to bg

The guard is compiled out by default because it adds overhead to
android.os.Process.setPriority().

Change-Id: Ibb2a648c6349b381abb7ae62a358888b04fba871
ndroid_util_Process.cpp
68e9a49aeb0b07d0d99c0a05771348bcd460a703 01-Jul-2010 Romain Guy <romainguy@google.com> Merge "Add hooks for drawBitmap()."
25a98b8e21f7840ae582ce0a4cde21694c4c94ec 01-Jul-2010 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 7f6c6e8f to master

Change-Id: Id9dddb78c51f16ff8c4b60339421c94fde506db2
7f6c6e8ffa3c6e036bf8037012a930e52f54e296 01-Jul-2010 Dianne Hackborn <hackbod@google.com> am 3c80a4a0: Implement default key handling for native code.

Merge commit '3c80a4a044865bdf1289c7896baffa1c082d835c' into gingerbread-plus-aosp

* commit '3c80a4a044865bdf1289c7896baffa1c082d835c':
Implement default key handling for native code.
ce0537b80087a6225273040a987414b1dd081aa0 30-Jun-2010 Romain Guy <romainguy@google.com> Add hooks for drawBitmap().

Change-Id: I58e962c3a8b2bc75c2605fe369ad3002579d86e0

Add texture cache.

Change-Id: I1c0e5581d228869e114438258a1014e33e024ad7
ndroid_view_GLES20Canvas.cpp
81ea83d10883886013bc95eac2fe032acf1e7aa9 30-Jun-2010 Mike Lockwood <lockwood@android.com> Move MTP JNI code from libandroid_runtime to libmedia_jni

Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I0c54bbe4e6146beba7d22e782e02ded420f50dbd
ndroid.mk
ndroidRuntime.cpp
ndroid_media_MtpClient.cpp
ndroid_media_MtpCursor.cpp
ndroid_media_MtpServer.cpp
98ef64e4a89ced79094d4ff3dc0123c1989f9e10 29-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Add MtpServer Java class to wrap MTP device support.

Change-Id: I818c2d3b3f52ad5bb515acc4d3288b2b43e11908
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_media_MtpServer.cpp
3c80a4a044865bdf1289c7896baffa1c082d835c 30-Jun-2010 Dianne Hackborn <hackbod@google.com> Implement default key handling for native code.

The native code now maintains a list of all keys that may use
default handling. If the app finishes one of these keys
without handling it, the key will be passed back off to Java
for default treatment.

Change-Id: I6a842a0d728eeafa4de7142fae573f8c11099e18
ndroid_app_NativeActivity.cpp
ndroid_view_KeyEvent.cpp
639061d9c29fb97646c083f719a26992a7d24d85 29-Jun-2010 Dianne Hackborn <hackbod@google.com> am b5f05d00: am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread

Merge commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893'

* commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893':
Update native activity & event APIs to follow correct conventions.
b5f05d0018d72531e40c2afadfee90e9bc0c8893 29-Jun-2010 Dianne Hackborn <hackbod@google.com> am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread

Merge commit '0934fbb6b81006fdf6a76b6519201d2f472a1908' into gingerbread-plus-aosp

* commit '0934fbb6b81006fdf6a76b6519201d2f472a1908':
Update native activity & event APIs to follow correct conventions.
2e9f93e8db509d5236229dc8540e0904c5dbb9f5 29-Jun-2010 Dianne Hackborn <hackbod@google.com> Update native activity & event APIs to follow correct conventions.

Change-Id: Ie64fb3a9c68bc9c117fa5621b75d1f609e304e0e
ndroid_app_NativeActivity.cpp
f40e4928b9d8e1da4166c76dbd3f86a6bd2d3f72 29-Jun-2010 Chris Tate <ctate@android.com> am 96725326: am 31e0ffe8: Merge "Native input event dispatching." into gingerbread

Merge commit '96725326149687168937cf62f75364cf9cc3e96b'

* commit '96725326149687168937cf62f75364cf9cc3e96b':
Native input event dispatching.
96725326149687168937cf62f75364cf9cc3e96b 29-Jun-2010 Chris Tate <ctate@android.com> am 31e0ffe8: Merge "Native input event dispatching." into gingerbread

Merge commit '31e0ffe8444b70500cac319da084c4c45e62aca2' into gingerbread-plus-aosp

* commit '31e0ffe8444b70500cac319da084c4c45e62aca2':
Native input event dispatching.
349703effce5acc53ed96f7ed8556131f0c65e18 22-Jun-2010 Jeff Brown <jeffbrown@google.com> Native input event dispatching.

Target identification is now fully native.
Fixed a couple of minor issues related to input injection.
Native input enabled by default, can be disabled by setting
WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH to false.

Change-Id: I7edf66ed3e987cc9306ad4743ac57a116af452ff
ndroid.mk
ndroidRuntime.cpp
ndroid_view_InputQueue.cpp
ndroid_view_InputTarget.cpp
ndroid_view_InputTarget.h
bd6b79b40247aea7bfe13d0831c6c0472df6c636 26-Jun-2010 Romain Guy <romainguy@android.com> Add implementations for saveLayerAlpha() and textured rects.

Even though there's an implementation for textured rects, drawBitmap() is not
hooked up yet as it will require a good texture cache.

This method is implemented using FBOs. There's currently an issue either in the
driver or in the Canvas renderer that forces the FBO to be fullscreen, which is
extremely expensive and yields terrible performance.

Change-Id: I148419195e12d45653c60186938aa78c23a68e2c
ndroid_view_GLES20Canvas.cpp
7ae7ac48aa2b53453c9805075171ecd5bcafd7de 25-Jun-2010 Romain Guy <romainguy@android.com> Convert tabs to spaces.

Change-Id: I5d3ae48af79b19b6d293deff0521e4bb57d5114b
ndroid_view_GLES20Canvas.cpp
c7d53494f1fbd9f9d74af89053ff9fdb1ccbac6c 25-Jun-2010 Romain Guy <romainguy@android.com> Implement quickReject() and drawRect().

The OpenGL ES 2.0 renderer can now draw colored rectangles. At least there's
something on screen now.

Change-Id: I80a13ccc1dd56784edf74f2670a364f30700234a
ndroid_view_GLES20Canvas.cpp
ca9d544e386124c489484b4bd1d059646700bd5c 25-Jun-2010 Romain Guy <romainguy@google.com> Merge "Add colored rectangles implementation in OpenGLRenderer."
9d5316e3f56d138504565ff311145ac01621dff4 25-Jun-2010 Romain Guy <romainguy@google.com> Add colored rectangles implementation in OpenGLRenderer.

Drawing two rectangles one after the other discards the second one because of
Z buffering issues. This will be fixed in another changelist.

Change-Id: Ida1b3cde8a78e60cacc07e477abc44def527ff67
ndroid_view_GLES20Canvas.cpp
d8a86f0724defa231d9f2243f4c604d33eaeda63 24-Jun-2010 Nick Pelly <npelly@google.com> am db1bae9a: am 9bf39efb: Do not log AT command traffic by default.

Merge commit 'db1bae9a966150d7f6cc7d3e325cc8a4bf64b978'

* commit 'db1bae9a966150d7f6cc7d3e325cc8a4bf64b978':
Do not log AT command traffic by default.
db1bae9a966150d7f6cc7d3e325cc8a4bf64b978 24-Jun-2010 Nick Pelly <npelly@google.com> am 9bf39efb: Do not log AT command traffic by default.

Merge commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44' into gingerbread-plus-aosp

* commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44':
Do not log AT command traffic by default.
9bf39efb1b8527d7c46b20538cbb75bd60900b44 24-Jun-2010 Nick Pelly <npelly@google.com> Do not log AT command traffic by default.

Bug: 2792732
Change-Id: I24cb14c14f49e606f0aef1d05a533b90b3dfff53
ndroid_bluetooth_HeadsetBase.cpp
cb2555ebb6bb4c8946ed90f2acd3c21d9c32fd45 24-Jun-2010 Nick Pelly <npelly@google.com> am d19c397b: Merge "Do not log AT command traffic by default." into froyo

Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into froyo-plus-aosp

* commit 'd19c397b04f485e0af5990f3541e703934869290':
Do not log AT command traffic by default.
801dbe26ee027f78728dfa666238e0b51c230adb 24-Jun-2010 Nick Pelly <npelly@google.com> Do not log AT command traffic by default.

Bug: 2792732
Change-Id: I0ef25f38f38685291af6680cf653046eb391da5a
ndroid_bluetooth_HeadsetBase.cpp
038ecb097a4ee4997938d5c3a21c1c450c3beedc 24-Jun-2010 Romain Guy <romainguy@google.com> Merge "Add support for transformations."
f6a11b8a9e25ff9861bbba19251bea84d8a5daf2 24-Jun-2010 Romain Guy <romainguy@google.com> Add support for transformations.

This change adds partial support for the following transforms:
- scale()
- translate()
- rotate()
- setMatrix()
- getMatrix()

The transform is stored in a snapshot and saved/restored as needed.
The transform is currently not applied to the clip rect and is not
mapped to the vertex shader.

Change-Id: Id48993453311200804149917d0c126a4d0471226
ndroid_view_GLES20Canvas.cpp
c6a2cb0b5a4997a71ddc94969a799f2def184fbf 23-Jun-2010 Eric Laurent <elaurent@google.com> am 845f5414: am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread

Merge commit '845f541454d1fa9f328c0b0bf79acf2fba363177'

* commit '845f541454d1fa9f328c0b0bf79acf2fba363177':
Added support for audio sessions in MediaPlayer and AudioTrack.
bb9524b6bdddc7ac77d8628daa8b366b8a7be4a4 23-Jun-2010 Romain Guy <romainguy@google.com> Add implementations for clipRect(), save() and restore().

The current implementation of clipRect() does not apply local transformations
before setting the new clip.

Change-Id: I5997871bb638dfcd1a8ef96354846af52427e445
ndroid_view_GLES20Canvas.cpp
320742b15a710ede57862eee170945da26ef0172 23-Jun-2010 Dianne Hackborn <hackbod@google.com> am e3e2883f: am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread

Merge commit 'e3e2883f2232007174ead562610eb01201890d9b'

* commit 'e3e2883f2232007174ead562610eb01201890d9b':
First stab at attaching native event dispatching.
b09448e0a84a57bd15ea556f8bef27964128032a 23-Jun-2010 Mike Lockwood <lockwood@android.com> am dae19d7c: am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread

Merge commit 'dae19d7c00455e500cc9731071557ea91f162a7d'

* commit 'dae19d7c00455e500cc9731071557ea91f162a7d':
GPS: remove GpsEventThread from GpsLocationProvider
819008233e5d8e4cfd8ebe86bd3ec3881b4f11e9 23-Jun-2010 Jack Palevich <jackpal@google.com> am 1e08cc1d: am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.

Merge commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c'

* commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c':
Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
845f541454d1fa9f328c0b0bf79acf2fba363177 23-Jun-2010 Eric Laurent <elaurent@google.com> am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread

Merge commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d' into gingerbread-plus-aosp

* commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d':
Added support for audio sessions in MediaPlayer and AudioTrack.
619346f902241736d933657a4fe10f10c50a1ba8 21-Jun-2010 Eric Laurent <elaurent@google.com> Added support for audio sessions in MediaPlayer and AudioTrack.

Audio sessions are used to associate audio effects to particular instances (or groups) of MediaPlayers or AudioTracks.

Change-Id: Ib94eec43241cfcb416590f435ddce7ab39a07640
ndroid_media_AudioTrack.cpp
85bf02fc16784d935fb9eebfa9cb20fe46ff7951 22-Jun-2010 Romain Guy <romainguy@google.com> Fix the simulator build.

Change-Id: Ie404f7c2c308f0657f273af19a56e8c039b61898
ndroid_view_GLES20Canvas.cpp
e3e2883f2232007174ead562610eb01201890d9b 22-Jun-2010 Dianne Hackborn <hackbod@google.com> am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread

Merge commit 'e24a60aa4670fb835772b23ff665bb368fa65e30' into gingerbread-plus-aosp

* commit 'e24a60aa4670fb835772b23ff665bb368fa65e30':
First stab at attaching native event dispatching.
a95e4cb62f3642cb190d032dbf7dc40d9ecc6973 19-Jun-2010 Dianne Hackborn <hackbod@google.com> First stab at attaching native event dispatching.

Provides the basic infrastructure for a
NativeActivity's native code to get an object representing
its event stream that can be used to read input events.

Still work to do, probably some API changes, and reasonable
default key handling (so that for example back will still
work).

Change-Id: I6db891bc35dc9683181d7708eaed552b955a077e
ndroid_app_NativeActivity.cpp
ndroid_view_InputChannel.h
dae19d7c00455e500cc9731071557ea91f162a7d 22-Jun-2010 Mike Lockwood <lockwood@android.com> am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread

Merge commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d' into gingerbread-plus-aosp

* commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d':
GPS: remove GpsEventThread from GpsLocationProvider
aaf39f84063b8fee51bcdb0731d68c328b6a3c3d 22-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
f602d362ba4bb3adbf1eb4e38a794fb14274293a 20-Jun-2010 Mike Lockwood <lockwood@android.com> GPS: remove GpsEventThread from GpsLocationProvider

Rather than polling for events from the native code in an event thread,
we now require the GPS HAL libraries to call our callbacks from a thread
that is registered with the JVM to call directly into Java.
This eliminates a thread from our code and removes one step in the chain
of message passing from the GPS to the Location Manager client.

Change-Id: I2745a157690310ba9a699a8369f54a7366c6b1ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroidRuntime.cpp
1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c 22-Jun-2010 Jack Palevich <jackpal@google.com> am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.

Merge commit '224107a421e2611b15d1ec736df54bca9ee3e78d' into gingerbread-plus-aosp

* commit '224107a421e2611b15d1ec736df54bca9ee3e78d':
Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
224107a421e2611b15d1ec736df54bca9ee3e78d 22-Jun-2010 Jack Palevich <jackpal@google.com> Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.

Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
ndroid_opengl_GLES20.cpp
6c9a30045b1e6b9ef5d756e0a9657576c546c9bd 21-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from froyo-plus-aosp

Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
cf990885dafe848c8eac01ea52111aa432cb68b4 17-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "HID profile."
545e6708adda6859932b55fd824794b1401f5318 04-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> HID profile.

Change-Id: I52e965a6537bce02c751ba26fe7b44dd03832510
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
3b970e78d2974eacc621258bb6e581d458d9bbd3 17-Jun-2010 Romain Guy <romainguy@google.com> Merge "Add libhwui, to hardware accelerate the Canvas API using OpenGL ES 2.0."
e4d011201cea40d46cb2b2eef401db8fddc5c9c6 17-Jun-2010 Romain Guy <romainguy@google.com> Add libhwui, to hardware accelerate the Canvas API using OpenGL ES 2.0.

This is the initial checkin to setup the library and turn on OEGL ES 2.0
in ViewRoot, not a functional renderer.

Change-Id: I6655c54166e2967da2e21e7d6dcfba78bf113b44
ndroid.mk
ndroidRuntime.cpp
ndroid_view_GLES20Canvas.cpp
4e74ae3d5b27d917ea26d0929015f9fdc64af412 17-Jun-2010 Jeff Brown <jeffbrown@google.com> am 42bb545a: am 5c225b16: Even more native input dispatch work in progress.

Merge commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00'

* commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00':
Even more native input dispatch work in progress.
42bb545a54d89f0ddbb230d7a01ea4210c0f6c00 17-Jun-2010 Jeff Brown <jeffbrown@google.com> am 5c225b16: Even more native input dispatch work in progress.

Merge commit '5c225b1680e696ae8bbf505a1997d6f720672f74' into gingerbread-plus-aosp

* commit '5c225b1680e696ae8bbf505a1997d6f720672f74':
Even more native input dispatch work in progress.
5c225b1680e696ae8bbf505a1997d6f720672f74 16-Jun-2010 Jeff Brown <jeffbrown@google.com> Even more native input dispatch work in progress.

Added more tests.
Fixed a regression in Vector.
Fixed bugs in pointer tracking.
Fixed a starvation issue in PollLoop when setting or removing callbacks.
Fixed a couple of policy nits.

Modified the internal representation of MotionEvent to be more
efficient and more consistent.

Added code to skip/cancel virtual key processing when there are multiple
pointers down. This helps to better disambiguate virtual key presses
from stray touches (such as cheek presses).

Change-Id: I2a7d2cce0195afb9125b23378baa94fd2fc6671c
ndroid_view_InputChannel.cpp
ndroid_view_MotionEvent.cpp
d4824c256cc510cedb8d50e84767d1122886b547 16-Jun-2010 Romain Guy <romainguy@google.com> Merge "Add new API to check whether a Bitmap was modified."
0bbae0836426ba2704e38e7f90a9d0ca502ab71d 16-Jun-2010 Romain Guy <romainguy@google.com> Add new API to check whether a Bitmap was modified.

Bitmap.getGenerationId() can be used by caches to find out if a Bitmap has been
modified. This simply exposes an existing Skia API.

This change also adds a small test app for Canvas hardware acceleration. The new
Bitmap API is required to implement a texture cache.

Change-Id: I8547b146cd14c8afe1a2327fcd6d71b1b1cb68fc
ndroid/graphics/Bitmap.cpp
8959f1c71b99a712abf732f9814aa66054d75943 16-Jun-2010 Jeff Brown <jeffbrown@google.com> am 2dfd2aa4: am 92266a78: Merge "More work in progress on native events." into gingerbread

Merge commit '2dfd2aa413a91965c1a247980598c795db9b4c38'

* commit '2dfd2aa413a91965c1a247980598c795db9b4c38':
More work in progress on native events.
2dfd2aa413a91965c1a247980598c795db9b4c38 16-Jun-2010 Jeff Brown <jeffbrown@google.com> am 92266a78: Merge "More work in progress on native events." into gingerbread

Merge commit '92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp

* commit '92266a7894becc1cdf2298fd02380749ab036131':
More work in progress on native events.
9c3cda04d969912bc46184f2b326d1db95e0aba5 15-Jun-2010 Jeff Brown <jeffbrown@google.com> More work in progress on native events.

Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher. Also added some plumbing
that will be used to notify the framework about ANRs.

Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
ndroid_view_InputQueue.cpp
ndroid_view_InputTarget.cpp
672e04b5d288eb6e0a3310cc9d405cb0e9a48cc3 16-Jun-2010 Danica Chang <danicachang@google.com> deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp

Change-Id: I2bc63979bada9e18bcfeb9e740fab8b37c6868b9
ndroid_bluetooth_ScoSocket.cpp
7d10df4e2402c55dc827cb6675a15957071c00af 15-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
9bf3bb21c097cc96f30d9bf3ec7dea62a74a738b 09-Jun-2010 Szymon Jakubczak <szym@google.com> - updates NetUtils to use new libnetutils headers
- updates WifiStateTracker to track net.XXX.dnsX properties for name servers
- removes dhcp from WifiNative (use NetworkUtils instead)

Change-Id: Ic69ff253e8784cad34e9291e7970ee38bfa235b9
ndroid_net_NetUtils.cpp
ndroid_net_wifi_Wifi.cpp
0a2c6cc0138ceac8164061b3cdc3758441916c18 15-Jun-2010 Vasu Nori <vnori@google.com> fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591

two bugs were introduced by the above CL
1. to test if the column value is NULL, getType_native() should check if
the columnindiex is valid. (it seems sometimes callers could ask if a
given non-existent column is null - and the answer should be true.)
2. if a column is null and isBlob_native, isString_native methods should
return true - not false.

Change-Id: I64df75d0a3840a4502c00db8759c66ba4b268a26
ndroid_database_CursorWindow.cpp
6c354da9436e946708fc3f3a1c0d18b18bbfdf43 27-Apr-2010 Vasu Nori <vnori@google.com> read old version of data and use multiple connections to db

cts tests are in Change-Id: Ifcc89b4ff484c7c810fd2d450ded212a43360dda
dependency on: Change-Id: I938c42afc3fb50f5296d01c55ffcf4a102d8b0cb

1. Use sqlite's work-in-progress writeahead logging feature to read old
versions of data and thus increase concurrency of readers
even when there is a writer on the database
2. New API executeQueriesInParallel() sets up a database connecion pool
automatically created and managed by sqlite java layer
3. To increase reader concurrency, add an option to do BEGIN IMMEDIATE xaction
instead of BEGIN EXCLUSIVE

Change-Id: I3ce55a8a7cba538f01f731736e7de8ae1e2a8a1f
ndroid_database_SQLiteDatabase.cpp
e377032899fd7a9f88ad1313847e77c098b9f248 14-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am 864c68ea: merge from froyo-plus-aosp

Merge commit '864c68ea452baa0f4f298faf2155af45a9b6d60c'

* commit '864c68ea452baa0f4f298faf2155af45a9b6d60c':
Added an addAll to the ArrayAdapter
WLAN: Reset power save mode to startup value after DHCP response.
Add PageUp and PageDown hot keys
Should accept "application/vnd.wap.multipart.alternative" message.
replaced deprecated getIntent with parseURI
864c68ea452baa0f4f298faf2155af45a9b6d60c 14-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from froyo-plus-aosp

Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
8e03b7566c42621fda01186b66b019142eb84fbf 14-Jun-2010 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 9e660c82 to master

Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43
46b9ac0ae2162309774a7478cd9d4e578747bfc2 23-Apr-2010 Jeff Brown <jeffbrown@google.com> Native input dispatch rewrite work in progress.

The old dispatch mechanism has been left in place and continues to
be used by default for now. To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.

Includes part of the new input event NDK API. Some details TBD.

To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument. The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points. The ViewRoot then
provides the InputChannel to the InputQueue. Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue. This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.

There can be zero or more targets for any given input event. Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets). Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.

End-to-end event dispatch mostly works!

To do: event injection, rate limiting, ANRs, testing, optimization, etc.

Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
ndroid.mk
ndroidRuntime.cpp
ndroid_os_MessageQueue.cpp
ndroid_os_MessageQueue.h
ndroid_view_InputChannel.cpp
ndroid_view_InputChannel.h
ndroid_view_InputQueue.cpp
ndroid_view_InputTarget.cpp
ndroid_view_InputTarget.h
ndroid_view_KeyEvent.cpp
ndroid_view_KeyEvent.h
ndroid_view_MotionEvent.cpp
ndroid_view_MotionEvent.h
ndroid_view_ViewRoot.cpp
0631c608b0997efe5c0bd8e8955e65f1a7b3f32c 12-Jun-2010 Irfan Sheriff <isheriff@google.com> merge from open-source master

Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc
e0a89f611d952d477acaae0316f2ccba7237466b 11-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Add host support for deleting objects.

For example, deleting pictures on a digital camera.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpClient.cpp
ef1cc891ab2dbd292d4d1bd25e3b6069817c8994 11-Jun-2010 Vasu Nori <vnori@google.com> Merge "sqlite error "unsupported file format" = corruption"
4b983d9f301648d27b6585a69ca5a61f172fa110 11-Jun-2010 Chih-Chung Chang <chihchung@google.com> am dac5e001: am b8bb78f5: Change camera interface to support multiple cameras.

Merge commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9'

* commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9':
Change camera interface to support multiple cameras.
b8bb78f54b48868465a9d69d65fda08524ab5ae1 10-Jun-2010 Chih-Chung Chang <chihchung@google.com> Change camera interface to support multiple cameras.

Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
ndroid_hardware_Camera.cpp
b339509d3129db32a57ef95fc322a8482b6994f3 11-Jun-2010 Vasu Nori <vnori@google.com> sqlite error "unsupported file format" = corruption

sometimes sqlite corruption is so egregious that the sqlite
doesn't even think the file is of supported formatl; ie., the file
header is bad. treat this as corruption.
this check used to be done in sqlite3.c - move it to android code
so that we have less android-changes in sqlite3.c

depends on Change-Id: I334286a1a377b962b1a97dd2af00e194f035090e

Change-Id: Ide8cd1053b1ec00372fbc87caaaaefb408ce9104
ndroid_database_SQLiteDatabase.cpp
9646b6938804318f92a2f39dfbb007f3939ac368 11-Jun-2010 Mathias Agopian <mathias@google.com> am 5b669581: am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken
8b73ae4a1e5321753e54354e5202a38c5560fea9 11-Jun-2010 Mathias Agopian <mathias@google.com> fix [2757903] Crash in EGL when creating an EGLSurface

Change-Id: I995947ac40d1a5c86dce495550baf6864ecf5f54
ndroid_view_Surface.cpp
om_google_android_gles_jni_EGLImpl.cpp
0a87ae799c50de623ed57b1caf525fe1e9b7128c 11-Jun-2010 Romain Guy <romainguy@google.com> Merge "Fix native crash when enabling hardware acceleration."
c6133285820bba23778906cd417ceb9114e928dc 11-Jun-2010 Romain Guy <romainguy@google.com> Fix native crash when enabling hardware acceleration.

This change also prevents hardware acceleration when the ViewRoot is in the
system process. This causes problem in EGL intialization because of having
both a SurfaceControl and a Surface. This is not needed and better to leave
it off anyway (so that preview windows don't get unnecessary hw acceleration.)

Change-Id: I1cc55d7fb9a4c1a9c4c59f11f49d3e44de78acef
ndroidRuntime.cpp
0c702b88c5d0d4380930b920f5be6e66dd95a0d8 14-May-2010 Doug Felt <dougfelt@google.com> Move shaping to native.

Add internal API (getTextRunAdvances) to Paint, use when measuring.
Add internal API (getTextRunCursor) to Paint, use when determining
valid cursor positions.

Remove java-level shaping code. Remove 'prep' code in TextLine
(except for replacement text) since shaping now is done on the fly as
needed in native.

Provide explicit shaping context bounds to internal text measuring,
cursor movement, and rendering APIs.

Update for to changes in external API in ushape.h.

Change-Id: I146958b624802ce8553125e5c3c6c03031bc9608
ndroid/graphics/Canvas.cpp
ndroid/graphics/Paint.cpp
ea8bd1d1676dd96f8f9726bb8f67fa18dec7b9c1 07-Apr-2010 Mikael Kanstrup <mikael.kanstrup@sonyericsson.com> WLAN: Reset power save mode to startup value after DHCP response.

When the driver was configured to run with power save mode disabled the
power save mode incorrectly got reverted back to AUTO mode right after
DHCP response. The power save mode value is now saved so that the device
properly reverts back to a previous mode after DHCP response.

Change-Id: I5035aad10146812ecef1be8ea4b22a03e230ccc9
ndroid_net_wifi_Wifi.cpp
2d6145993e19d2bb664766dbaf3c1e9ad3d12cdc 10-Jun-2010 Romain Guy <romainguy@google.com> Move OpenGL support out of ViewRoot into a new HardwareRenderer class.

Change-Id: Iffaed924a5defc3c4df26223c390dc27eee115b1
ndroid.mk
ndroid_view_HardwareRenderer.cpp
ndroid_view_ViewRoot.cpp
7c5ded5d367078a7686872159229c998b558fac3 06-Jun-2010 Christopher Tate <ctate@google.com> am 8207e2fd: am a8ebe8b3: am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
a8ebe8b3f5aea0d3f09a62d6d255f99c1f911f7b 06-Jun-2010 Christopher Tate <ctate@google.com> am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo

Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into kraken

* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
Watchdog now records kernel stacks when it fires
58006194f87c2278990091e7014a60f442a21baa 05-Jun-2010 Mathias Agopian <mathias@google.com> am f5f7d389: am fae5cb2b: optimize Surface.readFromParcel()
fae5cb2b356a1fef172b43066180a7ab4c32dbac 05-Jun-2010 Mathias Agopian <mathias@google.com> optimize Surface.readFromParcel()

this is called for each relayout() and used to create a full Surface (cpp)
which in turn did some heavy work (including an IPC with surfaceflinger),
most of the time to destroy it immediatelly when the returned surface
(the one in the parcel) was the same.

we now more intelligentely read from the parcel and construct the new
object only if needed.

Change-Id: Idfd40d9ac96ffc6d4ae5fd99bcc0773e131e2267
ndroid_view_Surface.cpp
ecaa7b41ca49154ceaa9a7504eb0a86b89a96026 04-Jun-2010 Christopher Tate <ctate@google.com> Watchdog now records kernel stacks when it fires

The kernel threads are appended to the usual /data/anr/traces.txt file
and dropboxed along with the usual Dalvik stack dumps.

Change-Id: I120f1f5ee54c965efe9ac0c7f40fdef56385f1fa
NOTE: this change depends on the kernel publishing /proc/$PID/stack
ndroid.mk
ndroidRuntime.cpp
ndroid_server_Watchdog.cpp
4a575c682bae734338e1b8fd64886b0f29b960e4 04-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> am bcc112b1: am f8acea6c: Merge "Delete local references to avoid reference table overflow." into kraken
a7c0bdc4e46301530c89c67ec3ce6ae8df7260d7 04-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> Delete local references to avoid reference table overflow.

Change-Id: I2218b97647e381bfe6d329b1b6134bb76c1832b6
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothEventLoop.cpp
ac7ae9cc9118ad8e75011b7c94f05545f2cbe0e8 03-Jun-2010 Vasu Nori <vnori@google.com> Merge "add API to Cursor to get column value type"
8b0dd7da360d70920a37802eb455ba41500d3b45 18-May-2010 Vasu Nori <vnori@google.com> add API to Cursor to get column value type

Change-Id: I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591
ndroid_database_CursorWindow.cpp
755fd617258d3f1731b2829d681cab680db0fdd5 26-May-2010 Mike Lockwood <lockwood@android.com> Prototype Content Provider support for MTP/PTP devices.

At this point much of the plumbing is in place, but only a few simple queries
are supported.
This is enough to support a proof of concept sample program that navigates
the file hierarchy of a digital camera connected via USB.

Also removed obsolete ptptest host test program.

Change-Id: I17644344b9f0ce1ecc302bc0478c1f3d44a1647f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_media_MtpClient.cpp
ndroid_media_MtpCursor.cpp
2807df89af680e46cb35ee0035bb10b42d3136a2 27-May-2010 Mike Lockwood <lockwood@android.com> Move CursorWindow class from core/jni to libbinder

To allow use of the native CursorWindow class outside of the core framework jni

Change-Id: I72e8dcb91a2c691130c33cdfd9a25d343da1c592
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ursorWindow.cpp
ursorWindow.h
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteQuery.cpp
d72ec5f29d49ce1841b65044c6144fef7335bdec 26-May-2010 Vasu Nori <vnori@google.com> when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it

if it is not ignored AND if SQLITEStatement.execute() is called with a SELECT
or a pragma or some sql statement that returns data, caller gets an exception
with a weird error: "error code 100: unknown error"
to avoid confusion generated by this exception, just write a warning
and ignore the returned data.
Change-Id: I8f0225ceff8f92e32a58f323551e5ada6df63593
ndroid_database_SQLiteStatement.cpp
fea6f6dcb70e3fa7f60cab970ed444b5e5e2a3fa 22-May-2010 Vasu Nori <vnori@google.com> sqlite crashes when closing the database

A change was made in the last CL to ask sqlite for all unfinalized statements
and then finalizing them before closing the database.
But this crashes sqlite! because sqlite's FTS3
module keeps some prepared statements around and they should not
be finalized before closing the database.
(when sqlite is asked for all unfianlized statements, it also returns
the FTS3's reserved prepared statements which should not be
finalized!!)

Change-Id: I141ab4563985b8cd1305a1228c4cb01bc7281bcb
ndroid_database_SQLiteDatabase.cpp
6f37f83a4802a0d411395f3abc5f24a2cfec025d 19-May-2010 Vasu Nori <vnori@google.com> close() on anything other than database shouldn't acquire db lock.

bug:2683001
implmentation details:
1.close() on any sql statement is should simply queued up for finalization
to be performed later. caller doesn't acquire database lock.
2. the only effect of NOT close immediately is non-release of some memory.
3. all such queued-up-finalizations are performed whenever there is
another execute() of some sql statement on that database from ANY
thread in the process.
4. database close() automatically releases all unfinalized statements
before closing the database.

Change-Id: If4c9c7fde6b8945a41abc6c8b992aa8c69854512
ndroid_database_SQLiteCompiledSql.cpp
ndroid_database_SQLiteDatabase.cpp
b269735ca087e8e43c23cac75dfd25d00590cea7 19-May-2010 Dianne Hackborn <hackbod@google.com> am 4a30bcf7: am 74323fd1: Update NativeActivity to allow direct surface access.
74323fd1ab8eb11beea286d5c213c63e4b803141 19-May-2010 Dianne Hackborn <hackbod@google.com> Update NativeActivity to allow direct surface access.

No actual native API for using a surface, but it's a step.

Change-Id: I627f26b705abc7a05edf9117411abfacf0fae64a
ndroid_app_NativeActivity.cpp
f5523645a97643874840e029b4a7e9a4e4220806 14-May-2010 Nick Kralevich <nnk@google.com> am c5fdcaa2: am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
79290ae9768b69197dcc5f3645910b67925c0f95 14-May-2010 Nick Kralevich <nnk@google.com> Get rid of warnings when compiled with -Wformat-security

Change-Id: I5a7ad5be2aaf0fa0d164204d3c1bebf02ec55745
ndroid_bluetooth_HeadsetBase.cpp
f47d7405bbcb25d7cdf89ebb059f41520fe9ab87 22-Apr-2010 Doug Felt <dougfelt@google.com> Modify Canvas drawText to run bidi and shape.

Adds drawTextRun as internal API on Canvas and GraphicsOperations.
Adds implementation to implementors of GraphicsOperations.

Adds state and API on Paint to control the bidi algorithm when used
by Canvas. This API is currently hidden.

The drawText changes are incomplete since shaping is not yet available
in the native code.

Change-Id: I4368048aef9545df0953a349381771603e04b619
ndroid/graphics/Canvas.cpp
7d5cea988bdab9a32fe5b21333613042857882f8 11-May-2010 Dianne Hackborn <hackbod@google.com> am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo

Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken

* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
Hopefully fix issue #2662536: Why is launcher being killed?
906497c574d45d8dfd295b16dece0d0bc32c0895 11-May-2010 Dianne Hackborn <hackbod@google.com> Hopefully fix issue #2662536: Why is launcher being killed?

It looks like there was a subtle bug where Process.setOomAdj() could
return false just because the given process doesn't exist, even though
it is documented to only return false if OOM killing is not supported
at all. This would cause the activity manager to fall into its code
path of trying to clean up processes itself, which it does a much
poorer problem at. I am thinking we may be seeing this problem more
now that the activity manager is killing background processes itself
when there are too many of them.

In addition, this change cleans up and reduces some of the logging
around killing processes.

Finally, try to improve process LRU management a bit by taking
into account process dependencies. Any dependent processes are
pulled up in the LRU list with the processes that is actually
moving. Also, we bring a process up if someone accesses its content
provider.

Change-Id: I34ea161f839679345578ffe681e8d9c5d26ab948
ndroid_util_Process.cpp
e25cc656392d8866e163f78b60c7791455d0fb44 06-May-2010 Chih-Chung Chang <chihchung@google.com> Support multiple cameras in framework.

Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
ndroid_hardware_Camera.cpp
b658cc42aa69483469aed2cd09057eb66380dc92 07-May-2010 Kenny Root <kroot@google.com> Merge "Prevent local reference table overflows" into kraken
fa9e7c05c7be6891a6cf85a11dc635a6e6853078 06-May-2010 Christopher Tate <ctate@google.com> Sketch of Native input for MessageQueue / Looper / ViewRoot

MessageQueue now uses a socket for internal signalling, and is prepared
to also handle any number of event input pipes, once the plumbing is
set up with ViewRoot / Looper to tell it about them as appropriate.

Change-Id: If9eda174a6c26887dc51b12b14b390e724e73ab3
ndroid.mk
ndroidRuntime.cpp
ndroid_os_MessageQueue.cpp
ndroid_view_ViewRoot.cpp
485dd21bbefde378c392da3de48887aee9fabebe 07-May-2010 Kenny Root <kroot@google.com> Prevent local reference table overflows

If we're grabbing references to many strings in a loop, we have to
remove our local references so we don't overflow the VM's local
reference table.

Also, use env->ExceptionCheck() instead of checking for NULL value
returns on trying to allocate new items.

Bug: 2663816
Change-Id: I9cb5e17f6181dbb2f2c03d53841b2f5d8ab10f68
ndroid_util_AssetManager.cpp
33232d26bb51bf015fdf7dbd7a34c2b67745d72a 06-May-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Add UUID property for adapter." into kraken
69969e48f2bca9339662dddfacff0bbf6374ed7f 04-May-2010 Dianne Hackborn <hackbod@google.com> First pass at NativeActivity.

This is a rough sketch of the new pure-native API, which you can
use through a NativeActivity in your manifest (no Java code in
the .apk needed!).

Intentionally no docs yet, the API is still being seriously
messed with. But it works.

Change-Id: I0e916d58a0d159ecaf3689e41834eb8dc681c0c0
ndroid.mk
ndroidRuntime.cpp
ndroid_app_NativeActivity.cpp
5763c1f501e5941b0bdd6e8330a811c6e1448590 15-Mar-2010 Daisuke Miyakawa <dmiyakawa@google.com> Call register_localized_collators() with the current locale.

Make JNI function for setLocale() call register_localized_collators()
with the current locale, not previous one, every time it is possible.

This is a partial cherry-pick of b945639d0c3fa1850c07a2b80f476c8d242a8bde

BUG: 2514026
Change-Id: I584f1f68814dc084e699714e9d14a034123b49da
ndroid_database_SQLiteDatabase.cpp
94278c9fd2df8a693b1c46c5bc6867853586ba15 04-May-2010 Jaikumar Ganesh <jaikumar@google.com> Add UUID property for adapter.

4.64 version of Bluez has the UUID property of adapter being reported.

Change-Id: Ibf451a14d58620ba8bea812cd302be0b4def5f74
ndroid_bluetooth_common.cpp
9997f66f6288f99e8cdab3201d3b6ad606789efe 05-May-2010 Jaikumar Ganesh <jaikumar@google.com> Revert "Fix runtime reboot when connecting to a A2DP headset and"

This reverts commit 55b0110fc298c403887b1311d7eabfffa230495f.
ndroid_bluetooth_common.cpp
55b0110fc298c403887b1311d7eabfffa230495f 20-Apr-2010 Jaikumar Ganesh <jaikumar@google.com> Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: I023406ec6d59880754ca4f1de676d0dce71b13c6
ndroid_bluetooth_common.cpp
55fb51aa411b574646cc3068ce36e73789b81616 27-Apr-2010 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 86303198 to kraken

Change-Id: Idd921c7108e4c2cd4a861ee1fb8b43e5d56f8f2f
8138cb49e47f9a9905a316a217757710185c66aa 27-Apr-2010 Marco Nelissen <marcone@google.com> Make Surface.toString() show more useful info to help debug bug 2594388.

Change-Id: I005d3388503d8886e11a26fece30b87572934f15
ndroid_view_Surface.cpp
a8a0aa8b922c45fb4633f51610f264a19f9bd825 22-Apr-2010 Mathias Agopian <mathias@google.com> better fix for [2420565] Surface.lockCanvas() updates the dirty region too often

Change-Id: I83438b40effd21538f1c74396dc665254b9d5ab6
ndroid_view_Surface.cpp
dbc108a718a9a0d59b4697d0e780193503b4cf92 20-Apr-2010 Carl Shapiro <cshapiro@google.com> am 15feb4de: am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo

Merge commit '15feb4defc61c7bded6fdd3ea1c3781f25666275' into kraken

* commit '15feb4defc61c7bded6fdd3ea1c3781f25666275':
Remove code to pass the nonexistant lockprofsample flag to Dalvik.
8ba73ac72cd7becc2158e2b1f98794173f9746bd 20-Apr-2010 Carl Shapiro <cshapiro@google.com> Remove code to pass the nonexistant lockprofsample flag to Dalvik.

Change-Id: If334e21d770bc21a9b7c4f04d0fb652f53359231
ndroidRuntime.cpp
49ee271bba0972e865ab9def0ee293728263b488 16-Apr-2010 Carl Shapiro <cshapiro@google.com> am cb2906e4: am d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo

Merge commit 'cb2906e4bbb96b0be83029572a78f97dc6763eca' into kraken

* commit 'cb2906e4bbb96b0be83029572a78f97dc6763eca':
Add command line flags to enable lock profiling.
d8f3ec6e8308400e9446b254fcca457f6e53ea13 13-Apr-2010 Carl Shapiro <cshapiro@google.com> Add command line flags to enable lock profiling.
ndroidRuntime.cpp
8b138323d54e36fd66b22a634494648e20c53373 13-Apr-2010 Mathias Agopian <mathias@google.com> don't hardcode "mSurface" throughout our source code

this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.

Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
ndroid_hardware_Camera.cpp
ndroid_view_Surface.cpp
om_google_android_gles_jni_EGLImpl.cpp
aeeea3da3c868deec65a717cef02f5cc738a1938 10-Apr-2010 Dan Egnor <egnor@google.com> am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo

Merge commit '505f22d1a4dbf1fceaf8deca443d7322386964e1' into kraken

* commit '505f22d1a4dbf1fceaf8deca443d7322386964e1':
Fix sim build (sim doesn't have strl*() reliably...)
4e8d8238e10d168b434dcdd2e779a9aab37f1e2c 09-Apr-2010 Dan Egnor <egnor@google.com> Fix sim build (sim doesn't have strl*() reliably...)

Just stub out the TrafficStats code for the sim.
Bug: 2578938

Change-Id: Ie555f67f581d05ee446ea29cb2223feb350c52f9
ndroid_net_TrafficStats.cpp
5b4cc93b0d56324da9944c4eb2f879e8b7c7f1cf 09-Apr-2010 Dan Egnor <egnor@google.com> am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().

Merge commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68' into kraken

* commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68':
Hail-Mary attempt to avoid apparent blocking problems in readEvents().
78158db51029e7dbe160e60af0deb7594bec051d 09-Apr-2010 Dan Egnor <egnor@google.com> Hail-Mary attempt to avoid apparent blocking problems in readEvents().

Use the same procedure (select() with a short timeout) used by "logcat -d",
which doesn't seem to have any blocking problems.

Bug: 2569403
Change-Id: Ia27bb4207919a1288716b41a007b4b4b52f8e90a
ndroid_util_EventLog.cpp
a40b3a8d98ca7d3daa3ae7651263fe3c35b0b908 08-Apr-2010 Dan Egnor <egnor@google.com> am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo

Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken

* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
Change TrafficStats to a new JNI implementation.
2b4abcd0c7c4361af8ab6d5d7b073fb75ac6d219 08-Apr-2010 Dan Egnor <egnor@google.com> Change TrafficStats to a new JNI implementation.

Also change phone's ConnectionStateTrackers to use it directly,
rather than through the INetStat binder interface.

Bug: 2578938
Change-Id: I8858e2609cbec3be845a0ce5178cb03f67e01b41
ndroid.mk
ndroidRuntime.cpp
ndroid_net_TrafficStats.cpp
00b74270c9f136a8727c5f6cda0997a3a905f385 26-Mar-2010 Mike Lockwood <lockwood@android.com> Move files internal to LocationManagerService from framework.jar to services.jar

Change-Id: Iebbfc49b8300ab59730733efdf489ec87ea45a25
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_location_GpsLocationProvider.cpp
d4afde3d12dd0320b64d3bf26bf805aafa09395c 01-Apr-2010 Jaikumar Ganesh <jaikumar@google.com> am b8fc825d: am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo

Merge commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5' into kraken

* commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5':
Fix crash while turning bluetooth on, due to a race condition.
3a0d1d11eba05d74d0461083eb6f31321588a0f6 01-Apr-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
b8aa037602eff1fe5fbc9cce07a6f9bc34d19a3e 31-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Fix crash while turning bluetooth on, due to a race condition.

Bug: 2561150

Race condition: We were basing whether the event loop is
running or not on whether nat->pollData was null or not.
In rare cases, eventLoopMain would have not started,
isEventLoopRunning returns true; java side makes a dbus call
and the watches get set to null, causing a crash in
dbus_connection_set_watch_functions when eventLoopMain starts.

Change-Id: I863f182185a8e956fd53cb58783b7fe0ecfb2ddb
ndroid_bluetooth_common.h
ndroid_server_BluetoothEventLoop.cpp
8acdb911f4b9c38d1cafd3ab464d6bec54564c84 31-Mar-2010 Mike Lockwood <lockwood@android.com> Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
0ca25191c663ef229f1f475b17899f2017ed6980 29-Mar-2010 Wu-cheng Li <wuchengli@google.com> Add some comments for zoom methods.

Also change RuntimeException to IllegalArgumentException.
bug:2458926

Change-Id: I87af31f5f3f10244131a1117bd1725c2d292b587
ndroid_hardware_Camera.cpp
a3ba63dc8ae1691211f1d6a029751a2086aa3fc6 26-Mar-2010 Mike Lockwood <lockwood@android.com> Add support for GPS privacy lock. DO NOT MERGE

Change-Id: Ieb55794453f86fb7100c9010a0729839990eb9f7
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
5348c014129b766d621ef82a6e42007009ffc310 25-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> Better fix for gettid() sim-eng breakage from last night.

Change-Id: I2e8762d43b3c224a2e102ff82fc79072a85bb4c6
ndroid_util_Binder.cpp
cd06ff13c98fe630736f826ff473c1871bbde5d0 25-Mar-2010 Mike Reed <reed@google.com> Merge "update dox that we ignore the exact parameter on computeBounds"
54900e8c05e92a0783e8468ad7c4513eb66adc80 25-Mar-2010 Mike Reed <reed@google.com> update dox that we ignore the exact parameter on computeBounds

Change-Id: I6051210ea2a73b4d1c6cd631a285209ab130b4e5
ndroid/graphics/Path.cpp
f4264011c0e5c52f29627f2489aeabe67eff66a4 25-Mar-2010 Nick Pelly <npelly@google.com> Merge "Fix Phone App crash due to binary data in HSP/HFP stream."
8457b0f0c6bd57a1a796ae5f5c7df7119afc5d4f 25-Mar-2010 Nick Pelly <npelly@google.com> Fix Phone App crash due to binary data in HSP/HFP stream.

The BMW 2005 E46 sends binary data amongst the AT commands. Log below.

There were a couple of problems when this happened.
o Off by one error causing overflow of read buffer.
o No validation that input can be parsed by NewStringUTF()

This commit fixes the off-by-one, and validates that the input is ASCII.

I also increased the read buffer size to 256 to make it less likely we split
commands across buffers. We will lose the command when this happens.

2010-03-24 16:00:29.934185 > ACL data: handle 1 flags 0x02 dlen 17
L2CAP(d): cid 0x0040 len 13 [psm 0]
0000: 29 ef 13 41 54 2b 43 49 4e 44 3f 0d 6a )ï.AT+CIND?.j
2010-03-24 16:00:29.940502 < ACL data: handle 1 flags 0x00 dlen 38
0000: 22 00 40 00 2b ef 3d 0d 0a 2b 43 49 4e 44 3a 20 ".@.+ï=..+CIND:
0010: 31 2c 30 2c 30 2c 30 2c 34 2c 30 2c 35 0d 0a 0d 1,0,0,0,4,0,5...
0020: 0a 4f 4b 0d 0a b0 .OK..°
2010-03-24 16:00:29.949657 > HCI Event: Number of Completed Packets (0x13) plen 5
handle 1 packets 1
2010-03-24 16:00:30.004284 > ACL data: handle 1 flags 0x02 dlen 9
L2CAP(d): cid 0x0040 len 5 [psm 0]
0000: 29 ff 01 01 76 )ÿ..v
2010-03-24 16:00:30.137218 > ACL data: handle 1 flags 0x02 dlen 144
L2CAP(d): cid 0x0040 len 140 [psm 0]
0000: 29 ef 0e 01 02 a9 03 58 02 a9 03 64 02 a9 03 98 )ï...©.X.©.d.©..
0010: 02 a9 03 98 02 a9 03 98 02 a9 03 98 02 a9 03 98 .©...©...©...©..
0020: 02 a9 03 98 02 a9 03 98 02 a9 03 98 02 a9 03 98 .©...©...©...©..
0030: 02 a9 04 d8 02 a9 03 a4 02 a9 03 b0 02 a9 03 bc .©.Ø.©.¤.©.°.©.¼
0040: 02 a9 03 c8 02 a9 03 fc 02 a9 04 38 02 a9 04 44 .©.È.©.ü.©.8.©.D
0050: 02 a9 04 50 02 a9 04 84 02 a9 04 90 02 a9 04 9c .©.P.©...©...©..
0060: 02 a9 04 a8 02 a9 04 b4 02 a9 04 c0 02 a9 04 d8 .©.¨.©.´.©.À.©.Ø
0070: 02 a9 04 d8 02 a9 04 cc 02 a9 10 7c 02 a9 10 d8 .©.Ø.©.Ì.©.|.©.Ø
0080: 02 a9 10 e4 02 a9 10 f4 02 a9 11 6a .©.ä.©.ô.©.j

Change-Id: I7ccff70bc95a7945d8ff03527764fd8f4da04d24
Bug: 2539053
ndroid_bluetooth_HeadsetBase.cpp
ad8fd282dde705ad090b2ecdc5b363df399230ab 25-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> Hopefully fix the sim-eng build, part 2.

This is kinda gross, but I can't find a good way to check for the
existence of gettid(), except by finding its syscall number. Then
might as well just use it rather than hope gettid's around, as it's
not in sim-eng.

Change-Id: Ieb7b39426dec08bd715b6fe1a9ab5b2801bdf775
ndroid_util_Binder.cpp
8f26b323d8f78c6a183e74c464864ef7da457267 25-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> Try to fix sim build. Looks like gettid() is in unistd.h.

Change-Id: Ib1ecea86246ad75b2553b0ccc8ce03a53ffdf218
ndroid_util_Binder.cpp
2c5da313dd72c284fbc2c11839f8a452ab5ce574 25-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> Log blocking Binder calls to the EventLog.

This mimics what we do already for SQLiteDatabase's db_operation and
ContentProvider's content_query_operation and
content_update_operation: over a threshold things are always logged,
and under which they're sub-sampled.

Change-Id: Ia0280b9b07b336ee88b17be2a31a7af0fd7c5770
ndroid_util_Binder.cpp
4b4d3039ec5e1538436e36d02127076c746bd3bf 25-Mar-2010 Jeff Brown <jeffbrown@google.com> Merge "Ensure Binder finalizer handles partially initialized instances."
582763ae4e2910b4059dccdfd30a447e9fc974d5 25-Mar-2010 Jeff Brown <jeffbrown@google.com> Ensure Binder finalizer handles partially initialized instances.

If the Binder is allocated but its constructor does not run for some
reason, then Binder.init() will not be called. Since the object was
allocated, it is still eligible for finalization. Eventually when
the finalizer runs and calls Binder.destroy(), it will have a NULL
binder holder pointer. Previously this would cause Binder.destroy()
to attempt to decrement a reference count on a NULL pointer.

Now we check and ignore the binder if it does not have a valid
holder pointer.

Bug: b/2533956
Change-Id: Ifc2729b2f2abe8bceea5a0645ae0a4c1575b7846
ndroid_util_Binder.cpp
69c997a5c603c3cc56cbfdacd72cbe9993c5f053 25-Mar-2010 Ben Cheng <bccheng@android.com> Update a stale JIT option name.

Change-Id: I4b2f2c215a0258adf52861bac025e32df7f40b14
ndroidRuntime.cpp
39f10ec7dac59b5a8bc6f7e5b86846da77c30337 24-Mar-2010 Mike Reed <reed@google.com> If we detect a 9patch chunk, force the config chooser to avoid 565, with its pre-dithering madness

Change-Id: I0a2d1b094ccb16d479524779acec0216dc7a80ee
ndroid/graphics/BitmapFactory.cpp
af1e11b849ea527f4b1b1695924ce42cc9d7f670 23-Mar-2010 Mathias Agopian <mathias@google.com> one step toward fixing [2501808] sapphire: OOM in GPU Surface area

when a surface was returned from a remote process through the binder we
would leak its resources until a GC happened.

implement writeToParcel to release the source when PARCELABLE_WRITE_RETURN_VALUE
is set

Change-Id: I6a9fa369b0d164a9ca1229b8a2944d3c132a3720
ndroid_view_Surface.cpp
02034d3568fb3b984e8d185d70e18ba19e592ba3 22-Mar-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
aa0071d11b597a3e8fa15544743af2791a54d599 19-Mar-2010 Eric Olsen <eolsen@android.com> Add check for null name on SCO connect

Change-Id: I5f5064fd57a5fffaf02b3e96b7faab219c490e86
Signed-off-by: Eric Olsen <eolsen@android.com>
ndroid_bluetooth_ScoSocket.cpp
5e12aec16335dc3ae09d4cc8faa3e0deac5f2d31 19-Mar-2010 Eric Olsen <eolsen@android.com> Add the blacklist for the SCO connections

Change-Id: Ibfdfb21fb2f27d01d2b8bff48041398aa4308353
Signed-off-by: Eric Olsen <eolsen@android.com>
ndroid_bluetooth_ScoSocket.cpp
cc17ed29e0ff184afd1bce750f4f80aa917cfcaf 18-Mar-2010 Vasu Nori <vnori@google.com> ignore not-so-useful warning messages from sqlite logging func

bug:2524260
Change-Id: Ie397c0df9b63414205bbf8ea7ae9d1498f198524
ndroid_database_SQLiteDatabase.cpp
ed0d1ab2864a62793ec9c0797251e11cec7e850c 08-Mar-2010 Johannes Carlsson <johannes.carlsson.x@sonyericsson.com> Everytime Bluetooth was turned off two file descriptors were not closed

Using close instead of shutdown on the file descriptors and only clear the file
descriptor that was closed. If both file descriptors are cleared the thread
will not be able to close it.
ndroid_server_BluetoothEventLoop.cpp
b945639d0c3fa1850c07a2b80f476c8d242a8bde 15-Mar-2010 Daisuke Miyakawa <dmiyakawa@google.com> Make JNI function for setLocale() call register_localized_collators()
with the current locale, not previous one, every time it is possible.

Add a unit test verifying this fix.

BUG: 2514026
Change-Id: I4dd1b047e1ab4bf399e2c3ebc0304c0cfa3a0928
ndroid_database_SQLiteDatabase.cpp
e6335c904aafa17795b059a5d83b8b7db6c761c8 14-Mar-2010 Dave Sparks <davidsparks@android.com> Add locking around AudioRecord release() function in JNI. Bug 2481952.

There is a potential threading issue where an app could call release()
on two threads. This hack adds a static lock object that serializes
access to the Java fields that contain the pointer to the native
AudioRecord object and weak reference to the Java object. Also
modifies finalize() to call release() so that both use the locking
scheme.

Change-Id: I09dcb19b7f501dc582e40e8718142b493eba2518
ndroid_media_AudioRecord.cpp
06ea4c7c6b8b7a10f41bf99a336242144788598e 11-Mar-2010 Vasu Nori <vnori@google.com> Merge "add more debug info to SQL section in bugreport"
c3849200fa60b22ea583ba2a6f902d6a632a5e7e 09-Mar-2010 Vasu Nori <vnori@google.com> add more debug info to SQL section in bugreport

after this CL, adb bugreport will the following info (under SQL section
of each app's meminfo dump)

SQL
heap: 344 memoryUsed: 344
pageCacheOverflo: 67 largestMemAlloc: 50

DATABASES
Pagesize Dbsize Lookaside Dbname
1024 7 24 googlesettings.db
1024 26 110 talk.db
1024 11 0 (attached) transient_talk_db
1024 11 32 subscribedfeeds.db
1024 20 27 gservices.db

Change-Id: Iabd13be9793d9794137c60a045b84fa632f13498
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteDebug.cpp
36ad54acef82f80dbf0ecdd8c44f5764df1be119 10-Mar-2010 Mike Reed <reed@google.com> force purgeability for assets

Change-Id: I1067cfb91846a05290ed26ce9a62eb82d3170719
http://b/issue?id=1860187
ndroid/graphics/BitmapFactory.cpp
aa86859b1035f865147b4f76ad2a9eed7ee098a5 10-Mar-2010 Chia-chi Yeh <chiachi@android.com> YuvImage: jpeg_set_quality() should be called after jpeg_set_defaults().

Change-Id: I6579ad9241dd5ee6aabf54e1a1128d17b4f6b3e6
ndroid/graphics/YuvToJpegEncoder.cpp
ae58f6d7473c67d76b6c6373794fd1a77543ddb4 10-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Add an API to set the link timeout."
b7e029d03c115ed65cdea9b2bba307e882c308e2 10-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Add an API to set the link timeout.

This fixes the problem where the car dock is
powered on and off pretty quickly.

Change-Id: I8724641b8c337019f089b005cb236fc90549cf6f
ndroid_server_BluetoothService.cpp
1a9c27c312ba20b2ceafcde18ce451724782d2a5 06-Mar-2010 Ficus Kirkpatrick <ficus@android.com> Add a LOG_TAG for android.graphics.Graphics JNI.

It occasionally logs when it fails an allocation but wasn't
defining one before.

Change-Id: Ifc41addc870eb126616ad44465638423d51568d9
ndroid/graphics/Graphics.cpp
c8195ffcfd854902832e45d3f7b824585f5558f2 08-Mar-2010 Vasu Nori <vnori@google.com> Merge "rollback AFTER commit causes warning message from sqlite bug:2486731"
239038094493b3b1ac262222d1f21254b48d4fc6 08-Mar-2010 Mike Lockwood <lockwood@google.com> Merge "location: dump LocationProvider internal state"
5bffb45057a17bb307b20259fea5a2527272a503 08-Mar-2010 Mike Reed <reed@google.com> Merge "hidden api sameAs() to compare the pixels of 2 bitmaps for equality"
76d1e01d5e65c4631c827831e98ad4e300d99eab 05-Mar-2010 Mike Reed <reed@google.com> hidden api sameAs() to compare the pixels of 2 bitmaps for equality
ndroid/graphics/Bitmap.cpp
3c8fbdf5dd19fad0b3006557716ee1026d7d5899 04-Jan-2010 Fred Fettinger <fred.fettinger@motorola.com> location: dump LocationProvider internal state

For each location provider, call getInternalState() to see if it has any
state information to include in a bugreport. If the returned string is not
null, then print a header with the provided name followed by the returned
string.

Change-Id: I0a388d7fba14ac8cadcb80eda0a0ceb95032410b
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
78f307d229466bb41c0260d1092dcea82a7bb5f8 06-Mar-2010 Vasu Nori <vnori@google.com> rollback AFTER commit causes warning message from sqlite bug:2486731
ndroid_database_SQLiteDatabase.cpp
7adc274abd9c0c361b798c2348251358d7adeb18 06-Mar-2010 Christopher Tate <ctate@google.com> Fix up missed refactoring in JNI reg and preloaded-classes

Change-Id: I079bdf4edfb9083eba3e15d8e4dbf3b2bad9190c
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_FileBackupHelperBase.cpp
4528186e0d65fc68ef0dd1941aa2ac8aefcd55a3 06-Mar-2010 Christopher Tate <ctate@google.com> Refactor android.backup => android.app.backup

Change-Id: I0b21316ff890d7f3c7d4b82837bb60670724c2e8
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupHelperDispatcher.cpp
16d8cf905b86965875cc8ef5d5c996b0d78fef79 05-Mar-2010 Vasu Nori <vnori@google.com> Merge "provide databasename to the logging func registration func"
bd29b7c2b7f6c4041b270599d4f0a8bbfb4d785b 05-Mar-2010 Vasu Nori <vnori@google.com> provide databasename to the logging func registration func

this will allow sqlite to return this name, along with the message.
otherwise, sqlite logging messages are confusing without database
name to associate them with.
ndroid_database_SQLiteDatabase.cpp
20cb56e26e91df91bd64d4251222e0d421cdbe47 04-Mar-2010 Dianne Hackborn <hackbod@google.com> Fix some bugs.

Bug #2376231: Apps lose window focus (and back key causes ANR) if the
lock screen is dismissed while the phone is in landscape mode

This is another case where we weren't recomputing the focused window
after changing the visibility policy.

bug #2479958: Investigate source of "Resources don't contain package
for resource number 0x7f0a0000"

Um, okay, so it turns out there were bugs all over the place where
we would load an XML resource from a another application, but not
use the Resources for that application to retrieve its resources...!
I think the only reason any of this stuff was working at all was
because it typically only cared about retrieving the resource
identifiers of the items (it would look up the values later).

Bug #2401082: Passion ERE26 monkey crash - InputMethodManagerService

Add some null checks.
ndroid_util_AssetManager.cpp
91d0e3c950846ad0dfa67ac8d67b554880795580 02-Mar-2010 Vasu Nori <vnori@google.com> resubmit reverted CL https://android-git.corp.google.com/g/#change,42682

register a logging func with sqlite, to get extra info on errors
sqlite3 (latest patch) from DRH included this functionality.
use it to get more useful debugging info from sqlite
ndroid_database_SQLiteDatabase.cpp
7d7ce2bbdd884d307fa09e5e20a5e9282e087184 02-Mar-2010 Andy McFadden <fadden@android.com> Merge "Tone down a log message."
5d26c1e38dabb3ad8b4b6e1000375f3b1a6b7693 02-Mar-2010 Mathias Agopian <mathias@google.com> Added a name to Surface created by SurfaceFlinger

Updated the window manager to use this new facility.
Surfaces name are now printed by "dumpsys".
ndroid_view_Surface.cpp
b649ca250a69ff0b63217551ce06fae9fe48df32 02-Mar-2010 Vasu Nori <vnori@google.com> revert due to the sqlite build problem on Mac..
ndroid_database_SQLiteDatabase.cpp
e0dab5bf6744812e7059ae63b31ac835479cb321 01-Mar-2010 Vasu Nori <vnori@google.com> Merge "register a logging func with sqlite, to get extra info on errors"
701d916a9c648f66d15b5c30943430176ae5b08c 01-Mar-2010 Andy McFadden <fadden@android.com> Tone down a log message.

Sometimes shell commands like "am" return before the framework stuff
really finishes initializing (e.g. if you give it no arguments so you
can see the usage info). The runtime used to print the dire and
uninformative message:

E/AndroidRuntime(): ERROR: thread attach failed

With this change it's a bit more subdued:

I/AndroidRuntime(): NOTE: attach of thread 'Binder Thread #2' failed

Ideally it wouldn't get logged at all when it's "expected", but that
requires actual code changes.
ndroidRuntime.cpp
54dd0f25acad86f7c4901e6f7d8fdd5628e42970 01-Mar-2010 Vasu Nori <vnori@google.com> register a logging func with sqlite, to get extra info on errors

sqlite3 (latest patch) from DRH included this functionality.
us it to get more useful debugging info from sqlite
ndroid_database_SQLiteDatabase.cpp
00bb93823d082c31d757bd7b75a8615afbd2c1a5 27-Feb-2010 Joe Onorato <joeo@android.com> Add new Slog class.
ndroid_util_Log.cpp
dae8e94cce0881f3e10ef5e34b881f512bb52a75 24-Feb-2010 Doug Felt <dougfelt@google.com> Add support for accessing native bidi implementation via jni.

Include a simple test to verify that the bidi code works.
ndroid.mk
ndroidRuntime.cpp
ndroid_text_AndroidBidi.cpp
780d2a1b714724d85227141c76b3c64f543f00b4 23-Feb-2010 Kenny Root <kroot@google.com> Use UTF-8 strings to avoid duplicate caching, part 1

StringBlock instances containing UTF-8 strings use a cache to convert
into UTF-16, but using that cache and then using a JNI call to NewString
causes the UTF-8 string as well as two copies of the UTF-16 string to
be held in memory. Getting the UTF-8 string directly from the StringPool
eliminates one copy of the UTF-16 string being held in memory.

This is part 1. Part 2 will include ResXMLParser optimizations.

Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c
ndroid_util_AssetManager.cpp
ndroid_util_StringBlock.cpp
a696f5d667227365da732481770767dcb330dd23 18-Feb-2010 Mathias Agopian <mathias@google.com> Add ImageFormat.java and move the Camera/YUV constants from PixelFormat to it.

PixelFormat's corresponding constansts are now deprecated.
ndroid/graphics/YuvToJpegEncoder.cpp
ndroid_graphics_PixelFormat.cpp
76c22f180ade373ea80a25fd927d559067e21950 18-Feb-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Set error condition correctly when device is already created."
d7a0cdee1df15719fb47e33d3cc98043324d9b5e 18-Feb-2010 Kenny Root <kroot@google.com> Merge "Adjust SQLiteDatabase/Program buffer sizes"
f80efdf7e2b34ab8fec8f47052bf8386616ac312 18-Feb-2010 Kenny Root <kroot@google.com> Adjust SQLiteDatabase/Program buffer sizes

Some error messages would have clobbered some memory adjacent to them,
so increase the buffer sizes to fit them.

Change-Id: I9c4a3f3444bf57b5d2bd1b7a2546e16137747ad0
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteProgram.cpp
59d25d00a17cc41d3b4416f9c90b29fe8e349645 18-Feb-2010 Mike Lockwood <lockwood@android.com> Catch Java exceptions in the FileObserver JNI code

Change-Id: I8aed85baadef7a3ea80333b33df0743e0d349915
BUG: 2404428
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_util_FileObserver.cpp
cf5f6527401bcbd9f558e41a5b067d4d02920dc7 18-Feb-2010 Jaikumar Ganesh <jaikumar@google.com> Set error condition correctly when device is already created.

When device is already created, and we call CreateDevice, we
need to report the error correctly. Only then the SDP query
will be done from java land.
ndroid_server_BluetoothEventLoop.cpp
574ecc8ed943d0c3148bff4fd7b28d65d9cc1cad 17-Feb-2010 Kenny Root <kroot@google.com> Merge "Add better index checks for AndroidCharacter.mirror"
aec0937be65d49b280ed6e0c97b24880ddb40543 17-Feb-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "AVRCP volume controls for the docks."
073a3d56ea7505126469dd9ed4c20a7a8923690d 17-Feb-2010 Kenny Root <kroot@google.com> Add better index checks for AndroidCharacter.mirror

Fix potential invalid array access if start index is before the
beginning of the array or start + count is past the end of the array.
Update Javadoc for mirror to reflect the usage of "start" and "count".

Change-Id: I7e596de8eae5c518a2b4ff0d28604bd9c59f9d9d
ndroid_text_AndroidCharacter.cpp
8f2423e8f394ae0666f1b61f83df4c0c7a4782d9 17-Feb-2010 Mathias Agopian <mathias@google.com> get rid off the YUV formats at the libui layer
ndroid/graphics/YuvToJpegEncoder.cpp
bb9a51768d2d9dddbe2394b99a00544a3d144fac 13-Feb-2010 Kenny Root <kroot@google.com> Add API to access ICU's East Asian Width

Currently there is no way for an application built against the API to
access East Asian Width data from ICU. This adds an API for applications
to use to access it for correct drawing of international characters.

Change-Id: Iab50698ee555ae2ca8ab4b242cc14aa6e0dc3b48
ndroid_text_AndroidCharacter.cpp
4f773a13043ec22ccd2f9d33ee86a305738c5b23 16-Feb-2010 Jaikumar Ganesh <jaikumar@google.com> AVRCP volume controls for the docks.

Send volume updates to the dock when the user presses volume buttons
on the device.

Bug: 2311007
ndroid_server_BluetoothA2dpService.cpp
412dc7de6ed15221d8ed63c664f5585b0fd853bd 16-Feb-2010 Kenny Root <kroot@google.com> Fix off-by-one in parse3339 timezone check

parse3339 could read past the end of a string if the timezone was
truncated by one character causing intermittent failures in unit
tests.

Change-Id: I7e1724c6a7b464fdcb5e2b37469eb128303a51f1
ndroid_text_format_Time.cpp
a9886c580b299984e62303a995bf7b13276b5bc8 12-Feb-2010 Kenny Root <kroot@google.com> Totally remove Unicode.cpp and rely on ICU

Unicode.cpp used a packed data table for character data that essentially
duplicated ICU's functionality.

Change-Id: Ia68fe4ac94e89dc68d9a3f45f33f6e648a5500b7
ndroid_text_AndroidCharacter.cpp
000479f9e325b4e426a67033abd92d47da412725 10-Feb-2010 Mathias Agopian <mathias@google.com> split libsurfaceflinger_client and libcamera_client out of libui
ndroid.mk
ndroid_hardware_Camera.cpp
ndroid_view_Display.cpp
ndroid_view_Surface.cpp
om_google_android_gles_jni_EGLImpl.cpp
27b28b3f62bd3b54fa13acd5d035940b9be464f3 09-Feb-2010 Tobias Haamel <haamel@google.com> Introduce special UI modes for night and car usage.

The device mode is now called ui mode. Furthermore is the order of
precedence for the resources now in such a way that the ui mode needs
to be specified after the orientation and before the density.

The ui mode can be set, like it is done for the locale, as follows:

IActivityManager am = ActivityManagerNative.getDefault();
Configuration config = am.getConfiguration();
config.uiMode = Configuration.UI_MODE_TYPE_CAR | Configuration.UI_MODE_NIGHT_ANY;
am.updateConfiguration(config);

To allow users to disable the car mode and set the night mode the IUiModeManager
interface is used.

The automatic night mode switching will be added in a separate change.
ndroid_util_AssetManager.cpp
870d81d038391d1d3896e7f2fa44801d1667f5bf 08-Feb-2010 Doug Zongker <dougz@android.com> remove android.os.Base64Utils

There are no more users of this code.

Change-Id: Ie0109ece2ea329aeb9607e9193eaf0808955eab9
ndroid.mk
ndroidRuntime.cpp
ndroid_util_Base64.cpp
3ef94e25b4c896ecaa85aa2c12b8863ecdf98df0 05-Feb-2010 Vasu Nori <vnori@google.com> use sqlite 3.6.22 to print and profile the sql statetements

instead of rolling our own trace/profile code in java, lets use
sqlite 3.6.22 features. turns out sqlite does a good job of
printing the sql statements - including the ones from the triggers.
ndroid_database_SQLiteDatabase.cpp
6511fe9c9dcb2ba3e4d7891f5bbd750e703c08f0 03-Feb-2010 Barry Hayes <bhayes@google.com> Merge "Add a "dalvik.vm.gc.overwritefree" property. When set to "true", the VM will be given the "-Xgc:overwritefree" flag, and the GC will clobber the memory of freed objects."
c2b3217823444792b52d621b3cd024d64c3338e3 02-Feb-2010 Barry Hayes <bhayes@google.com> Add a "dalvik.vm.gc.overwritefree" property. When set to "true", the
VM will be given the "-Xgc:overwritefree" flag, and the GC will
clobber the memory of freed objects.
ndroidRuntime.cpp
2c94dac323bcf5c717a90b119648b6905d2c47a0 01-Feb-2010 Mathias Agopian <mathias@google.com> Merge "Don't use the MemoryDealer in CursorWindow, it's not necessary."
f5dbf6a62af04af9e88c5552aa7eeffb0a2394a4 30-Jan-2010 Wu-cheng Li <wuchengli@google.com> Remove excessive logging.

bug:2346606
ndroid_hardware_Camera.cpp
d1f74d0e3352987467f12a65b8685b60b057d9ad 30-Jan-2010 Mathias Agopian <mathias@google.com> Don't use the MemoryDealer in CursorWindow, it's not necessary.

instead use a MemoryHeapBase and MemoryBase directly.
ursorWindow.cpp
ursorWindow.h
6faf7893b6307a3295993380d61af49f2cda965c 26-Jan-2010 Mathias Agopian <mathias@google.com> Simplify the MemoryDealer implementation

At some point the implementation became complicated because of
SurfaceFlinger's special needs, since we are now relying on gralloc
we can go back to much simpler MemoryDealer.

Removed HeapInterface and AllocatorInterface, since those don't need
to be paramterized anymore. Merged SimpleMemory and Allocation.
Made SimplisticAllocator non virtual.

Removed MemoryDealer flags (READ_ONLY, PAGE_ALIGNED)

Removed a lot of unneeded code.
ursorWindow.cpp
8a4de4be9ed522c704a45a44a265669e10a8f2eb 28-Jan-2010 Jack Palevich <jackpal@google.com> Implement the GL11ExtensionPack APIs.
om_google_android_gles_jni_GLImpl.cpp
89e02edf6f92c034942b697be4eccea46930cdfb 27-Jan-2010 Chih-Chung Chang <chihchung@google.com> Merge "Add support for setting camera display orientation."
bca2d613e0d6d2630fedd302c0d779b7610adbcf 30-Nov-2009 Wei-Ta Chen <weita@google.com> Add a Java API that converts yuv data to a jpeg.

The compression is done in the native layer via calling libjpeg.

Bug: 2285598
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/YuvToJpegEncoder.cpp
ndroid/graphics/YuvToJpegEncoder.h
148fea03caed2a082387c45ae12a91561b8e41e5 26-Jan-2010 Mike Reed <reed@google.com> Merge "add API to change default config on image decoders."
d1d7706fce19a9a0cf71ff9b65f3aba9b89eeb3b 23-Jan-2010 Chih-Chung Chang <chihchung@google.com> Add support for setting camera display orientation.
ndroid_hardware_Camera.cpp
ab4a0c164b5a44d5bfd37069cfe499db31e7620c 26-Jan-2010 Mike Reed <reed@google.com> add API to change default config on image decoders.

May be called by the browser to get high-quality images when running in a 32bit window
ndroid/graphics/BitmapFactory.cpp
23f25cda0c73f8eb878844dea32fb0bd419edca2 25-Jan-2010 Eric Laurent <elaurent@google.com> Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active.

Modified AudioService.getActiveStreamType() so that STREAM_VOICE_CALL is selected when a track using this stream
type is playing.

Chanded isMusicActive() for a more generic isStreamActive(stream) method in AudioSystem, IAudioFlinger and AudioFlinger.
ndroid_media_AudioSystem.cpp
21bf222446846af90560dc55616450a1f4262d69 22-Jan-2010 Nick Pelly <npelly@google.com> Fix leak of DBus match rule.

We were registering a match for 'AudioSink', but unregistering 'audio.sink'.
This does not immediately cause an error, but stress testing of BT off/on found
that the leak causes a DBus Limits Error after ~300 iterations. It then becomes
impossible to turn BT on again until a reboot.
ndroid_server_BluetoothEventLoop.cpp
6dc9232c1c9a7ddffba24d4bd218e46894f8414d 21-Jan-2010 Mike Reed <reed@google.com> am a66baccc: Merge "Do not merge" into eclair

Merge commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb' into eclair-plus-aosp

* commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb':
Do not merge
12bcbdc681c3195069f55bd9abda900da0886c70 20-Jan-2010 Mike Reed <reed@google.com> Do not merge

port stretchy from master
ndroid/graphics/Canvas.cpp
70660425c03ac9688d749b13b48bba24d22efabf 20-Jan-2010 Mike Reed <reed@google.com> am 9f954cf2: Merge "Do not merge" into eclair

Merge commit '9f954cf27e9e2bb94c836b1686c0e07500234b27' into eclair-plus-aosp

* commit '9f954cf27e9e2bb94c836b1686c0e07500234b27':
Do not merge
1e1a7a5017ae54af144e7c7bd6ff7a2cd87146cd 19-Jan-2010 Mike Reed <reed@google.com> Do not merge

roll 1-line fix from master here. Fixes crasher when apps use custom fonts

fixes http://code.google.com/p/android/issues/detail?id=6030
ndroid/graphics/Typeface.cpp
fa101530bc74bdf1517a1840a9415249211b9414 12-Jan-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of d26707da to master

Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd
d26707da8965bffb63c55d729f19ddfcb83044b3 12-Jan-2010 San Mehat <san@google.com> am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair

Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp

* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
7ebf017658070323ed1c2bbd80c46c7cd2390d87 12-Jan-2010 San Mehat <san@google.com> framework: storage: Ensure that filesystems are unmounted before shutdown/reboot

Signed-off-by: San Mehat <san@google.com>
ndroid_os_Power.cpp
f5d95cbc1a6974afeb4d3155bdaa8dae55722a39 08-Jan-2010 Joe Onorato <joeo@android.com> less log spew
ndroid_hardware_Camera.cpp
ndroid_hardware_SensorManager.cpp
6916089e838662b41d902cd9a0d2560b04633ef9 07-Jan-2010 Dan Egnor <egnor@google.com> Remove old EventLog tests from here, they will be replaced by a
(better) EventLog test in CTS.

Fix some minor errors in the handling of too-large event log values.
ndroid_util_EventLog.cpp
dc4cc3f469097150921a20dac49a5ccb54f83788 06-Jan-2010 Joe Onorato <joeo@android.com> Stop spamming the log.
ndroid_util_AssetManager.cpp
62136d3e1c1262fc31a1f77f6d6acbd75e5ea81d 06-Jan-2010 Dan Egnor <egnor@google.com> Simplify EventLog interface -- remove supported for nested
sequences (which nobody used) and streamline the API, adding
documentation in preparation for inclusion in the SDK.

Gut and deprecate EventLogTags, which unfortunately was put
into the public SDK (an oversight). Include the functionality
in EventLog proper, in a simpler and easier to use manner.

This change doesn't actually un-@hide anything, but it does
change it to @pending.
ndroid_util_EventLog.cpp
7bcbd511731e13b9f2778e6aa6c633417d266f5e 23-Jun-2009 Marco Nelissen <marcone@google.com> Don't round size to page size. Ashmem will do this internally as needed.
ndroid_os_MemoryFile.cpp
c95a176d6f0aa48314d98f5c1f50821ac86137a7 04-Jan-2010 Dave Sparks <davidsparks@android.com> Remove some logging from camera operations. Bug 2346606.
ndroid_hardware_Camera.cpp
a6276fdd4253c3a7150ab675678c750473ab6c45 28-Dec-2009 Jack Palevich <jackpal@google.com> A library for encoding and decoding ETC1 textures.

The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.
ndroid.mk
ndroid/opengl/util.cpp
5237f019b9f3fa1f4001dc1ad27d7781d3032985 22-Dec-2009 Jean-Baptiste Queru <jbq@google.com> am c4978805: merge from open-source master

Merge commit 'c4978805dc8837570701629a9b8098e80804ad34'

* commit 'c4978805dc8837570701629a9b8098e80804ad34':
ImageButton example doesn't work. Default state should be at the last.
Time.parse3339 range checking and proper 'sec-frac' skip
c4978805dc8837570701629a9b8098e80804ad34 22-Dec-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
f7ed3a2b0fd00c517671cc986b4b44d29b60ac28 17-Dec-2009 Mike Reed <reed@google.com> am 0249c83e: am 31a69fdb: throw if we have a null typeface native instance (so we don\'t crash in native code) we may still have to native-destroy a Typeface with a null ref, so check for that

Merge commit '0249c83ed014cc6a36caac30e55db62c29c204e2'

* commit '0249c83ed014cc6a36caac30e55db62c29c204e2':
throw if we have a null typeface native instance (so we don't crash in native code)
31a69fdbe1edd8d686043e8ca7d278289f65808e 14-Dec-2009 Mike Reed <reed@google.com> throw if we have a null typeface native instance (so we don't crash in native code)
we may still have to native-destroy a Typeface with a null ref, so check for that
ndroid/graphics/Typeface.cpp
ef3308790a1a1765f551ef7ac65c62a7d36c367e 17-Dec-2009 Jaikumar Ganesh <jaikumar@google.com> am 57043a67: am 43ad522d: Merge change Ic0e32f12 into eclair-mr2

Merge commit '57043a675f8826099e619c5d325fc7670be83e0b'

* commit '57043a675f8826099e619c5d325fc7670be83e0b':
Add a callback for the ConnectSink Call.
c0e32f12439e5373dca5879e4eb7e819be7fb417 16-Dec-2009 Jaikumar Ganesh <jaikumar@google.com> Add a callback for the ConnectSink Call.

This takes care of the conditions where the bluez audio drivers
are not up and we try to make the call to connect the sink.
This would get rid of the hack in Settings app.
ndroid_server_BluetoothA2dpService.cpp
314664d2479a55b182035f0585eadd40a0e6833d 10-Dec-2009 Dianne Hackborn <hackbod@google.com> am 68a3b8b6: am 24eca800: Merge change I887f355f into eclair-mr2

Merge commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3'

* commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3':
Propagate background scheduling class across processes.
981ccfbbfd737e2bdf0cedec0089975f91fd4e0a 08-Dec-2009 Jack Palevich <jackpal@google.com> Implement Matrix Palette extension.

Adds support for formerly-unimplemented methods:

glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES

The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.

This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)

Fixes bug 2308625 "Support matrix palette skinning
in JSR239 and related APIs"

Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:

a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.

b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
om_google_android_gles_jni_GLImpl.cpp
3608891b83af9fbd1af9b9a411f2a90e52353ff8 19-Nov-2009 Jack Palevich <jackpal@google.com> Add a Java API for OpenGL ES 2.0.

Currently this API is hidden.

Add a test program.
ndroid.mk
ndroidRuntime.cpp
ndroid_opengl_GLES20.cpp
5c47265a704cb0cc081b79e191442f99014726b0 09-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ibe6eac82

* changes:
Implement Matrix Palette extension.
be6eac828f5af8b608c3fa6749330f1dcd6b6206 08-Dec-2009 Jack Palevich <jackpal@google.com> Implement Matrix Palette extension.

Adds support for formerly-unimplemented methods:

glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES

The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.

This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)

Fixes bug 2308625 "Support matrix palette skinning
in JSR239 and related APIs"

Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:

a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.

b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
om_google_android_gles_jni_GLImpl.cpp
887f355f99ff83d568ef2885a4fdcaae475583df 08-Dec-2009 Dianne Hackborn <hackbod@google.com> Propagate background scheduling class across processes.

This is a very simply implementation: upon receiving an IPC, if the handling
thread is at a background priority (the driver will have taken care of
propagating this from the calling thread), then stick it in to the background
scheduling group. Plus an API to turn this off for the process, which is
used by the system process.

This also pulls some of the code for managing scheduling classes out of
the Process JNI wrappers and in to some convenience methods in thread.h.
ndroid_util_Binder.cpp
ndroid_util_Process.cpp
feab08b9014a049c3bcd54f4e57ca36095a75593 08-Dec-2009 Eric Laurent <elaurent@google.com> am e30bae7f: am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair

Merge commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5'

* commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5':
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
0303edf9576c530f004e455bf7dd12b783928537 07-Dec-2009 Christopher Tate <ctate@android.com> am a26b0a40: am ed6dd2e6: am d3bc1994: Merge change I397b6a93 into eclair

Merge commit 'a26b0a401b6aadb45fa58d1d05b3112fbfda3fba'

* commit 'a26b0a401b6aadb45fa58d1d05b3112fbfda3fba':
Don't accidentally signal multiple exceptions in setThreadPriority()
b8341cf7c8b0b4af14ea87a4c2335e28865adff1 07-Dec-2009 Eric Laurent <elaurent@google.com> am 6d42d806: Merge change I9cc489a2 into eclair

Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
9cc489a2196e449dbe090ad9bdbc5cedd0b8334f 05-Dec-2009 Eric Laurent <elaurent@google.com> Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.

Fixed AudioFlinger::openInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to openOutput().
Modified RecordThread start procedure so that a failure occuring during the first read from audio input stream is detected and causes
the record start to fail.
Modified RecordThread stop procedure to make sure that audio input stream fd is closed before we exit the stop function.

Fixed AudioRecord JAVA and JNI implementation to take status of native AudioRecord::start() into account
and not change mRecordingState to RECORDSTATE_RECORDING if start fails.
ndroid_media_AudioRecord.cpp
ed6dd2e6a5921044ba841f17627d7a8cd444171a 04-Dec-2009 Christopher Tate <ctate@android.com> am d3bc1994: Merge change I397b6a93 into eclair

Merge commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda' into eclair-mr2

* commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda':
Don't accidentally signal multiple exceptions in setThreadPriority()
41c4bea27c7dca0223a418296182f46a82e5a050 04-Dec-2009 Christopher Tate <ctate@android.com> Don't accidentally signal multiple exceptions in setThreadPriority()

After signalling an exception due to set_sched_policy() failing (probably
because the thread in question had exited before this function was called), we
proceeded to call setpriority() anyway, and raised *another* exception when it
also failed. We don't do this any more; we just bail after signalling the first
exception.

Change-Id: I397b6a93c73d3f0870176e26759f2bec33e56205
ndroid_util_Process.cpp
fb6aafd8f90e943e40451411f9d8ef2a4b722b05 04-Dec-2009 San Mehat <san@google.com> am ca84ac88: am d345c6ac: am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch

Merge commit 'ca84ac88c7f6940677f9b796b21779e53965bf06'

* commit 'ca84ac88c7f6940677f9b796b21779e53965bf06':
base: process: Abort setting the process group if one of the threads fails to switch
d345c6acedb22c9408553ef9f38c196984177e6b 03-Dec-2009 San Mehat <san@google.com> am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch

Merge commit '0a42b811aea490a9a605b75f0320101f6eafd283' into eclair-mr2

* commit '0a42b811aea490a9a605b75f0320101f6eafd283':
base: process: Abort setting the process group if one of the threads fails to switch
0a42b811aea490a9a605b75f0320101f6eafd283 03-Dec-2009 San Mehat <san@google.com> base: process: Abort setting the process group if one of the threads fails to switch

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
726a570258828d85e401ab62fd4220812fe9344f 25-Nov-2009 Mike Lockwood <lockwood@android.com> resolved conflicts for merge of dfaf2e03 to master

Change-Id: I440d2042dd404a421789063e42102699fa33b7c0
3a32213c4029a03fe39486f3d6ebd0ea18928ee1 24-Nov-2009 Mike Lockwood <lockwood@android.com> Remove HardwareService and move vibrator support to VibratorService.

The lights support is only needed by PowerManagerService and NotificationManagerService, so we do not need a Binder API for it.
Move backlight and notification light support to new LightsService class.
The camera flash is now handled directly by the camera HAL, so the flash Hardware service flash support is obsolete.

Change-Id: I086d681f54668e7f7de3e8b90df3de19d59833c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroidRuntime.cpp
ndroid_os_Hardware.cpp
4f4fdf6dc3cd79bb8ec9eeb2a1775b146cd639b1 23-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am 09e27c4a: am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair

Merge commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3'

* commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3':
Fix pairings lost on reboot.
8631e55425b2ab81eb74396e6834c6f7a4549804 23-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am ad431ad8: Merge change Ia3acc2ee into eclair

Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2

* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.
ad431ad8631d8b19b04193ff1f89a955a7643c60 23-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ia3acc2ee into eclair

* changes:
Fix pairings lost on reboot.
5973cbc163e9d12782c7003bc2b89884cc535311 21-Nov-2009 Dianne Hackborn <hackbod@google.com> am e71db657: am f2900600: am 1824ec8c: Merge change If2b0bbed into eclair

Merge commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20'

* commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20':
Debugging for issue #2228381 android.view.InflateException
f29006000cfbcf7732df5d5432ab5ff8a2dbf691 21-Nov-2009 Dianne Hackborn <hackbod@google.com> am 1824ec8c: Merge change If2b0bbed into eclair

Merge commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2

* commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8':
Debugging for issue #2228381 android.view.InflateException
b8d81679553ee33f6ae5281310abf2effca4ffcd 20-Nov-2009 Dianne Hackborn <hackbod@google.com> Debugging for issue #2228381 android.view.InflateException

Binary XML file line #37: Error inflating class <unknown> after adding a secondary account

Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)

Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
ndroid_util_AssetManager.cpp
8914a04b16791cda98de88b5f94d9fee3acedfca 20-Nov-2009 Vasu Nori <vnori@google.com> am 483ae632: am 5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt

Merge commit '483ae6328701d29e9731af25c64b09b1e18bc2e7'

* commit '483ae6328701d29e9731af25c64b09b1e18bc2e7':
maintain cache of statementids returned by sqlite upon compiling a sql stmnt
5a03f36ef845f73eb4473193dbb0f93dd12a51af 21-Oct-2009 Vasu Nori <vnori@google.com> maintain cache of statementids returned by sqlite upon compiling a sql stmnt
ndroid.mk
ndroidRuntime.cpp
ndroid_database_SQLiteCompiledSql.cpp
ndroid_database_SQLiteProgram.cpp
b148bc844e5eddb07bef2fd1b4b754716decb43e 20-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> Fix pairings lost on reboot.

Bug:2277376
Dr No:Eastham
android_server_BluetoothEventLoop.cpp.swp
560814f6b11abe83ff0c4ed18cac015c276b3181 19-Nov-2009 Jack Palevich <jackpal@google.com> Add a Java API for OpenGL ES 2.0.

Currently this API is hidden.

Add a test program.
ndroid.mk
ndroidRuntime.cpp
ndroid_opengl_GLES20.cpp
6c2d4029f1fecb51e0b002e652fd18e18d059fe0 20-Jul-2009 Kenny Root <kenny@the-b.org> Time.parse3339 range checking and proper 'sec-frac' skip

The parse3339 JNI code doesn't properly do bounds checking on the input String.
These changes do some bounds checking to prevent a buffer underflow condition.

parse3339 should allow the fractional seconds to be optional and an arbitrary
length as specified in RFC 3339. This will scan through arbitrary precision
until it finds the timezone indicators.

Change-Id: Ie9d01d0b24163d893c58c747d37873c83b74e6c7
ndroid_text_format_Time.cpp
9db3d07b9620b4269ab33f78604a36327e536ce1 13-Nov-2009 Jean-Baptiste Queru <jbq@google.com> eclair snapshot
android_server_BluetoothEventLoop.cpp.swp
ctivityManager.cpp
ndroid.mk
ndroidRuntime.cpp
ursorWindow.cpp
ursorWindow.h
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Typeface.cpp
ndroid/opengl/util.cpp
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_bluetooth_Database.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_bluetooth_RfcommSocket.cpp
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_emoji_EmojiFactory.cpp
ndroid_hardware_Camera.cpp
ndroid_location_GpsLocationProvider.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_ToneGenerator.cpp
ndroid_net_NetUtils.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_opengl_GLES11.cpp
ndroid_os_Debug.cpp
ndroid_os_Exec.cpp
ndroid_os_MemoryFile.cpp
ndroid_os_SystemProperties.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
ndroid_text_format_Time.cpp
ndroid_util_Binder.cpp
ndroid_util_Binder.h
ndroid_util_EventLog.cpp
ndroid_util_Process.cpp
ndroid_view_Surface.cpp
om_google_android_gles_jni_EGLImpl.cpp
om_google_android_gles_jni_GLImpl.cpp
2ff953f97044fbe8d640b9a0c9a3e367cb283242 06-Nov-2009 Jared Suttles <jared.suttles@motorola.com> am cfa254fe: am 1ae7831b: am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting

Merge commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9'

* commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9':
jni: GpsLocationProvider: Check for pending callbacks before waiting
1ae7831b8a90a9c0c614790027ce88d5fe75cf93 06-Nov-2009 Jared Suttles <jared.suttles@motorola.com> am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting

Merge commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-mr2

* commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f':
jni: GpsLocationProvider: Check for pending callbacks before waiting
8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f 04-Nov-2009 Jared Suttles <jared.suttles@motorola.com> jni: GpsLocationProvider: Check for pending callbacks before waiting

This change fixes a corner case where a callback may not get handled until
a second callback arrives. This can happen because there is a significant
section of the wait_for_event function where the mutex is not locked, and
the sPendingCallbacks member could be updated. We now check to see if
there is a pending callback to handle before we wait for another callback.

Change-Id: I20cfae1e780944bb74133940dda032efc4c55540
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
e7c6644778d872a4736fff3eeeae44c914f1d773 05-Nov-2009 Eric Laurent <elaurent@google.com> am 653d5d41: am fcae6c71: am 67b69292: Merge change I93f500a5 into eclair

Merge commit '653d5d415c3447a4250120548bf32d1ee63fe36f'

* commit '653d5d415c3447a4250120548bf32d1ee63fe36f':
Fix issue 2203561: Sholes: audio playing out of earpiece.
fcae6c71794696a074cabf20beeb02fd87853e30 05-Nov-2009 Eric Laurent <elaurent@google.com> am 67b69292: Merge change I93f500a5 into eclair

Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue 2203561: Sholes: audio playing out of earpiece.
bda7469d9b1ec6d9c9d6da40ddf64dc39ff271a9 04-Nov-2009 Eric Laurent <elaurent@google.com> Fix issue 2203561: Sholes: audio playing out of earpiece.

Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.

Same modifications for AudioRecord.

Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
ndroid_media_ToneGenerator.cpp
514ee74db4caa927ebf3fee0b46f023312dc3e2b 02-Nov-2009 Mike Reed <reed@google.com> am 2cacabae: am 58d30b69: am 1864d01f: Merge change Iae849da2 into eclair

Merge commit '2cacabaea9beabb0019b38a4734c1297ffeff607'

* commit '2cacabaea9beabb0019b38a4734c1297ffeff607':
add table maskfilter
58d30b69071363aba38307bc5ee3b2d81f22f09d 30-Oct-2009 Mike Reed <reed@google.com> am 1864d01f: Merge change Iae849da2 into eclair

Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-mr2

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
add table maskfilter
1864d01f2be0e82da7d8844fa91bee8880282041 30-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Iae849da2 into eclair

* changes:
add table maskfilter
0e1e62301112a51d9b91ac4ac31c406d726f93ab 29-Oct-2009 Mike Reed <reed@google.com> add table maskfilter

hidden for now, since it need only be seen by Launcher2

http://b/issue?id=2210685
ndroid/graphics/MaskFilter.cpp
351621907a718dd82faef18b1e68401a1fd47a74 30-Oct-2009 San Mehat <san@google.com> am 9d91da02: am 67ef832c: am 957e5867: process: Disable debugging

Merge commit '9d91da02d9dd83caad87279002a67780a2480623'

* commit '9d91da02d9dd83caad87279002a67780a2480623':
process: Disable debugging
3e883fb1c89bb3ca95be3808e45c634dead7e98c 30-Oct-2009 San Mehat <san@google.com> am 3e28a104: am 574b99bf: am 8e312e81: Merge change Ia5109a87 into eclair

Merge commit '3e28a1047975d46a2754bb3092344686d3733cfe'

* commit '3e28a1047975d46a2754bb3092344686d3733cfe':
process: Add debug code to log process group transitions
599d0fe5a2f3da14dfefb7a5b83d0ba8230724ab 30-Oct-2009 Jack Palevich <jackpal@google.com> am 9009d51f: am 5be6eedf: am b575e4df: Merge change I4a943184 into eclair

Merge commit '9009d51f258efaf092c1a3dc367dd2ec320c50ea'

* commit '9009d51f258efaf092c1a3dc367dd2ec320c50ea':
Avoid trying to throw multiple exceptions at once.
67ef832cdba6ca5aa8c44b6eab9c4281c0a0f261 30-Oct-2009 San Mehat <san@google.com> am 957e5867: process: Disable debugging

Merge commit '957e58670baad8c5995f1368e3b5280f0dbd891f' into eclair-mr2

* commit '957e58670baad8c5995f1368e3b5280f0dbd891f':
process: Disable debugging
574b99bfcd743d35c2d7e656ce46e282c784168e 30-Oct-2009 San Mehat <san@google.com> am 8e312e81: Merge change Ia5109a87 into eclair

Merge commit '8e312e8160ef0cae569b6127591ee72c70bfda41' into eclair-mr2

* commit '8e312e8160ef0cae569b6127591ee72c70bfda41':
process: Add debug code to log process group transitions
5be6eedf3b6979679f46adfb47890005173e8caf 30-Oct-2009 Jack Palevich <jackpal@google.com> am b575e4df: Merge change I4a943184 into eclair

Merge commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe' into eclair-mr2

* commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe':
Avoid trying to throw multiple exceptions at once.
957e58670baad8c5995f1368e3b5280f0dbd891f 29-Oct-2009 San Mehat <san@google.com> process: Disable debugging

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
8e312e8160ef0cae569b6127591ee72c70bfda41 29-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ia5109a87 into eclair

* changes:
process: Add debug code to log process group transitions
a5109a878eeff22e32ee5ce1b1cd15e8daad5234 29-Oct-2009 San Mehat <san@google.com> process: Add debug code to log process group transitions

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
5a3727903e4c87f608e8a9c946ae15987249d775 29-Oct-2009 Mike Reed <reed@google.com> am b26ab463: am 10d32a33: Merge change I16dc1411 into eclair-mr2

Merge commit 'b26ab4635555dee35b620ffef2aa53cf242b4b02'

* commit 'b26ab4635555dee35b620ffef2aa53cf242b4b02':
add boundary patch
4a943184544159a57ca749af53bab0f1a98435a1 29-Oct-2009 Jack Palevich <jackpal@google.com> Avoid trying to throw multiple exceptions at once.

The typical usage pattern for the get_char helper function is:

bool thrown = false;

n = get_char(env, s, 0, 1000, &thrown);
n += get_char(env, s, 1, 100, &thrown);
n += get_char(env, s, 2, 10, &thrown);
n += get_char(env, s, 3, 1, &thrown);
if (thrown) return false;

As you can see, get_char is called multiple times before the
thrown flag is checked. If the input text contains multiple
incorrect characters, then we have to guard against throwing
the same exception multiple times. (Because doing so will
cause the Dalvik runtime to abort.)

The fix is simple: modify get_char to check if an exception
has already been thrown before throwing a new exception.
ndroid_text_format_Time.cpp
c04851fd0af87f44a7d7351e0c17442fa1d3fc28 28-Oct-2009 Mike Reed <reed@google.com> add boundary patch
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
4572edb287bdba902ffa92379fe14e88ad2e5da9 24-Oct-2009 Andrew Harp <andrewharp@google.com> am fb324e70: am adddd24f: am 78a50aa1: Merge change If3c30fc9 into eclair

Merge commit 'fb324e706e487738b3edbaca67bdf459fafcd4ea'

* commit 'fb324e706e487738b3edbaca67bdf459fafcd4ea':
Patching in hidden API to allow app managed preview frame buffers.
adddd24f31291f733cd5f72898b92f13f37ae37c 24-Oct-2009 Andrew Harp <andrewharp@google.com> am 78a50aa1: Merge change If3c30fc9 into eclair

Merge commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40' into eclair-mr2

* commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40':
Patching in hidden API to allow app managed preview frame buffers.
78a50aa1db6572ba7d9f9d91c6eb16f993c09f40 24-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change If3c30fc9 into eclair

* changes:
Patching in hidden API to allow app managed preview frame buffers.
31f4c2d653324bd8cbe7470e2f8bdb36c2196194 24-Oct-2009 Jack Palevich <jackpal@google.com> am a9046729: am a2ec1f4c: am 8f89a1a3: Merge change Ic620a52b into eclair

Merge commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c'

* commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c':
Add size checks for glBufferData and glBufferSubData
a2ec1f4cea5531fb824b3fb2802ef4573a4916d9 24-Oct-2009 Jack Palevich <jackpal@google.com> am 8f89a1a3: Merge change Ic620a52b into eclair

Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-mr2

* commit '8f89a1a360465e08e81ceca3cb3042606a98668b':
Add size checks for glBufferData and glBufferSubData
94927dffce1626898b59579dfc5af53b5de8cef6 20-Oct-2009 Andrew Harp <andrewharp@google.com> Patching in hidden API to allow app managed preview frame buffers.

Commit-Id: If3c30fc932697afa966cc97b17749e9996de92ee
ndroid_hardware_Camera.cpp
c620a52b69a5f29563e06497e30877809f5d67a5 21-Oct-2009 Jack Palevich <jackpal@google.com> Add size checks for glBufferData and glBufferSubData

Without the size checks it's possible for calls to glBufferData
and glBufferSubData to read off the end of the Buffer object's
data, which can cause page faults.

Fix end-of-line characters for the "spec" files. (That's why
every line of these files is changed.)

Enhance our code emitter to properly handle bounds checks for
possibly-null pointers.
ndroid_opengl_GLES11.cpp
om_google_android_gles_jni_GLImpl.cpp
2cd5250abbfd6b652ebc7055ff4958751adeee5f 15-Oct-2009 Nick Pelly <npelly@google.com> am aeed585d: am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."

Merge commit 'aeed585d19f4db006ca765eed37d629831e4b563'

* commit 'aeed585d19f4db006ca765eed37d629831e4b563':
Revert "Remove STOPSHIP comment."
43f2b4e9c6811e0411446336ac4118565aa8eb88 14-Oct-2009 Nick Pelly <npelly@google.com> am 53f33d84: Revert "Remove STOPSHIP comment."

Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-mr2

* commit '53f33d84776a0bad668e361365a7049b16f8a929':
Revert "Remove STOPSHIP comment."
53f33d84776a0bad668e361365a7049b16f8a929 14-Oct-2009 Nick Pelly <npelly@google.com> Revert "Remove STOPSHIP comment."

This reverts commit 3d0726b4d8a30e57852b70f1dcf4d8d20508cd1e

Change-Id: Ie1ce5d09cc0b799ef0799f30eedc95f0ca5d3fad
DrNo: jerrryw
ndroid_server_BluetoothEventLoop.cpp
09897fb287b74f7f60109217e17248ea52dd1036 14-Oct-2009 Nick Pelly <npelly@google.com> am b355695a: am 52cb8557: am a04ca9b4: Merge change I2492bffe into eclair

Merge commit 'b355695a093df11387828b3c588fd05c04b8907b'

* commit 'b355695a093df11387828b3c588fd05c04b8907b':
Remove STOPSHIP comment.
52cb8557525c1b25163cd5e4ad317a7a64119aae 14-Oct-2009 Nick Pelly <npelly@google.com> am a04ca9b4: Merge change I2492bffe into eclair

Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-mr2

* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
Remove STOPSHIP comment.
3d0726b4d8a30e57852b70f1dcf4d8d20508cd1e 14-Oct-2009 Nick Pelly <npelly@google.com> Remove STOPSHIP comment.

Change-Id: I2492bffe57bded65fdbef5cf98e22cef3937e537
DrNo: eastham
Bug: 2089423
Joke: Why don't anteaters get sick? Because they're full of anty-bodies!
ndroid_server_BluetoothEventLoop.cpp
416dd8e60aa57acaa868761cedce883358ae31d0 14-Oct-2009 Zheng BaoZhong <bao-zhong@motorola.com> am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2

Merge commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca'

* commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca':
Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
de553351bf25b60873fd5b5bcefb46b550e104aa 12-Oct-2009 David 'Digit' Turner <digit@google.com> am 4c220bd0: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

Merge commit '4c220bd0f32b93314c4c1bff328bd815265ef117'

* commit '4c220bd0f32b93314c4c1bff328bd815265ef117':
Encourage developers to connect RFCOMM by UUID instead of Channel.
1d4eb8843e4455c429297e97edb31cb81ae1874d 12-Oct-2009 Jeff Hamilton <jham@android.com> am 254d7ecd: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

Merge commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9'

* commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9':
add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
83a880065fcb4450a866203ef84d75a50c1f0a98 12-Oct-2009 Wu-cheng Li <wuchengli@google.com> am 3616d154: am 80fff7a5: am 962f2536: Merge change I547cff66 into eclair

Merge commit '3616d15451734bd3b563d73f9c2f25c19d7df75c'

* commit '3616d15451734bd3b563d73f9c2f25c19d7df75c':
Add zoom functions and sendCommand.
4c08b8b5b8234aaadc62092ad3fe77b33930e639 12-Oct-2009 Nick Pelly <npelly@google.com> am a1cb6a64: am 460965c2: am 24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record.

Merge commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09'

* commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
178447e633218160f8adac0f8d42c0af739a6ca8 12-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> am f2b80d8c: am d453fe67: Merge change I5dbd1994 into eclair

Merge commit 'f2b80d8ccc9b8d775eb0171bd8f170f251a7314e'

* commit 'f2b80d8ccc9b8d775eb0171bd8f170f251a7314e':
Fix rfcomm socket connect return code.
038e315cded93edff840cfe108fdb3c47a525d7e 10-Oct-2009 Zheng BaoZhong <bao-zhong@motorola.com> Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID

bug b/2178462

Change-Id: I409d9b4a163299c3383ec092cd2368a9d24236cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_net_wifi_Wifi.cpp
16fb88a673c41b93c5d57ccb28c2697e7d87701a 07-Oct-2009 Nick Pelly <npelly@google.com> Encourage developers to connect RFCOMM by UUID instead of Channel.

Hide createRfcommSocket(int channel)
Add createRfcommSocketWithServiceRecord(UUID uuid)

Rename listenUsingRfcomm(String,UUID) -> listenUsingRfcommWithServiceRecord(..)

Now we have a complete API for developers to make peer-peer RFCOMM connections
with hard-coding the limited (30) RFCOMM channels, instead using SDP lookup
of an UUID.

This commit addresses two serious bugs:
- Do not throw IOException on accepting an incoming RFCOMM connection with
BluetoothSocket. This was a regression from commit 24bb9b8af4ff6915
- Workaround failure of bluez to update SDP cache when channel changes by
trying to use the same RFCOMM channel on the server every time, instead
of picking server channels randomly. This is a pretty ugly workaround,
and we are still trying to fix the caching issue - but with this
workaround we are at least shippable and apps will work at least until
they start colliding on the 30 RFCOMM channels.

DrNo: eastham
Bug: 2158900
Joke: What did the digital watch say to his mom? "Look mom no hands."
Change-Id: Ia4879943b83afac06b6f1a3f2391cf1628afce7d
ndroid_server_BluetoothEventLoop.cpp
a78b0a2d9ebb38b86ed802b3d86de07d0b301262 07-Oct-2009 Mike Reed <reed@google.com> add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.

Knowing that a 32bit bitmap is opaque is a performance boost for some blits.
ndroid/graphics/Bitmap.cpp
36f68b8f24df906c969581b0b8e1a47f95dc03cb 29-Sep-2009 Wu-cheng Li <wuchengli@google.com> Add zoom functions and sendCommand.

b2060030
ndroid_hardware_Camera.cpp
24bb9b8af4ff691538fe9e517e8156016b0da6cd 03-Oct-2009 Nick Pelly <npelly@google.com> Provide an API for apps to use a dynamic RFCOMM channel and SDP record.

Hide listenUsingRfcommOn(int channel)
Add listenUsingRfcomm(String name, ParcelUuid uuid)

The new API automatically finds a free RFCOMM channel and registers an SDP
record with the given uuid and name. The SDP record is automatically
removed when the socket is closed, or if the application dies.

Apps are prevented from registering SDP records with the uuid of system
Bluetooth profiles, such as A2DP, HFP and OPP.

Apps are prevented from removing SDP records that they did not create. This is
tracked by pid.

TODO: Provide an API for the connecting app to look up an SDP record.

Bug: 2158900
DrNo: eastham
Joke: "What did the dog say to the tree? bark."
Change-Id: Ia92f51c34615a7270a403255ad2b8faa98c4a3f5
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_server_BluetoothService.cpp
88d32062bcb8a65aada1873dc0dfc2b60c22f426 02-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ibdced0b5

* changes:
Remove unused #includes.
a01a4479a13d13f4abf773f24604124acb063c9f 02-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> Fix rfcomm socket connect return code.

The phone would say connected even when powered off.
Bug id: 2161890
DrNo: Hiroshi

Change-Id: I5dbd19941a80e86c7462670fb844a29cf4eb0908
ndroid_bluetooth_HeadsetBase.cpp
bdced0b58c00b8b6c452ee3fb2fc0cbe02080498 02-Oct-2009 Elliott Hughes <enh@google.com> Remove unused #includes.

(Part of removing adb networking support.)

Bug: 1122968
ndroid_net_LocalSocketImpl.cpp
0865a3adf92331c2ed166e266c67883fbfede894 01-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> am eff77e9a: am 8ad6d524: Merge change I55e15bad into eclair

Merge commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7'

* commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7':
Try to reconnect twice when the rfcomm error code is Connection Refused.
e7b2d93f2284636c0562cf1ae51aa960f12f36bd 01-Oct-2009 Zhu Lan <mtcb47@motorola.com> am ba61cff4: am e5661c40: Merge change I8366852f into eclair

Merge commit 'ba61cff482a048131937d82f0d9652c799383314'

* commit 'ba61cff482a048131937d82f0d9652c799383314':
Bluetooth A2DP suspend/resume functionality
a085d5e747bd7ff0c68cd104bf20f32275c1c118 01-Oct-2009 Dianne Hackborn <hackbod@google.com> am 0b03fa8b: am 490d5222: Merge change I6cacaa0d into eclair

Merge commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad'

* commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad':
Hack to fix issue #2125365: Sports Trivia compatability with Eclair
54172d92afec5d7d18c830d7428a3230a39d4c02 29-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Try to reconnect twice when the rfcomm error code is Connection Refused.

This happens when the the remote headset is in a bad state or is
not accepting connections. Try twice before giving up.

Change-Id: I55e15bad6b72904b8e4ccbca89e17e9bd3ddb61e
ndroid_bluetooth_HeadsetBase.cpp
f9bbe1e71a502fe7bd1f4a23ba5bbe4dde0d9d57 24-Jun-2009 Zhu Lan <mtcb47@motorola.com> Bluetooth A2DP suspend/resume functionality

Change-Id: I8366852fa9b6ff9dacf18db00ea1c2be0c00ff34
ndroid_server_BluetoothA2dpService.cpp
afa78967b8553443aa32579d78970a076d7581f6 29-Sep-2009 Dianne Hackborn <hackbod@google.com> Hack to fix issue #2125365: Sports Trivia compatability with Eclair

Adds a mechanism to tell Paint the scaling factor its target
canvas will have, for it to compute font metrics based on the
correct font size. Only TextView uses this, but that is enough
for the large majority of apps.

Change-Id: I6cacaa0dd26d40ee3ad959bed0028678d6e9016e
ndroid/graphics/Paint.cpp
15039f91d00a9c82042e2d4b6d688d619f531cd9 28-Sep-2009 Nick Pelly <npelly@google.com> am 3ecb11e0: am 65dea14c: Merge change 27129 into eclair

Merge commit '3ecb11e099e8c0c84381c38775103cc7d42234d6'

* commit '3ecb11e099e8c0c84381c38775103cc7d42234d6':
Bounds check read and write path in native code.
57a2292bffedaa3fb8f5cd6b0867fdd5772ad3b5 25-Sep-2009 Nick Pelly <npelly@google.com> Bounds check read and write path in native code.

Already checked in Java, but requested by security review.

Change-Id: I5314dbc32546278b977236a154fba03f38610b1a
ndroid_bluetooth_BluetoothSocket.cpp
561837422a52cb98a074ba1539b40029da9e4cef 25-Sep-2009 Nick Pelly <npelly@google.com> am b2209a35: am 1a42cfac: Use LM_SECURE when auth && encrypt.

Merge commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523'

* commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523':
Use LM_SECURE when auth && encrypt.
0cff245456b170392a13fbcb1f85824bbce37593 25-Sep-2009 Chih-Chung Chang <chihchung@google.com> am 5e367bfe: am 0665ae22: Merge change 26939 into eclair

Merge commit '5e367bfe0726d7d7108279721179dcd6de326ee5'

* commit '5e367bfe0726d7d7108279721179dcd6de326ee5':
Fix 2101425: Camera crashes spontaneously in preview.
ec44a6932a1e03c09a3b9871d5ccb1faf9d5ab8e 25-Sep-2009 Mike Reed <reed@google.com> am e493bf79: am 9251c344: Merge change 26851 into eclair

Merge commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa'

* commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa':
use new setDither on ImageRef to retain that setting for purgeable images
466ccfd9efa0e5a3d068c2dbc4503b9288d92989 25-Sep-2009 Dianne Hackborn <hackbod@google.com> am 5ddbc0d5: am de0dfb7b: Fix issue #2125720 Weather Forecast Widget - graphics do not scale

Merge commit '5ddbc0d59d8143d50a19950624c38fdb8102156b'

* commit '5ddbc0d59d8143d50a19950624c38fdb8102156b':
Fix issue #2125720 Weather Forecast Widget - graphics do not scale
1a42cfac152faa98c2e3d9e9fd6889209de195fe 25-Sep-2009 Nick Pelly <npelly@google.com> Use LM_SECURE when auth && encrypt.

LM_SECURE enforces man in the middle (MITM) protection.

Change-Id: Ia800bb657b429f8872d72072f7c9450a74028af0
ndroid_bluetooth_BluetoothSocket.cpp
0665ae22aa51183d6ff5fdd0abeee0344306e89d 25-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26939 into eclair

* changes:
Fix 2101425: Camera crashes spontaneously in preview.
6157de0e2d87568d6d5071b11aeb033a7986b279 25-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2101425: Camera crashes spontaneously in preview.

The problem is we missed an "obj" parameter while calling
postEventFromNative (which put it in a field of a Message object),
so a garbage value on stack is used.

When the GC tries to follow that "obj" field, expecting to find
another object, it crashes.
ndroid_hardware_Camera.cpp
9251c344596847c4cd4cf5782fde078459fa4cea 24-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26851 into eclair

* changes:
use new setDither on ImageRef to retain that setting for purgeable images
17154417e8ad488d18d9133bf802f598e7506483 24-Sep-2009 Mike Reed <reed@google.com> use new setDither on ImageRef to retain that setting for purgeable images
ndroid/graphics/BitmapFactory.cpp
de0dfb7b65a02d4dd74c271b558adee0973fc267 23-Sep-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2125720 Weather Forecast Widget - graphics do not scale

I forgot to add the new density field to the Bitmaps' parcelable data.

Change-Id: I77cf3e93e356297e0caed6fc71b62b5cd8f79124
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_emoji_EmojiFactory.cpp
8f7bd3031a23d07b5cc9fb21d78bd6d89095516c 21-Sep-2009 Wu-cheng Li <wuchengli@google.com> am cd3a0242: am ffe1cf25: Unhide Camera lock and unlock API.

Merge commit 'cd3a02425179ea881f3534d687c143a2ce683684'

* commit 'cd3a02425179ea881f3534d687c143a2ce683684':
Unhide Camera lock and unlock API.
ffe1cf251a4f8469695b8acfa37270684dc1b70c 10-Sep-2009 Wu-cheng Li <wuchengli@google.com> Unhide Camera lock and unlock API.
ndroid_hardware_Camera.cpp
34e4f6267e3310f95a1f000cb331d6f99329d591 20-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> am 1781edd2: am 0647b580: Merge change 25970 into eclair

Merge commit '1781edd28639b23443f9d319d1e5cea41acab8e9'

* commit '1781edd28639b23443f9d319d1e5cea41acab8e9':
Make removeBond() call async.
995ae82f38d93050a5f1b80433e8ae844a05953d 20-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Make removeBond() call async.

This call has been synchronus since Bluez3.36.
However, since the semantics for all Bluetooth API calls are
asynchronous make this so too. It does fix an occasional ANR
seen while unpairing.

Change-Id: If81f8ec262ea1f6f62775282ab33855a8669c41a
ndroid_server_BluetoothService.cpp
f1aa097ddccd2cc15d2bed8fc46b1ae96a1d79f6 19-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> am 480a353f: am ac810e53: Merge change 25779 into eclair

Merge commit '480a353f589035b62a81e2981cfba325ad1264f2'

* commit '480a353f589035b62a81e2981cfba325ad1264f2':
Add new API for fetching UUIDs using SDP.
1caa6d111eff6814760ec156b14adc29aa3aae6c 18-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Add new API for fetching UUIDs using SDP.

Add new API which clients can use to force an SDP query.
The result is broadcast using an intent having the UUIDs.
The intent is broadcast after a timeout, in case of an error.
This timeout is greater than the page timeout.

Change-Id: I61e6db4c05b34c42f679a66987e37e2063a793b6
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
254879491358a6b55cd2b85e88291d72e78bd89c 17-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> am 7a00336c: am cfc7f1aa: Merge change 25382 into eclair

Merge commit '7a00336cadace0f7c1a3151953709a739c073337'

* commit '7a00336cadace0f7c1a3151953709a739c073337':
Fix async calls with Connect And Disconnect Sink.
ae5e468f65323231872a809d16cc51afc86ca9cf 17-Sep-2009 Chih-Chung Chang <chihchung@google.com> am e8f77e69: am 244f8c26: Fix 2083478: Camera needs an auto-focus cancel API

Merge commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762'

* commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762':
Fix 2083478: Camera needs an auto-focus cancel API
18cc8fb5372824e445869c8fa746c5aa0ca5ebc6 17-Sep-2009 San Mehat <san@google.com> am d5b281f4: am aa931bcb: Merge change 24841 into eclair

Merge commit 'd5b281f4b4e018a41846f1e81d02e75059bf7030'

* commit 'd5b281f4b4e018a41846f1e81d02e75059bf7030':
process: Switch to common cutils sched_policy api
4f3ebc43af1f254d99e1cf64620ff94d28023bd2 17-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Fix async calls with Connect And Disconnect Sink.

Change-Id: I814c7fdf40ec0d6aefeb410b1a1b1572ab4a8d88
ndroid_server_BluetoothA2dpService.cpp
01c0a12985061225e462eecf8f4f8c91ccd57a6e 15-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> am e08e60a7: am 32d8571f: Changes for BT 2.1

Merge commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0'

* commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0':
Changes for BT 2.1
295c900011e2247daa14aa6857fc8bb6e19539e0 15-Sep-2009 Dianne Hackborn <hackbod@google.com> am b7860bea: am 8cae124a: Various cleanup around resources and nine-patches.

Merge commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517'

* commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517':
Various cleanup around resources and nine-patches.
1006988baf07671ee7d4d13e44b9fa2cc0fcfd31 15-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> am e291ee80: am 7ff269f3: Merge change 24735 into eclair

Merge commit 'e291ee80006e2c91480d1d856a3771ec6b7c2cc8'

* commit 'e291ee80006e2c91480d1d856a3771ec6b7c2cc8':
Handle DisconnectRequested message sent by Bluez.
c1523fdf31e30d6e79dad56b9f4181954737728f 15-Sep-2009 Mike Reed <reed@google.com> am e450e55d: am d68781ac: Merge change 24675 into eclair

Merge commit 'e450e55d6395a3052f93946da42757a7f6df2ad1'

* commit 'e450e55d6395a3052f93946da42757a7f6df2ad1':
change default for dither to true
244f8c26365a303d9dd861bd48a29a4b48578da1 15-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix 2083478: Camera needs an auto-focus cancel API

Change-Id: I13bda991b32aee47e82b5cf9d43b3021c416a9a2
ndroid_hardware_Camera.cpp
242d65bf9faf1d2bc3468490e510551140e23462 12-Sep-2009 San Mehat <san@google.com> process: Switch to common cutils sched_policy api

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
32d8571f509c392dca732c243e9b2138c15daecf 11-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Changes for BT 2.1

1) Handle incoming 2.1 pairing requests
2) Modify displaying error messages on bond failures.
3) Add delay while accepting incoming pairing for certain 2.1 devices.
When MITM is on, the link key request might come more than once.
Auto accept with a delay.
4) Handle DisplayPasskey callback for pairing a 2.1 keyboard with
a 2.1 device
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
8cae124af2142687a6833dbaab8a43df6dd67b43 10-Sep-2009 Dianne Hackborn <hackbod@google.com> Various cleanup around resources and nine-patches.

Remove the stuff that doesn't use preloaded drawables when in
compatibility mode, since this works fine ever since we were able
to deal with drawables in a different density than the canvas.

Change the snapshot function on View to return a snapshot at
the same size that will actually be drawn on screen (when in
compatibility mode), to be able to show scaling artifacts and
all.

This change was original an attempt to fix issue #2101917: Text
field edges appears to be improperly rounded. That turns out to
probably be something deeper in the graphics system, but also
included here is the debugging code I did to try to track down the
problem to make it easy to turn on again later.

Change-Id: I34bfca629639c7ff103f3989d88874112ef778d9
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
acc56ec7d75a0ed09d0e03bc15f6c9e8ee75999b 11-Sep-2009 Ben Cheng <bccheng@android.com> Add support to suppress individual JIT optimizations.
ndroidRuntime.cpp
7ff269f359a8848fd0c39993d8fe21a8324806f9 11-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24735 into eclair

* changes:
Handle DisconnectRequested message sent by Bluez.
5e59ca8ae4e29efb77acbd5513dcc109ea5dd2b4 11-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Handle DisconnectRequested message sent by Bluez.
ndroid_server_BluetoothEventLoop.cpp
211db4a2874f1a2d0e7a8cb8d33e81fa08801763 11-Sep-2009 Mike Reed <reed@google.com> change default for dither to true
ndroid/graphics/NinePatchImpl.cpp
181b31a0d87d525ea64102a965210331e0c6885b 09-Sep-2009 San Mehat <san@google.com> Process: Add support for using scheduler policies instead of cgroups.
Preference is given to cgroups if available.

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
96c08a69ea0b95d1d8a8edb67f73bd9548e09f16 07-Sep-2009 Eric Laurent <elaurent@google.com> Fix issue 1992233: DTMF tones on Sholes is really long.

Add a parameter to ToneGenerator.startTone() allowing the caller to specify the tone duration. This is used by the phone application to have a precise control on the DTMF tone duration which was not possible with the use of delayed messaged.
Also modified AudioFlinger output threads so that 0s are written to the audio output stream when no more tracks are ready to mix instead of just sleeping. This avoids an issue where the end of a previous DTMF tone could stay in audio hardware buffers and be played just before the beginning of the next DTMF tone.
ndroid_media_ToneGenerator.cpp
0586a1b77a788a119166a37fccd909bf9ed65f23 07-Sep-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2095422: Some fades from opaque to transparent don't work

ViewRoot was using Surface.clear(), which has different behavior
in different processes -- in the system process it would kill the
surface, causing all windows in that process to immediately disappear
instead of animating away.

This change makes Surface.release() public and uses that instead. It
also renames Surface.clear() to Surface.destroy().

Also fixed some issues in the window manager that were causing the
wallpaper to not get immediately resized when the orientation changes
and its target window is removed and re-added.

Change-Id: I2a992e365cf5747511f0bf1193db32dc2525b218
ndroid_view_Surface.cpp
eb40aae254642dfcb333798c642920814b410115 04-Sep-2009 Eddie Ho <eddie_ho@htc.com> GPS: Fix race condition reporting NMEA data.

Change-Id: I80997e2686d9c08d7d2def094f9922e83cf41013
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
d4c1baf93708ad4e90c556e6041a498dbffaaba0 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23646 into eclair

* changes:
Immediately destroy BluetoothSocket's on close().
71c3c7806acb2b2b7b8441817c26a2101d447bbe 02-Sep-2009 Nick Pelly <npelly@google.com> Immediately destroy BluetoothSocket's on close().

Unfortunatley, shutdown() on the underlying fd does not actually stop a
listening socket from listening. You need to call close() on the fd to
do this. There is no way around it.

So this means the Java BluetoothSocket code has to call destroyNative() during
BluetoothSocket.close().

Since native methods cannot be called after destroyNative(), add a ReadWrite
lock and mClosed field to protect access to native methods.

This fixes the "resource busy" error when Bluetooth OPP and Bluetooth PBAP
tried to resume listening after turning BT off and then on.
ndroid_bluetooth_BluetoothSocket.cpp
c937b5ce4ff2f39fd9c60f718f98550a932b62f0 02-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23463 into eclair

* changes:
Wait for HCI to come up if getting the adapter path fails.
176c3d64a793a41f2a59b19f3964bf02b4e79a06 01-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Wait for HCI to come up if getting the adapter path fails.
ndroid_server_BluetoothEventLoop.cpp
485e6dca960c2001349de0817c644f24ae85c6e3 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23462 into eclair

* changes:
Add Bluetooth Device trust
efa1dd716da3372cc74a201d11de5e0ef1a9fe9a 31-Aug-2009 Lixin Yue <L.X.YUE@motorola.com> Add Bluetooth Device trust
ndroid_server_BluetoothService.cpp
3025ef332c29e255388f74b2afefe05f64bce07c 01-Sep-2009 Dianne Hackborn <hackbod@google.com> Various infrastructure to support a running services UI.

Some of this is temporary (in particular the two approaches for getting
process memory, one working but horrible, the other not working but
preferred) until I figure out the best way to do it.

Change-Id: I8c8f25062d481fcea22a47d459b083d2fd8a5040
ndroid_os_Debug.cpp
ad82219718cd1751dcf84bab0cd1aedcb6805eb1 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23380 into eclair

* changes:
Change util_texSubImage2D to call glCompressedTexImage2D correctly.
106006cbdedc79ce8746ca5449610c69a2f69655 01-Sep-2009 Jack Palevich <jackpal@google.com> Change util_texSubImage2D to call glCompressedTexImage2D correctly.

Previously we had been setting the imageSize parameter to 0, which was
incorrect. According to the OpenGL ES spec for glCompressedTexImage2D
this parameter should be the size in bytes of the compressed data.
ndroid/opengl/util.cpp
450ff8a48c9b78729332c99d680560b583f17e7d 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23357 into eclair

* changes:
Fix double-free problem in EmojiFactory.
c81c43991c3522451dbea1743a33d8f7e5446979 01-Sep-2009 Daisuke Miyakawa <dmiyakawa@google.com> Fix double-free problem in EmojiFactory.
ndroid_emoji_EmojiFactory.cpp
41a0a4a850184c8c936818dc0f2ac4d3ecd9a1c6 31-Aug-2009 Nick Pelly <npelly@google.com> Set RFCOMM SO_SNDBUF size to 70 KB for large RFCOMM writes.

With a 64 KB OBEX MTU, net/rfcomm/sock.c:rfcomm_sock_sendmsg() quietly drops data.

The default SO_SNDBUF is 24 KB. Empircally, 36 KB still drops, and 38 KB no longer drops (this is because SO_SNDBUF is doubled in net/core/sock.c and then there is OBEX/RFCOMM overhead). Set to 70 KB so we have plenty of room to spare.

See http://b/2090000 to investigate this in more detail later.
ndroid_bluetooth_BluetoothSocket.cpp
72b1f379d5c97c8ff31d2201e78215af777d6bda 31-Aug-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ndroid_os_Debug.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Process.cpp
22d1f9fb23015471de6af1a70e40fb5c82ecb665 19-Aug-2009 Danke Xie <dankex@qualcomm.com> gps: Network initiated SUPL

Initial contribution from Qualcomm.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
617b22dc075bbf704421adf15f39388ec098b4fd 25-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22520 into eclair

* changes:
Add local frames for parsing properties and processing events.
6d56b530e189d7213ec77d43d3d8af97fee04179 25-Aug-2009 Jaikumar Ganesh <jaikumar@google.com> Add local frames for parsing properties and processing events.

We were running out of local refs when there are lots of devices.
Instead of deleting every single local ref, create a local stack frame.
This operation is inexpensive so doesn't add a high overload and keeps
the code clean instead of deleting every single local ref.
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_server_BluetoothService.cpp
dbade9d6a075b1d5b8ebe10ee8961a5de296c93b 25-Aug-2009 Mike Reed <reed@google.com> expose runtime changes to gamma
ndroid/graphics/Typeface.cpp
bdcef70e15e86e592d725355c96c7fab0b85ac83 19-Aug-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2010965: Increase process size on WVGA devices

This introduces a new system property to set the max vm size. The default
is still 16mb.
ndroidRuntime.cpp
bd022f423a33f0794bb53e5b0720da2d67e4631c 15-Aug-2009 Nick Pelly <npelly@google.com> Bluetooth: API change.

Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).

IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java

TODO:
Javadoc
ndroid.mk
ndroidRuntime.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothService.cpp
eeb175fb120668336e241e4708459a24faf103ec 12-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20982

* changes:
SystemProperties: eliminate unnecessary string allocation.
d1945950451220932f70bac83408c761dcba231f 12-Aug-2009 Mike Lockwood <lockwood@android.com> SystemProperties: eliminate unnecessary string allocation.

getInt(), getLong() and getBoolean() no longer allocate a temporary String object.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_os_SystemProperties.cpp
90f77218a24ac66bea52faef79c30d45420ce135 12-Aug-2009 Dianne Hackborn <hackbod@google.com> am b8546001: Merge change 20878 into donut

Merge commit 'b8546001701405a76dad7e6235046e592296fac2'

* commit 'b8546001701405a76dad7e6235046e592296fac2':
Fix issue #2048263: More debugging information
82e1ee93eece8fb0aec6acc3ef4ee7b1c86feec7 12-Aug-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2048263: More debugging information

We now hopefully do better about generating the anr reports, and include
information about the malloc loaded assets in meminfo.
ndroid_util_AssetManager.cpp
628e086664a4b4aea1365652227f53237ef4f588 11-Aug-2009 Grace Kloba <klobag@google.com> DO NOT MERGE. This is merged from master.
Fix couple of bugs in the meminfo report.
. added the new "/data/dalvik-cache/" to dalvik heap
. shortened the starting line's length from 40 to 30 to handle the case where there is no name
. fixed the pri/shared for others. It was swapped.
ndroid_os_Debug.cpp
f1e5b0d4e5d0d2a78c234cd0cbd3005a74a79429 08-Aug-2009 Mathias Agopian <mathias@google.com> add support for RGBX_8888
ndroid_view_Surface.cpp
813eee115f596f1a104c194d89bffde87365a795 07-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20424

* changes:
Fix the scanning panic issue
c98719313ba87b2736ae3ca6522e5d707654250a 07-Aug-2009 Charles Lu <ChangYanLu@motorola.com> Fix the scanning panic issue

Phone panics while streaming over A2DP and scanning for new device
BluetoothEventLoop should delete reference
ndroid_server_BluetoothEventLoop.cpp
d87c19f7d7d7c25638e21d3b8a176b0573369493 06-Aug-2009 San Mehat <san@google.com> am 7e63789a: android: cgroups: Don\'t switch threads >= nice 10 when moving all threads to default

Merge commit '7e63789a0e0689d940609b1daceebc1bc08dcbef'

* commit '7e63789a0e0689d940609b1daceebc1bc08dcbef':
android: cgroups: Don't switch threads >= nice 10 when moving all threads to default
7e63789a0e0689d940609b1daceebc1bc08dcbef 06-Aug-2009 San Mehat <san@google.com> android: cgroups: Don't switch threads >= nice 10 when moving all threads to default

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
b16e7800be4f879135f239f1f8f586f3712df01e 06-Aug-2009 Mike Lockwood <lockwood@android.com> gps: Add GpsStatus.NmeaListener interface for receiving NMEA sentences.

NMEA sentences are passed from the GPS engine to the GpsLocationProvider.
They are then sent via the IGpsStatusListener binder interface to clients
using the same path as the other GPS status information.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
b20148b806037f15a909604651edd14165c07238 04-Aug-2009 Mike Lockwood <lockwood@android.com> wifi: Strip trailing spaces before parsing RSSI results.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_net_wifi_Wifi.cpp
5c1207be90fdf296c1b83034b7c68915e1749284 01-Aug-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/Shader.cpp
ndroid_util_AssetManager.cpp
a31ce104f557212198cd7c95e05c7b67abcdbe8a 31-Jul-2009 Mike Reed <reed@google.com> am 6af2552d: use safeUnref() since the other macro is not defined in donut

Merge commit '6af2552d244ff933dfd54570121db455cc7c3cda'

* commit '6af2552d244ff933dfd54570121db455cc7c3cda':
use safeUnref() since the other macro is not defined in donut
93efb724ac60538bef3a4e9bae123b515a9deeeb 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 7299d6ad: Merge change 9159 into donut

Merge commit '7299d6ad9820bbb601034542c94d6dc73cc4829d'

* commit '7299d6ad9820bbb601034542c94d6dc73cc4829d':
check for null native objects, which never happens on a real subclass (we throw in that case)
afcf686cb070313ae5ce6c54ac381a3a86a60ed2 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 25dff70f: Merge change 9039 into donut

Merge commit '25dff70f153529b87f5ad4a92f4de21e8950b1de'

* commit '25dff70f153529b87f5ad4a92f4de21e8950b1de':
Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
6af2552d244ff933dfd54570121db455cc7c3cda 30-Jul-2009 Mike Reed <reed@google.com> use safeUnref() since the other macro is not defined in donut
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Shader.cpp
7299d6ad9820bbb601034542c94d6dc73cc4829d 30-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9159 into donut

* changes:
check for null native objects, which never happens on a real subclass (we throw in that case) but can happen because we allow the callers to create the base class from java.
a04e555dc91b11ad833cb5db4a24e38082d1dc45 30-Jul-2009 Mike Reed <reed@google.com> check for null native objects, which never happens on a real subclass (we throw in that case)
but can happen because we allow the callers to create the base class from java.
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Shader.cpp
0d221012ff5fd314711c00ed30e9b807b9c454c1 30-Jul-2009 Dianne Hackborn <hackbod@google.com> Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA

It turns out we were not returning the density for anything retrieved from a
TypedArray... which basically means any bitmap references from a layout or style...!!!

This is now fixed.

Also fiddle with the density compatibility mode to turn on smoothing in certain situations,
helping the look of things when they need to scale and we couldn't do the scaling at
load time.
ndroid/graphics/Canvas.cpp
ndroid_util_AssetManager.cpp
a8675f67e33bc7337d148358783b0fd138b501ff 29-Jul-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid_backup_BackupDataOutput.cpp
ndroid_hardware_Camera.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_util_AssetManager.cpp
83b368505052f59616d29558e65e2250d01fd848 28-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 2015322 mediaframeworktest.MediaAudioTrackTest fails.
ndroid_media_AudioTrack.cpp
ead14576162b287ab10e473e3c2fb10604dcc052 27-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8639

* changes:
explicitly set the hinting level for android apps (to match the old default)
3d63e0119dc763ed0a06fd7498375746fd391d80 27-Jul-2009 Mike Reed <reed@google.com> explicitly set the hinting level for android apps (to match the old default)
ndroid/graphics/Paint.cpp
e2dba02441b42afbae725109ac779877a4b72aa0 25-Jul-2009 Dianne Hackborn <hackbod@google.com> am 11ea3347: Allow for screen density drawables in compatibility mode.

Merge commit '11ea33471e1a14a8594f0b2cd012d86340dd3bd8'

* commit '11ea33471e1a14a8594f0b2cd012d86340dd3bd8':
Allow for screen density drawables in compatibility mode.
11ea33471e1a14a8594f0b2cd012d86340dd3bd8 23-Jul-2009 Dianne Hackborn <hackbod@google.com> Allow for screen density drawables in compatibility mode.

This change allows us to use drawables that match the current screen
density even when being loaded in compatibility mode. In this case,
the bitmap is loaded in the screen density, and the bitmap and
nine-patch drawables take care of accounting for the density difference.

This should be safe for existing applications, for the most part, since
they shouldn't really be pulling the bitmap out of the drawable. For
the small rare chance of them breaking, it worth getting the correct
graphics. Also this will only happen when there is actually a resource
of the matching density, and no existing apps should have resources for
anything besides the default density (though of course all of the
framework resources will be available in the native density).

As part of this, the bitmap density API has been changed to a single
integer provider the DPI unit density.
ndroid/graphics/Canvas.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatch.cpp
a553c25b33c99b345cf1c8688f8df0ed8df14e5a 17-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 1795088 Improve audio routing code

Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
a8339dfec9d1b2c6d6fd2f8268f8075d184f64c0 22-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 9fc20b0e: Merge change 8126 into donut

Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf'

* commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf':
First pass at reworking screen density/size APIs.
c4db95c077f826585d20be2f3db4043c53d30cf5 22-Jul-2009 Dianne Hackborn <hackbod@google.com> First pass at reworking screen density/size APIs.

This changes the names of the directories in aapt, to what you see
in the list of DpiTest resources. Also adds a new "long" configuration
for wide screens, which the platform sets appropriate, and introduces
a new kind of resizeability for not large but significantly larger
than normal screens which may have compatibility issues.
ndroid_util_AssetManager.cpp
cf4550c3198d6b3d92cdc52707fe70d7cc0caa9f 21-Jul-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ndroid.mk
ndroidRuntime.cpp
ime.cpp
imeUtils.h
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Paint.cpp
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_BackupHelperDispatcher.cpp
ndroid_backup_FileBackupHelper.cpp
ndroid_backup_FileBackupHelperBase.cpp
ndroid_bluetooth_Database.cpp
ndroid_emoji_EmojiFactory.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_SensorManager.cpp
ndroid_location_GpsLocationProvider.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_opengl_GLES10.cpp
ndroid_os_MemoryFile.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_text_format_Time.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Process.cpp
om_google_android_gles_jni_GLImpl.cpp
4b5a8f84b107a34a8030be2d3f3a5793d8e0ccce 21-Jul-2009 Dave Sparks <davidsparks@android.com> am da57856d: Add logging to help track down intermittent bug

Merge commit 'da57856d749457e495bd860c4ff45aaaf87c9dab'

* commit 'da57856d749457e495bd860c4ff45aaaf87c9dab':
Add logging to help track down intermittent bug
da57856d749457e495bd860c4ff45aaaf87c9dab 21-Jul-2009 Dave Sparks <davidsparks@android.com> Add logging to help track down intermittent bug
ndroid_hardware_Camera.cpp
569f0b507092ac0b29fee3142805c6fd5b82fdd1 20-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7900

* changes:
Initial support of 2.1 pairing.
b965d09294992562cf5b02c41ec7e48affa9a80a 20-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7775

* changes:
Add an option to enable JIT trace profiling for app_process.
b0eca41de0bb6747d8648b134912782e45e4cbef 17-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Initial support of 2.1 pairing.

Note: Some cases have not been tested yet, as we would need to
get proper UI support.
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ddd12804d1c5439500bf926d3a91bbdc4439c4d9 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 261a784c: Merge change 7720 into donut

Merge commit '261a784c44d6ac4377651e4842c7a96326462857'

* commit '261a784c44d6ac4377651e4842c7a96326462857':
Fix global ref leak in android.media.AudioRecord. Delete global refs
0e01fbf722bf58a0a46c5aef9333d9bae5e40097 18-Jul-2009 Ben Cheng <bccheng@android.com> Add an option to enable JIT trace profiling for app_process.
ndroidRuntime.cpp
c634fdd8035cc06c34663b77ab199d29697273b4 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 09a903ab: Merge change 7696 into donut

Merge commit '09a903ab5b8d940605783ae4ee591c0f090a31d1'

* commit '09a903ab5b8d940605783ae4ee591c0f090a31d1':
add hidden Options field for native allocations
12cae39747c49e2886bcfbac9ec42094bdb32209 17-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Revert "Initial support of 2.1 pairing."

This reverts commit 228b2f3a813e93413a0f9e2f29dfbfc54590a356.
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
261a784c44d6ac4377651e4842c7a96326462857 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7720 into donut

* changes:
Fix global ref leak in android.media.AudioRecord. Delete global refs to the native AudioRecord pointer and the callback cookie (for native to Java calls) in the finalize() function and when an error occurs during the allocation of the native resources.
228b2f3a813e93413a0f9e2f29dfbfc54590a356 17-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Initial support of 2.1 pairing.

Note: Some cases have not been tested yet, as we would need to
get proper UI support.
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
0bca96bcbfe559f9330a01f723c5c9cba51ec05a 17-Jul-2009 Marco Nelissen <marcone@google.com> Make Process.getFreeMemory() return a long instead of an int, to better
work on the simulator now, and phones 2 years from now.
ndroid_util_Process.cpp
4bac5a3928d57ac193141eb6d45f3b39200d27de 17-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Fix global ref leak in android.media.AudioRecord. Delete global refs
to the native AudioRecord pointer and the callback cookie (for native
to Java calls) in the finalize() function and when an error occurs
during the allocation of the native resources.
ndroid_media_AudioRecord.cpp
09a903ab5b8d940605783ae4ee591c0f090a31d1 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7696 into donut

* changes:
add hidden Options field for native allocations
1b22b979256cf163ab9bbfd4fcfa16a8ce862ed1 17-Jul-2009 Mike Reed <reed@google.com> add hidden Options field for native allocations
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
dbee03136fab65227bbe56b2cf03361a1bdbdf1c 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 733cbb00: Merge change 7492 into donut

Merge commit '733cbb0009d3e16eac2383a694833bdbc0c7269e'

* commit '733cbb0009d3e16eac2383a694833bdbc0c7269e':
Delete leaked global ref in AudioTrack constructor.
8a1496855cb81a6f2e9e8d51dd6b6ed595047a2a 16-Jul-2009 Jean-Michel Trivi <jmtrivi@google.com> Delete leaked global ref in AudioTrack constructor.
ndroid_media_AudioTrack.cpp
1c42769339d8fe98ecb2698c64e7dc6672e3d59d 13-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Rename registerPhoneStateChange to registerPreciseCallStateChange

As registerPhoneStateChange was actually notifying CallStateChange,
rename appropriately.
android_server_BluetoothEventLoop.cpp.swp
0d4586d326a60052503619076d143e73e5780ac7 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 9181bc9a: Merge change 7079 into donut

Merge commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5'

* commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5':
Cleanup of unused enums
8978bd01744f39270b6a193187dbb231f761e874 14-Jul-2009 Dave Sparks <davidsparks@android.com> Cleanup of unused enums
ndroid_hardware_Camera.cpp
02035132ffb6a37d8ec573df7199ed055e733bd0 13-Jul-2009 Dave Sparks <davidsparks@android.com> am c4ca4206: Fix build

Merge commit 'c4ca420625183a8efa619e06287b47f3d2e72283'

* commit 'c4ca420625183a8efa619e06287b47f3d2e72283':
Fix build
c4ca420625183a8efa619e06287b47f3d2e72283 13-Jul-2009 Dave Sparks <davidsparks@android.com> Fix build
ndroid_hardware_Camera.cpp
e3ea663686d42477e8b7585e2e3681a6ffd8d81a 13-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 8ceba810: Merge change 6871 into donut

Merge commit '8ceba810d5a5831544790e18ed05eeed7e2fa994'

* commit '8ceba810d5a5831544790e18ed05eeed7e2fa994':
Use SetByteArrayRegion to minimize copy overhead and JNI calls.
b4424782f943fd459e9a10d0f41c0ff252840ac6 12-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 086bd7fe: Merge change 6846 into donut

Merge commit '086bd7fed122f636e210b03eb114051a489f347b'

* commit '086bd7fed122f636e210b03eb114051a489f347b':
Avoid memcpy's by using GetPrimitiveArrayCritical.
a95f495f75d0516ad48576500f64a3ffea037af8 11-Jul-2009 Dave Sparks <davidsparks@android.com> Use SetByteArrayRegion to minimize copy overhead and JNI calls.
ndroid_hardware_Camera.cpp
9cf012a9fcac9b651dd0799240a96d454de49ba2 11-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6823

* changes:
wifi: Keep the WLAN network interface up whenever wifi is enabled.
75acd896483b65ffd6cd445201b9cdcfa201ad78 11-Jul-2009 Dave Sparks <davidsparks@android.com> Avoid memcpy's by using GetPrimitiveArrayCritical.
ndroid_hardware_Camera.cpp
0900f3657664d9046e6723825fd32b244eef2b6c 10-Jul-2009 Mike Lockwood <lockwood@android.com> wifi: Keep the WLAN network interface up whenever wifi is enabled.

We now only bring it down briefly and bring it back up again when
we want to reset the interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_net_NetUtils.cpp
b5af325fb1d21a9295bf3009cc95e5ead4999247 10-Jul-2009 Mike Reed <reed@google.com> rename libsgl/libcorecg to libskia
ndroid.mk
6811355d9683412cb3651e75c59c3256ceaddcec 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 463aacfb: Merge change 6661 into donut

Merge commit '463aacfbd220c9ef2f6ed915d54092289fdac05b'

* commit '463aacfbd220c9ef2f6ed915d54092289fdac05b':
wifi: WifiManager.startScan() will now do passive scans by default.
463aacfbd220c9ef2f6ed915d54092289fdac05b 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6661 into donut

* changes:
wifi: WifiManager.startScan() will now do passive scans by default.
191c12d33fe33c938beb421004c55fb827208f48 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 16f676f4: Merge change 6660 into donut

Merge commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf'

* commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf':
Fix a small bug in array length bounds checking.
16f676f4f8ae3807b5cb40086048e48cae4be3cf 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6660 into donut

* changes:
Fix a small bug in array length bounds checking.
a5ec95cdb1a7d2024249277dff1f99d0046c9b56 08-Jul-2009 Mike Lockwood <lockwood@android.com> wifi: WifiManager.startScan() will now do passive scans by default.

Active scans will only happen if a hidden AP is in use, or if the new method
WifiManager.startScanActive() is called.
This fixes some audio playback problems with bluetooth A2DP.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_net_wifi_Wifi.cpp
6d877383bc2e2952cad48780c410ed452870a5a4 09-Jul-2009 Dan Egnor <egnor@google.com> Fix a small bug in array length bounds checking.
ndroid_backup_BackupDataOutput.cpp
bd51116a5310683f70a37110bf735252dc7e4e38 09-Jul-2009 Grace Kloba <klobag@google.com> Fix couple of bugs in the meminfo report.
. added the new "/data/dalvik-cache/" to dalvik heap
. shortened the starting line's length from 40 to 30 to handle the case where there is no name
. fixed the pri/shared for others. It was swapped.
ndroid_os_Debug.cpp
6698d16b951370a0cc6aa87bcd2ca91122a57410 09-Jul-2009 Dave Sparks <davidsparks@android.com> resolved conflicts for merge of 04c7d0f8 to master
59c1a935295cb30c2ba2f759855e89c174b42a07 09-Jul-2009 Dave Sparks <davidsparks@android.com> Add timestamps to video frames to improve A/V sync.
Bug 1927069.
ndroid_hardware_Camera.cpp
ddd8c26c060c7d3b0497ecfcc7549d8ab848d07d 07-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6320

* changes:
Add method to read events from a file. Remove unused method. Fixed after review.
fcc5be99e0497f25a12e77622c27b4de30e45b3d 07-Jul-2009 Eric Laurent <elaurent@google.com> am 88e209dc: Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR

Merge commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c'

* commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c':
Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
88e209dcf8c2ebddda5c272f46d1bd5478bc639c 07-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR

Store sample rate on 32 bits instead of 16 bits in audio_track_cblk_t.
Removed sampleRate() methods from AudioTrack and AudioRecord: replaced by getSampleRate().
AudioTrack::setSampleRate() no returns a status.
ndroid_media_AudioTrack.cpp
95ff2401a9c6f0252aeedfa27ba0a9a5f0d7f55e 02-Jul-2009 Jim Miller <jaggies@google.com> Add method to read events from a file. Remove unused method. Fixed after review.
ndroid_util_EventLog.cpp
03a9a3449af3e0e79e9bbcd87f8057189ab9e151 06-Jul-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
fee47b699f51e52d3551c0fdbcc9fc2760a0d837 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am c7396025: Merge change 6084 into donut

Merge commit 'c7396025e59524e7ef639fd86fc23123939ee91c'

* commit 'c7396025e59524e7ef639fd86fc23123939ee91c':
Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
a1b653d41df9a7999e1dba2a508295671ff6771d 02-Jul-2009 James Dong <jdong@google.com> Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
ndroid_hardware_Camera.cpp
dfe983bd7979ccb1602f29b8f9804c98411d9cd6 02-Jul-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
1b4308996483bb02c105fee18d32ef3db1e62a74 02-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am b1a97523: Merge change 5739 into donut

Merge commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e'

* commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e':
Check to make sure the Java camera object is still valid on the
0795684839b60fc5e7edb14c301e7797b6645d05 01-Jul-2009 Wu-cheng Li <wuchengli@google.com> am b8a10fe4: Allow setPreviewDisplay after startPreview.

Merge commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e'

* commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e':
Allow setPreviewDisplay after startPreview.
d0cbb1a52d1b2b8b04a122501d696938b295e502 30-Jun-2009 Dave Sparks <davidsparks@android.com> Check to make sure the Java camera object is still valid on the
callback from native. Omitted from previous fix. Bug 1936850.
ndroid_hardware_Camera.cpp
b8a10fe45657f2dcc50cae8a06805f8438a6937e 23-Jun-2009 Wu-cheng Li <wuchengli@google.com> Allow setPreviewDisplay after startPreview.
ndroid_hardware_Camera.cpp
bacc51026e8c95f34830defdfc1be4b359abf664 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am d09f86ce: Merge changes 5548,5549 into donut

Merge commit 'd09f86ce175fad6ddbd446363f327dfa0575a1d2'

* commit 'd09f86ce175fad6ddbd446363f327dfa0575a1d2':
Better (and less) logging from backup.
Add an extra null terminator. String8::unlockBuffer is
6034cb565c3b3ffb21057851cff179e2d5cb56a9 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 17a80081: Merge change 5544 into donut

Merge commit '17a80081a42410f541a220ab7e6afc64fc6cc399'

* commit '17a80081a42410f541a220ab7e6afc64fc6cc399':
Pipe all the camera callbacks to Java to facilitate the addition
f6ff591decdea6299aab1a5b6f95917800571de4 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 72eb0aca: Merge change 5483 into donut

Merge commit '72eb0acad5cffc57ce5006f6deab29ee259e461e'

* commit '72eb0acad5cffc57ce5006f6deab29ee259e461e':
Expand support for different screen sizes.
c2188ff5863e471f4ca7ac318be6f7c8c793a4c7 29-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5600

* changes:
Rework the property parsing code.
8bc8ce44f7e5a720e7b989bdd63bb33da512103b 25-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Rework the property parsing code.

1. Fix and remove CodeDuplication TODO
2. Fix crash while unpairing.
3. For array properties, make it a bit more efficient by passing,
lesser String objects from JNI.
4. Remove void pointer usage and use union to make code more readble.
ndroid_bluetooth_common.cpp
d09f86ce175fad6ddbd446363f327dfa0575a1d2 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge changes 5548,5549 into donut

* changes:
Better (and less) logging from backup.
Add an extra null terminator. String8::unlockBuffer is supposed to be doing this, but it's not and I can't figure out why. This makes BackupHelperDispatcher able to read the keys correctly.
12a4da328a234b171b78cc341544817e9a074057 26-Jun-2009 Joe Onorato <joeo@android.com> Add an extra null terminator. String8::unlockBuffer is
supposed to be doing this, but it's not and I can't
figure out why. This makes BackupHelperDispatcher able
to read the keys correctly.

Also, we weren't writing the data size.
ndroid_backup_BackupHelperDispatcher.cpp
17a80081a42410f541a220ab7e6afc64fc6cc399 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5544 into donut

* changes:
Pipe all the camera callbacks to Java to facilitate the addition of new features. This will make it easy to add things like zoom callbacks without modifying the entire camera stack. Bug 1837832.
723738cfaec3dd7b0fe152c872c41bebf94074c4 26-Jun-2009 Dianne Hackborn <hackbod@google.com> Expand support for different screen sizes.

Applications can now declare that they support small, normal, or
large screens. Resource selection can also be done based on these
sizes. By default, pre-Donut apps are false for small and large,
and Donut or later apps are assumed to support all sizes. In either
case they can use <supports-screens> in their manifest to declare
what they actually support.
ndroid_util_AssetManager.cpp
c62f9bd13327937aa2d2f20b44215397120634c1 26-Jun-2009 Dave Sparks <davidsparks@android.com> Pipe all the camera callbacks to Java to facilitate the addition
of new features. This will make it easy to add things like zoom
callbacks without modifying the entire camera stack.
Bug 1837832.
ndroid_hardware_Camera.cpp
485f971e9d83509197d2e0bc2381c5f34b165626 26-Jun-2009 San Mehat <san@google.com> am 7d619f18: framework: process: Set the control group of a thread to the background group if the priority is logically-lower than ANDROID_PRIORITY_BACKGROUND

Merge commit '7d619f18a277ee3114624df7301db94db83936b9'

* commit '7d619f18a277ee3114624df7301db94db83936b9':
framework: process: Set the control group of a thread to the background group
7d619f18a277ee3114624df7301db94db83936b9 26-Jun-2009 San Mehat <san@google.com> framework: process: Set the control group of a thread to the background group
if the priority is logically-lower than ANDROID_PRIORITY_BACKGROUND

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
2df7c15aa0e8f5afc804fd20250316f9e50fdb59 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am b505ae41: Merge change 5459 into donut

Merge commit 'b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08'

* commit 'b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08':
Make the BackupHelperDispatcher properly handle multiple helpers.
4ababd922eac5931e0222862ff082dc29e012816 26-Jun-2009 Joe Onorato <joeo@android.com> Make the BackupHelperDispatcher properly handle multiple helpers.
ndroid.mk
ndroidRuntime.cpp
ndroid_backup_BackupHelperDispatcher.cpp
1f7300818fae32dcef5a5387b04c8f304b5e1cd5 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am c44989d6: Merge change 5350 into donut

Merge commit 'c44989d6c7bcc761fb37f54fd37aac2070ba8e5e'

* commit 'c44989d6c7bcc761fb37f54fd37aac2070ba8e5e':
move ui/Time.cpp to core/jni, since this is the only place it is used
864c0d50cda714d73fa70e3600ec36b5db8a835a 25-Jun-2009 Mathias Agopian <mathias@google.com> move ui/Time.cpp to core/jni, since this is the only place it is used
ndroid.mk
ime.cpp
imeUtils.h
ndroid_text_format_Time.cpp
cf946df3f7a351d03407eaca81ac3dc22f26a8ca 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 35a47a6e: Merge change 5389 into donut

Merge commit '35a47a6eebae21738bcf9b481e0bb606328cbd1a'

* commit '35a47a6eebae21738bcf9b481e0bb606328cbd1a':
Skip spaces and tabs in readProcLines()
add868cebaf62cffe96e79764ea0b7f2320a03eb 25-Jun-2009 Amith Yamasani <yamasani@google.com> Skip spaces and tabs in readProcLines()

This is to fix a problem in the parsing of /proc/pid/status file.
ndroid_util_Process.cpp
f31868e59fbf59a8d479587c80b648fb37a166fc 25-Jun-2009 Mathias Agopian <mathias@google.com> merge master in master_gl
2387208c9ecb5dba01bd933312c80c5133bd3c41 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 3d7b8d1a: Merge change 5158 into donut

Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'

* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
Use a ref-counted callback interface for Camera.
5e27115995c4506dddf4f1271effd4fb4c935ad3 24-Jun-2009 Dave Sparks <davidsparks@android.com> Use a ref-counted callback interface for Camera.
This allows the camera service to hang onto the callback interface
until all callbacks have been processed. This prevents problems
where pending callbacks in binder worker threads are processed
after the Java camera object and its associated native resources
have been released.
Bug 1884362
ndroid_hardware_Camera.cpp
47c0d4eaa926d979c5ea366934750526c20af8ff 23-Jun-2009 Mike Reed <reed@google.com> remove deprecated use of porterduff
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
4527acb0c39258792ae55604cb4d71006bf8d938 22-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 856dd8a6: Merge change 4952 into donut

Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60'

* commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60':
Helper API cleanup. Allows multiple helpers to function,
06290a4bb9b280fa14a2bbeb2d3ceb09396a78c3 19-Jun-2009 Joe Onorato <joeo@android.com> Helper API cleanup. Allows multiple helpers to function,
because they'll always go in the same order, and this lets
us not have to write headers to keep them paired.
ndroid.mk
ndroidRuntime.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_FileBackupHelper.cpp
ndroid_backup_FileBackupHelperBase.cpp
ndroid_backup_RestoreHelperBase.cpp
ce1311a3a0806d39dc675a3c702eebbfe741dec8 22-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 766d7236: Merge change 4737 into donut

Merge commit '766d7236c84f636b816d71189e309e67db1f593a'

* commit '766d7236c84f636b816d71189e309e67db1f593a':
Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995.
8cdcb12752b716d0407733fecefcf1d9e926310a 18-Jun-2009 Wei-Ta Chen <weita@google.com> Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995.

The function is used to rebuild any caches associated with the bitmap.
In the case of purgeable bitmaps, this call ensures that the pixels
are decoded for drawing, and therefore prefetching techniques
implemented by callers can be leveraged.
ndroid/graphics/Bitmap.cpp
f73bbd042367b65780316d2335784686dedd0459 20-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
e090f3bc9efa052b5c69442633d24e67aa3387a1 20-Jun-2009 Ben Cheng <bccheng@android.com> Shorten the property name as there appears to be a length limit for it.
ndroidRuntime.cpp
885f75187c95b0ca7f189b5f600e2c731e95fca1 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 066e6bfd: Merge change 4792 into donut

Merge commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929'

* commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929':
when we reset a paint, it should return to the state it was in when it was first created.
52b0e73443ff8da195fbf0df851a028e07a691b2 19-Jun-2009 Ben Cheng <bccheng@android.com> Process new property definitions for JIT-specific options for apps performance tuning and debugging.
ndroid.mk
ndroidRuntime.cpp
066e6bfd01a5ddd4748eacdc82fee5374e2af929 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4792 into donut

* changes:
when we reset a paint, it should return to the state it was in when it was first created. for java, this means setting its text-encoding to UTF16...
290f5baf9192752287723a29ede4399ae3e4c826 19-Jun-2009 Mike Reed <reed@google.com> when we reset a paint, it should return to the state it was in when it was first created.
for java, this means setting its text-encoding to UTF16...
ndroid/graphics/Paint.cpp
84c4335f86555059729460c1be94a1579f485315 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am f781b39c: Merge change 4786 into donut

Merge commit 'f781b39cb89dc19e6ad090bd3eb1bedbe7928429'

* commit 'f781b39cb89dc19e6ad090bd3eb1bedbe7928429':
gps: Set SUPL server via hostname rather than IP address.
a9e546169b3c2c9c5f248d2f3abe3b934f48695d 19-Jun-2009 Mike Lockwood <lockwood@android.com> gps: Set SUPL server via hostname rather than IP address.

The GPS engine needs the hostname for the secure SUPL case
and deferring the DNS lookup to the HAL might be helpful in the future
if the SUPL server is on a carrier's private network.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
1c14776a13546fc2642baa251c8f1b7c545b0272 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 16ce3504: Merge change 4708 into donut

Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9'

* commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9':
Make RestoreHelper and friends also write out the snapshot state.
d2d9ceb7305d593c1b767bbb05de0082a9af4109 18-Jun-2009 Joe Onorato <joeo@android.com> Make RestoreHelper and friends also write out the snapshot state.
ndroid.mk
ndroidRuntime.cpp
ndroid_backup_RestoreHelperBase.cpp
eba76ad5c80b703999095b2445fad9178f5000b2 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am c9dc19bb: Merge change 4668 into donut

Merge commit 'c9dc19bb96d2d77ec50f6e40fc22d1ff615f2044'

* commit 'c9dc19bb96d2d77ec50f6e40fc22d1ff615f2044':
Fix runtime restarts due to sending the wrong flags to dbus.
4a364130fb072bf44367e537f8d24e7e00c6ca69 19-Jun-2009 Nick Pelly <npelly@google.com> Fix runtime restarts due to sending the wrong flags to dbus.

In eventLoopMain we were correctly translating from unix events to dbus flags,
but a coding typo then gave the unix events to dbus. Fix this typo.

Also noticed that we were passing raw dbus flags to poll() in another area.
This did not cause any immediate problem, since POLLIN | POLLPRI is harmless
and we do not usually need POLLOUT. But fixed anyway.
ndroid_server_BluetoothEventLoop.cpp
eae311c78be5125d722f50263a4a47c5deff2939 18-Jun-2009 Nick Pelly <npelly@google.com> resolved conflicts for merge of ed336839 to master
ed336839d20aae0cb2ff46d3b231e39570281880 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4515 into donut

* changes:
Tell DBUS not to call _exit() if the DBUS connection disconnects.
251c89c0a7502f4286f2484a77b685ddfe2b39d2 18-Jun-2009 Joe Onorato <joeo@android.com> am 5f15d151: checkpoint BackupDatAInput / RestoreHelper

Merge commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e'

* commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e':
checkpoint BackupDatAInput / RestoreHelper
9e0a19515b9047a00a6e98ce7f20690dff511f43 18-Jun-2009 Nick Pelly <npelly@google.com> Tell DBUS not to call _exit() if the DBUS connection disconnects.

This was causing the system server to quietly die. Naughty DBUS!!

Now you will just see errors in the log "DBUS connection disconnected"
on every DBUS call.

There is still the root cause problem of why the DBUS connection disconnects,
which is not addressed by this change.
ndroid_bluetooth_Database.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ec100900e63a8374ac010e7131d9c7e54c5e6984 17-Jun-2009 Marco Nelissen <marcone@google.com> MemoryFile.isMemoryFile was internally determining the length of
the ashmem region. This is actually useful information to have,
so expose that more directly.
ndroid_os_MemoryFile.cpp
5f15d151b5101fadfe6cba1e8f4aa6367e8c603e 16-Jun-2009 Joe Onorato <joeo@android.com> checkpoint BackupDatAInput / RestoreHelper
ndroid_backup_BackupDataInput.cpp
69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584 16-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
ed776592e18369d02be9c263056d3c2c2dd969ba 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am b4f7592b: Merge change 4299 into donut

Merge commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630'

* commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630':
Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.
Fix IntentFilter constructor to properly process the action parameter.
3c3d3081aad5d3a0cadd18c7764974060c1a5274 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 727f36c6: Merge change 4265 into donut

Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'

* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
process: Fix bug where if a thread exited while we were changing its control
Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
b4f7592b03c8424302c10e61474b0e2d0a71a630 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4299 into donut

* changes:
Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.
91a27ae2fec23b420244258636d2370117e86f5e 16-Jun-2009 Jack Palevich <jackpal@google.com> Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.

Apps targeting Donut and newer will throw an exception.

We use a heuristic to determine whether an app is pre-Donut or not:
We take the address space's __progname, and use that as the application's
package name. For simple applications this is correct.
om_google_android_gles_jni_GLImpl.cpp
1fd0ec738b0a2b97cc28701aa37b1a9869afc684 16-Jun-2009 San Mehat <san@google.com> process: Fix bug where if a thread exited while we were changing its control
group, we'd bail out and report an exception. This situation is *not*
an error.

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
daf701fa6250ae89ad93e2e41127e0f676a322a5 15-Jun-2009 Christopher Tate <ctate@google.com> am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup

Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'

* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
Fix some backup reader/writer issues; make local transport do backup
Fix the jni initializer.
Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
Fix bug #1812041: activity manager crash with bad args.
Journal backup requests so that they won't be lost in a crash
Fix data connection issues.
2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2 13-Jun-2009 Christopher Tate <ctate@google.com> Fix some backup reader/writer issues; make local transport do backup

As of this change, LocalTransport is successfully propagating data changes from
the backup data format into a repository stored in /cache/backup/[packagename].
Each backup key gets a separate file there for ease of manipulation and testing.

The general semantics of BackupDataReader have been tweaked, too; it now just
returns simple "we're done with the data" when it hits the end, even if no
footer has been found, because on the writing side the footer isn't being
written. Also, reading an entity now merely requires a "big enough" buffer, not
an exactly-sized one.

This is all a work in progress, but this is at least working now for purposes of
this local transport.

Still to do: proper change vs deletion detection, as well as expanding the data
format itself to include necessary metadata etc.
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupDataOutput.cpp
03f4df4b3bf8b8828e795a0bf1f913e6e08f12f1 13-Jun-2009 Joe Onorato <joeo@android.com> Fix the jni initializer.
ndroid_backup_BackupDataInput.cpp
1cf587496fcb1d652bab9fc6792fb106b6fefaa4 12-Jun-2009 Joe Onorato <joeo@android.com> Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
ndroid.mk
ndroidRuntime.cpp
ndroid_backup_BackupDataInput.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_FileBackupHelper.cpp
bf85d63cb8858432ff845250fdaffdb556d2ef1b 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 78f0f8cb: Merge changes 3953,3954 into donut

Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c'

* commit '78f0f8cb2efe9410127c39201e240f6d438eb53c':
Make the file backup helper not crash if a file you requested
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
2fde0e640aa46ac2875b48fe6b9d570c209e57f4 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3958

* changes:
Fix tearDown event loop - message unref, triggers when bluetoothd crashes.
9b0fe60b884b5f291c23da0c34be13354b152593 12-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Fix tearDown event loop - message unref, triggers when bluetoothd crashes.
ndroid_server_BluetoothEventLoop.cpp
989895e43f59e00fe0f07ac3dd6e373258caf693 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am fa699ea2: Merge change 3899 into donut

Merge commit 'fa699ea22a13a92694de75ef948a81da23e71642'

* commit 'fa699ea22a13a92694de75ef948a81da23e71642':
GpsLocationProvider: Add hooks for GPS location injection.
23ecae3bbb60c5af940f3a22170d75eb6ac05b69 11-Jun-2009 Joe Onorato <joeo@android.com> Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.

This took quite a bit of refactoring.
ndroid_backup_FileBackupHelper.cpp
d26ce0d903f5141a346d67b2b94437ef3e2880aa 11-Jun-2009 Mike Lockwood <lockwood@android.com> GpsLocationProvider: Add hooks for GPS location injection.

This will allow injecting cell ID location to the GPS
(not implemented yet).

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
1371310b8ab0e8aa458a84cd8615f4b26a48d708 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 0e7cf636: Merge change 3725 into donut

Merge commit '0e7cf6366b657498e51b7c7a433b80cfb83152cb'

* commit '0e7cf6366b657498e51b7c7a433b80cfb83152cb':
process: Clean up cgroup management
0cb53209c32457540a0fabe5567f68606c158963 10-Jun-2009 San Mehat <san@google.com> process: Clean up cgroup management

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
af08ee3eaa7e38ea7e26526b5684f66a3ad75d3b 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 3b277c70: Merge change 3702 into donut

Merge commit '3b277c700e6907ee0813839604ac60df2141c557'

* commit '3b277c700e6907ee0813839604ac60df2141c557':
Change exceptions to RuntimeException.
Fix the way gestures are rasterized to bitmaps.
ba55b3654b3eb4b9ab340b4635c4400a4c66237c 10-Jun-2009 Wu-cheng Li <wuchengli@google.com> Change exceptions to RuntimeException.

This is to follow hardware/Cmaera.java because those exceptiones are not declared to be thrown.
ndroid_hardware_Camera.cpp
d46134946dd6c227d60cc27915b6fd477e36a598 10-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Fix the build for SDK and simulator.
ndroid_server_BluetoothDeviceService.cpp
82aea4abef3a1753425e4486af13710c27383588 10-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Disable bluetooth functions for SDK and Simulator.
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
d5ac1ae36b4e096eb97984334f86d0c68abea2f7 06-May-2009 Jaikumar Ganesh <jaikumar@google.com> Framework changes for bluez4.

Changes in the Bluetooth JNI calls and framework functions
for Bluez4.
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
91f22f901bee5d52d81ca4070a1b187ac8b90dad 09-Jun-2009 Robert Greenwalt <robdroid@android.com> Use new wifi cmd rssi-approx when polling.

Cheaper approx call should be used when polling every 3 sec for
wifi signal strength. Fixes bug 1903653.
ndroid_net_wifi_Wifi.cpp
51c8a3e00e6cffe42d25d1ac87d417e925d8a84d 06-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
8ed6beb515460001a0f5ee91b874289fbb053768 05-Jun-2009 Mathias Agopian <mathias@google.com> rename string_array.h to StringArray.h and move the implementation from the header file to a new cpp file.

StringArray is used in two places in framework/base and in the Sim. Ideally we should get rid of it and use Vector<String8> instead of creating new code.
ndroidRuntime.cpp
1b6aee15157f0236ac1fc7885735609bf27171d3 05-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 2a318867: Merge change 3203 into donut

Merge commit '2a3188672ab2b65c0ce7c9c598a463e382c47696'

* commit '2a3188672ab2b65c0ce7c9c598a463e382c47696':
rename a few files to camel-case, add copyright notices
7d53a6bf4d7992a31426b028fb6ba6dbfaee88d0 05-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am a4196206: Merge change 3074 into donut

Merge commit 'a41962065a93b63e7161cffd662b564e01a9e189'

* commit 'a41962065a93b63e7161cffd662b564e01a9e189':
Modify the decoding logic in the FD case when a purgeable flag is set,
8ae2335a3c93d0c00e998fdec18f64dfe43b94cb 04-Jun-2009 Mathias Agopian <mathias@google.com> rename a few files to camel-case, add copyright notices
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_FileBackupHelper.cpp
2a2c5cd74128a7750f05683614c9824c9262addc 03-Jun-2009 Wei-Ta Chen <weita@google.com> Modify the decoding logic in the FD case when a purgeable flag is set,
and lower the threshold of bitmap size for using ashmem().

For the decoding logic, we now go through the "non-purgeable" path if isShareable is false,
irrespective of the value of the purgeable flag.
ndroid/graphics/BitmapFactory.cpp
3ddc43945c87d68d510ac45a4113465631027640 03-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2969

* changes:
Implement and expose SCO socket support in BluetoothSocket.java.
c0cbfda0fe0184bbb282bde4d894e2ff210c0e47 03-Jun-2009 Bjorn Bringert <bringert@android.com> am 963cd006: Allow creating AssetFileDescriptors for MemoryFiles.

Merge commit '963cd006c45716b034f656bf7e7179e6476f7e4d'

* commit '963cd006c45716b034f656bf7e7179e6476f7e4d':
Allow creating AssetFileDescriptors for MemoryFiles.
963cd006c45716b034f656bf7e7179e6476f7e4d 29-May-2009 Bjorn Bringert <bringert@android.com> Allow creating AssetFileDescriptors for MemoryFiles.

This allows content providers to use in-memory data to implement
ContentProvider.openAssetFile(), instead of just normal files
and sockets as before.

To test cross-process use of AssetFileDescriptors for MemoryFiles,
a test content provider and a client for it are added to
AndroidTests.

Fixes http://b/issue?id=1871731
ndroid_os_MemoryFile.cpp
6a669fac385b51b8bb01844b77a9a43840dda854 03-Jun-2009 Nick Pelly <npelly@google.com> Implement and expose SCO socket support in BluetoothSocket.java.

Implement L2CAP socket support, but do not expose it (untested).

NEXT: Switch to Builder style constructor instead of factory method.
ndroid_bluetooth_BluetoothSocket.cpp
7174bc48dc9c498793dc161bb75c882615c6f6d4 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2898

* changes:
Implement bulk read and writes for Bluetooth sockets.
47e82dee6b18c33fab8c2cdf4f68b20d3663079e 02-Jun-2009 Nick Pelly <npelly@google.com> Implement bulk read and writes for Bluetooth sockets.

Before: 0.1 kB/s
After: 100 kB/s
(in my java BT speed test app)
ndroid_bluetooth_BluetoothSocket.cpp
385a4894d0bd4f98e3991c3850afc5bae47e10ea 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 4ff42ad6: Merge change 2843 into donut

Merge commit '4ff42ad6d7218b89435424b53951c1bdb8ef6b8b'

* commit '4ff42ad6d7218b89435424b53951c1bdb8ef6b8b':
Use JNI region calls in MemoryFile read and write.
ad984f19339008f7eb8687aecc1779be70bc1f65 01-Jun-2009 Bjorn Bringert <bringert@android.com> Use JNI region calls in MemoryFile read and write.

This will reduce copying or pinning, depending on GC policies, which should
improve performance. See dalvik/docs/jni-tips.html#RegionCalls for more information.

Fixes http://b/issue?id=1887911
ndroid_os_MemoryFile.cpp
03d9490758c9318cee6d14d3cc5007556dce92d0 22-May-2009 Fred Quintana <fredq@google.com> - create a new generic ISyncAdapter implementation, SyncAdapterNew
- change the applyBatch to take an ArrayList rather than an []
- change Entity to be a final flass that contains ContentValues
- remove the ability to update/insert Entities by a ContentProviderOperation
ndroid_database_CursorWindow.cpp
5fbcaf9a90ca57b81739112c20859ef55fe18336 01-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
3b4062eeb01be33951ba214e027da523cf09f8b1 01-Jun-2009 Mathias Agopian <mathias@google.com> get rid of utils.h
ndroid_database_SQLiteDatabase.cpp
4398876d6ec2dd3102acb3da4980f8e53243d372 31-May-2009 Mathias Agopian <mathias@google.com> merge master to master_gl
0ad6dc0ebc5c6c92b4f1e9eed427efce7b46de09 29-May-2009 Bjorn Bringert <bringert@android.com> am 761e0918: Unmap memory in MemoryFile.close().

Merge commit '761e0918d30b6a3f292625b44b86dffd1538bc78'

* commit '761e0918d30b6a3f292625b44b86dffd1538bc78':
Unmap memory in MemoryFile.close().
761e0918d30b6a3f292625b44b86dffd1538bc78 29-May-2009 Bjorn Bringert <bringert@android.com> Unmap memory in MemoryFile.close().

As reported in http://b/issue?id=1398215 MemoryFile did not
munmap(2) the ashmem region after closing it. This
causes the process to leak virtual address space.

This change fixes the problem by calling munmap(2) in
close(). The unmapping is done by a helper method deactivate().
The change also replaces the use of an int for the
file descriptor with a FileDescriptor object to
make sure that we keep track of when the file descriptor
has been closed. I chose to implement it this way because I
will need decativate() and a FileDescriptor object in an
upcoming change that allows sending MemoryFile file
descriptors between processes.

The change also adds a number of tests for the behavior
of close(). The testCloseRead() and testCloseWrite() fail
with the old MemoryFile implementation, and testCloseLeak()
causes a segfault. They all pass now.
ndroid_os_MemoryFile.cpp
2da99bdaa1712f00525e6a84b58044332cb1baef 27-May-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master

Conflicts:
include/ui/Rect.h
libs/ui/ISurfaceComposer.cpp
9b36f494e52b1b0e383df5c1ae07930830f7cbbd 27-May-2009 Patrick Scott <phanna@android.com> Fix the boot. The signature needed a V at the end.
ndroid_bluetooth_BluetoothSocket.cpp
67880624cc323bd4b2443d473fedc99327b97b29 27-May-2009 Android (Google) Code Review <android-gerrit@google.com> am c0139711: Merge change 2432 into donut

Merge commit 'c0139711b0e4a07ad997fb4130c674ed2d90e2fc'

* commit 'c0139711b0e4a07ad997fb4130c674ed2d90e2fc':
Make android_runtime to not include libemoji but use dlopen() instead.
c0139711b0e4a07ad997fb4130c674ed2d90e2fc 27-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2432 into donut

* changes:
Make android_runtime to not include libemoji but use dlopen() instead. This must be submitted with change 2432
0d1e146cb75231e590a31ccd4b223fd18a7b9ff1 27-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2007

* changes:
New BluetoothSocket API.
0b6955a48bad9aee01ae2f0c06d3f168ca603ab7 27-May-2009 Nick Pelly <npelly@google.com> New BluetoothSocket API.

Modeled on blocking java.net.Socket and java.net.ServerSocket library.

Public interface is:

public final class BluetoothSocket implements Closeable {
public static BluetoothSocket createRfcommSocket(String address, int port) throws IOException;
public static BluetoothSocket createInsecureRfcommSocket(String address, int port) throws IOException;

public void connect() throws IOException;
public void close() throws IOException;

public String getAddress();
public InputStream getInputStream() throws IOException;
public OutputStream getOutputStream() throws IOException;
}

public final class BluetoothServerSocket implements Closeable {
public static BluetoothServerSocket listenUsingRfcommOn(int port) throws IOException;
public static BluetoothServerSocket listenUsingUnsecureRfcommOn(int port) throws IOException;

public BluetoothSocket accept() throws IOException;
public BluetoothSocket accept(int timeout) throws IOException;
public void close() throws IOException;

}
ndroid.mk
ndroidRuntime.cpp
ndroid_bluetooth_BluetoothSocket.cpp
ndroid_bluetooth_RfcommSocket.cpp
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
c5d0343b677d5ddc2d69fd15b81b084a40ab12ac 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> am de8268d6: Merge change 2331 into donut

Merge commit 'de8268d6d1cd168510c490b17e93154d2eab767c'

* commit 'de8268d6d1cd168510c490b17e93154d2eab767c':
Fix issue 1846343 - part 1
3ef9697397cd74ebc4e34d8e56e78aa3b177f565 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 8fc5a63d: Merge change 2431 into donut

Merge commit '8fc5a63d422fd32258dc18fe0e635b4f1486fd61'

* commit '8fc5a63d422fd32258dc18fe0e635b4f1486fd61':
wifi: Fix problem parsing RSSI when the AP name contains a space.
de8268d6d1cd168510c490b17e93154d2eab767c 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2331 into donut

* changes:
Fix issue 1846343 - part 1
63507babb6798d65bf965de6ea4622b7ec65aa28 26-May-2009 Daisuke Miyakawa <dmiyakawa@google.com> Make android_runtime to not include libemoji but use dlopen() instead.
This must be submitted with change 2432
ndroid.mk
ndroid_emoji_EmojiFactory.cpp
4bc035a65cac177be9294e69f110497e3b6e34e6 22-May-2009 Eric Laurent <elaurent@google.com> Fix issue 1846343 - part 1

This change is the first part of a fix for issue 1846343, :
- Added new enum values for input sources in AudioRecord and MediaRecorder for voice uplink, downlink and uplink+downlink sources.
- renamed streamType to inputSource in all native functions handling audio record.

A second change is required in opencore author driver and android audio input to completely fix the issue.
ndroid_media_AudioRecord.cpp
c5ad0f47251199b0d137bfdb085f189afbe3ddd2 26-May-2009 Mike Lockwood <lockwood@android.com> wifi: Fix problem parsing RSSI when the AP name contains a space.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_net_wifi_Wifi.cpp
b57d6c9939190f440d3e13adb5fafba6a0cf653d 23-May-2009 Mike Lockwood <lockwood@android.com> am 270e87f7: Sensors: Use a native_handle for the data channel instead of a single file descriptor.

Merge commit '270e87f71abc2edf446dbec20c725c823e8c7f37'

* commit '270e87f71abc2edf446dbec20c725c823e8c7f37':
Sensors: Use a native_handle for the data channel instead of a single file descriptor.
270e87f71abc2edf446dbec20c725c823e8c7f37 22-May-2009 Mike Lockwood <lockwood@android.com> Sensors: Use a native_handle for the data channel instead of a single file descriptor.

This eliminates the requirement that all sensors share a single file descriptor.
This, along with concurrent changes in other projects, fixes bugs b/1614524 and b/1614481

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_hardware_SensorManager.cpp
947f4f4d384ea26eb2145cc070a3eed42c59534a 22-May-2009 Mathias Agopian <mathias@google.com> merge master to master_gl
f5e17310d19494834466f237367452dfe1bd51cb 20-May-2009 Nick Pelly <npelly@google.com> Remove Database.java API.

This provided SDP functionality to Java, but is not currently used by any Apps.

I will shortly be providing SDP functionality in a new API, but it will be
quite different to this one, and in the mean-time keeping this stale code
updated with other API changes is a pain.
ndroid.mk
ndroidRuntime.cpp
ndroid_bluetooth_Database.cpp
0795272aa226f4e965968a03daddc53ce30b7cda 20-May-2009 Mathias Agopian <mathias@google.com> move libbinder's header files under includes/binder
ctivityManager.cpp
ndroidRuntime.cpp
ursorWindow.cpp
ursorWindow.h
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Region.cpp
ndroid_hardware_Camera.cpp
ndroid_media_AudioTrack.cpp
ndroid_util_Binder.cpp
ndroid_util_Binder.h
ndroid_util_Process.cpp
25ba5b6564224dceefa086b5c439ef28dad530ca 19-May-2009 Mathias Agopian <mathias@google.com> checkpoint: split libutils into libutils + libbinder
ndroid.mk
bad962bf407bbb7a7ce296fb75f1883375afa832 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> am e2914615: Merge change 2099 into donut

Merge commit 'e29146158b6048936671decc060d398a68333fc0'

* commit 'e29146158b6048936671decc060d398a68333fc0':
Hook up the backup data writer, and add a utility to read the backup data files.
843ef36f7b96cc19ea7d2996b7c8661b41ec3452 20-May-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Typeface.cpp
ndroid_backup_FileBackupHelper.cpp
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_hardware_Camera.cpp
ndroid_location_GpsLocationProvider.cpp
ndroid_media_AudioTrack.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
ndroid_os_ParcelFileDescriptor.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_util_Process.cpp
om_google_android_gles_jni_GLImpl.cpp
d2110dbce071a236b6176de344ca797b737542eb 19-May-2009 Joe Onorato <joeo@android.com> Hook up the backup data writer, and add a utility to read the backup data files.
ndroid.mk
ndroidRuntime.cpp
ndroid_backup_BackupDataOutput.cpp
ndroid_backup_FileBackupHelper.cpp
ab66d5c9faa612d304a2c02e4c181852d461758f 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 90bd7338: Merge change 2075 into donut

Merge commit '90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c'

* commit '90bd7338df76c0a6185f4ff2fe7f981fa1a1d36c':
Fix bad filtering of error code when set_position_mode() is being called.
9a940e8b3d61539392c1a9f925be13cca8b5103d 20-May-2009 David 'Digit' Turner <digit@google.com> Fix bad filtering of error code when set_position_mode() is being called.
ndroid_location_GpsLocationProvider.cpp
e27a8c9b1e85f889d984d74f92801b328f33dfcd 20-May-2009 San Mehat <san@google.com> am 3e458241: process: Add setProcessGroup() hidden API call to set the cgroup of a process and all its child threads.

Merge commit '3e458241d9930465a20a861ecb42744355d48e48'

* commit '3e458241d9930465a20a861ecb42744355d48e48':
process: Add setProcessGroup() hidden API call to set the cgroup of
3e458241d9930465a20a861ecb42744355d48e48 19-May-2009 San Mehat <san@google.com> process: Add setProcessGroup() hidden API call to set the cgroup of
a process and all its child threads.

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
3e9b3eae7c7a825e7d2aa564353041205ba303b7 18-May-2009 Android (Google) Code Review <android-gerrit@google.com> am ce2372de: Merge change 1836 into donut

Merge commit 'ce2372de58ad018623748f63e61ffc70c9eb8895'

* commit 'ce2372de58ad018623748f63e61ffc70c9eb8895':
Fix bug 1856713 gl Pointer functions should use Buffer position
6158b1bf0364da1582468a98ec09d004ba99deec 11-May-2009 Mathias Agopian <mathias@google.com> Region now has its own implementation instead of relying on SkRegion, which allows us to break libui's dependency on libcorecg.
ndroid_view_Surface.cpp
16e7972f0d986eebf846ea8feb50f4435a9c6970 16-May-2009 Jack Palevich <jackpal@google.com> Fix bug 1856713 gl Pointer functions should use Buffer position

JSR239 and android.opengl gl Pointer functions (glColorPointer, etc.)
now respect the current setting of the Buffer position.

This fixes a regression introduced when we started requiring the
Buffers passed to the Pointer functions to be direct Buffers.
ndroid_opengl_GLES10.cpp
om_google_android_gles_jni_GLImpl.cpp
d2146d4a7c5d16fcab2c1537f618e0df32dbd8df 15-May-2009 Eric Fischer <enf@google.com> resolved conflicts w/ 5bd644caf73e76750feef1a82b8817d32f5367fc merge....
5bd644caf73e76750feef1a82b8817d32f5367fc 13-May-2009 Eric Fischer <enf@google.com> Start using CLDR for some date-and-time strings and formats.

Use java.text.DateFormat where possible, since that is already using
the CLDR data for the things it supports. Remove an unused date format
object from DatePickerDialog.

Add a new method for getting the standalone month names from applications,
although @hidden for now because it is an API change.

Pass the standalone month names down to native code in Time so that
tztime's strftime() can use them.

And then the bulk of the change: replace all the names for the months
and the days of the week, and AM and PM, and yesterday, today, and tomorrow,
with strings from CLDR. And replace several of the date format strings
with ones derived from CLDR, but reformatted to use strftime() style
instead of SimpleDateFormat style.

All these resource changes go into new donottranslate-cldr.xml files
and are removed from strings.xml so that they aren't part of the
normal translation process and the translators don't have to bother
with them (and risk messing them up).
ndroid_text_format_Time.cpp
11abc8a36d639775b05a0471c9ea45d83fa19e56 15-May-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master

Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
a64b860749ad7e5f9e887013d87b56b928c5d405 14-May-2009 Android (Google) Code Review <android-gerrit@google.com> am aa642c0c: Merge changes 1591,1596 into donut

Merge commit 'aa642c0cc20293137376d44f8221876c121e5be9'

* commit 'aa642c0cc20293137376d44f8221876c121e5be9':
Get the backup calling through to the file backup helper.
Fix typos.
Add a new feature to android.os.Debug to add the ability to inject only specific fields when calling setFieldsOn().
Fixes #1836075. Adds consistency checks for the View hierarchy. To enable them, you need a debug build and ViewDebug.sConsistencyCheckEnabled set to true in debug.prop. This change also lets you easily enable drawing and layout profiling in ViewRoot by setting ViewRoot.sProfileDrawing, ViewRoot.sProfileLayout and ViewRoot.sShowFps in debug.prop with a debug build.
Add Intent.ACTION_APP_ERROR
290bb011c5c1a9ba1f2116810b06cf52a9c36b3e 14-May-2009 Joe Onorato <joeo@android.com> Get the backup calling through to the file backup helper.

This includes some cleanup to make the parameters match
between BackupService.onBackup and FileBackupHelper.performBackup.
ndroid_backup_FileBackupHelper.cpp
7118a2cf547ed53900a7591ca93b99ee0508cea9 13-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 807f23b: Merge change 1057 into donut

Merge commit '807f23b2d8c7148cf6fc95bb88cfc2f78e4be66a'

* commit '807f23b2d8c7148cf6fc95bb88cfc2f78e4be66a':
* Add regoin scaling for transparent support
15203958fda7d3bf551023b6bcdf9c706e2dba1e 13-May-2009 Romain Guy <romainguy@android.com> am 2bb3ea1: Fix native core runtime. A messy declaration was causing a p

Merge commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9'

* commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9':
Fix native core runtime. A messy declaration was causing a problem at boot time.
807f23b2d8c7148cf6fc95bb88cfc2f78e4be66a 13-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1057 into donut

* changes:
* Add regoin scaling for transparent support
2bb3ea162a58c0f1dddccdbe68b64e02456f11f9 13-May-2009 Romain Guy <romainguy@android.com> Fix native core runtime. A messy declaration was causing a problem at boot time.
ndroid/graphics/Typeface.cpp
b10f138e125b5656e810901d14c5f956ff5d9b64 12-May-2009 Mitsuru Oshima <oshima@google.com> * Add regoin scaling for transparent support
ndroid/graphics/Region.cpp
bae1ca315b27973fee8daacec482bb633a464294 12-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 3e3439d: Merge change 1478 into donut

Merge commit '3e3439d5ba0cf5eda060c4991219c32af917fc5b'

* commit '3e3439d5ba0cf5eda060c4991219c32af917fc5b':
Fixes #1847219. Add a new API to load fonts from arbitrary files: Typeface.createFromFile(String/File).
3e3439d5ba0cf5eda060c4991219c32af917fc5b 12-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1478 into donut

* changes:
Fixes #1847219. Add a new API to load fonts from arbitrary files: Typeface.createFromFile(String/File).
a87a132ebf1c2dd733cf52feff6e44525257c961 12-May-2009 Romain Guy <romainguy@android.com> Fixes #1847219. Add a new API to load fonts from arbitrary files: Typeface.createFromFile(String/File).
ndroid/graphics/Typeface.cpp
7391f42d9bfff051f99e1b98168f4ef8955eb4f8 12-May-2009 Android (Google) Code Review <android-gerrit@google.com> am e51f3a0: Merge change 1297 into donut

Merge commit 'e51f3a012b146d57a01b9f7cc7c043b9da3c600d'

* commit 'e51f3a012b146d57a01b9f7cc7c043b9da3c600d':
Check the size of the data to write for STATIC AudioTrack objects.
e51f3a012b146d57a01b9f7cc7c043b9da3c600d 12-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1297 into donut

* changes:
Check the size of the data to write for STATIC AudioTrack objects. Extracted actual writing from write jni function so it can be reused in an upcoming change.
22a262f09d1f4142ed699f50b128071da704b819 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 5e1d8ae: Merge change 1355 into donut

Merge commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6'

* commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6':
GPS: Generalize SUPL support to include AGPS for CDMA
e3635c9693c4cd9650684f14e19dcabcea0d488a 11-May-2009 Mike Lockwood <lockwood@android.com> GPS: Generalize SUPL support to include AGPS for CDMA

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
5af95aa20b0b2521e82b8590b92440c210baf18a 09-May-2009 Mathias Agopian <mathias@google.com> am 8331f72: remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "

Merge commit '8331f72078051cdf5a26230ee819f7ef7f9fcc24'

* commit '8331f72078051cdf5a26230ee819f7ef7f9fcc24':
remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eglext.h
8331f72078051cdf5a26230ee819f7ef7f9fcc24 09-May-2009 Mathias Agopian <mathias@google.com> remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eglext.h
ndroid_opengl_GLES10.cpp
om_google_android_gles_jni_GLImpl.cpp
21dc037e7e7c51e33b5808320f47339ee3a2b103 09-May-2009 Jean-Michel Trivi <jmtrivi@google.com> Check the size of the data to write for STATIC AudioTrack objects.
Extracted actual writing from write jni function so it can be reused in an upcoming change.
ndroid_media_AudioTrack.cpp
6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 08-May-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
3cf650dec40c0e40d613c76bd70453205af76ed8 08-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 672f1e2: Merge change 1192 into donut

Merge commit '672f1e2b07d985526bfd5606e6a888005fdcb70c'

* commit '672f1e2b07d985526bfd5606e6a888005fdcb70c':
Fix 1825581 - device restarts when using A2DP.
672f1e2b07d985526bfd5606e6a888005fdcb70c 08-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1192 into donut

* changes:
Fix 1825581 - device restarts when using A2DP.
59e3c94860819eed493349a4f9639c9298e9abb6 08-May-2009 The Android Open Source Project <initial-contribution@android.com> am b59f23d: Merge branch \'donut\' of ssh://android-git.corp.google.com:29

Merge commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db'

* commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db':
Require native-order direct buffers for glXXXPointer APIs.
c11dbe782d82b22c3b68118aa22ccb1dc81dc45b 08-May-2009 The Android Open Source Project <initial-contribution@android.com> am 572ae14: Merge branch \'donut\' of ssh://android-git.corp.google.com:29

Merge commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f'

* commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f':
Fix automatically generated code for glGet
1a36071092c209ac763fdb48dcfe87043a2b2cf6 08-May-2009 The Android Open Source Project <initial-contribution@android.com> manual merge of 7ec32cc

Merge commit '7ec32cc'
e20ea783a12f1031482c3aa01938efe39dcbf0a2 08-May-2009 Jack Palevich <jackpal@google.com> Require native-order direct buffers for glXXXPointer APIs.

This was always a documented restriction, but was not enforced by the runtime until now.

Until now, if you passed in some other kind of buffer, it would sometimes work, and
sometimes fail. The failures happened when the Java VM moved the buffer data while
OpenGL was still holding a pointer to it.

Now we throw an exception rather than leaving the system in a potentially bad state.
ndroid_opengl_GLES10.cpp
om_google_android_gles_jni_GLImpl.cpp
6bebbcd57b7b3ffad3af046f4899d885b30c828e 08-May-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
2108e5c74ff8ce55e97c26afb8f46af65f7f2e4e 08-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1163 into donut

* changes:
Fix automatically generated code for glGet
b1a7ffef3a0007b6991b8338460f6aac8cbb11e8 07-May-2009 Joe Onorato <joeo@android.com> More backup tests
ndroid.mk
ndroidRuntime.cpp
ndroid_backup_FileBackupHelper.cpp
ndroid_os_ParcelFileDescriptor.cpp
704e00ab7b62eb0a89254fbb0151a45ee4052517 07-May-2009 Robert Greenwalt <robdroid@android.com> Fix 1825581 - device restarts when using A2DP.

Had to do with using the wrong JNIEnv. Now storing the VM and looking up a
JNIEnv appropriate to the thread as needed.
ndroid_server_BluetoothA2dpService.cpp
be509c9c7de5929d014dfe6d45e71cc8454ede0f 07-May-2009 Jack Palevich <jackpal@google.com> Fix automatically generated code for glGet

Remove include of an internal agl header file. We should not depend on any implementation details
of our software renderer, since they may not be correct if another renderer is used.
Fix glGet number-of-elements logic for GL_FOG_COLOR GL_LIGHT_MODEL_AMBIENT,
and GL_COMPRESSED_TEXTURE_FORMATS.
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
om_google_android_gles_jni_GLImpl.cpp
1e38d860347ed8e463dbad4d1d137a4130c5272d 04-May-2009 Wu-cheng Li <wuchengli@google.com> am fa3e556: Change error message.

Merge commit 'fa3e5562793c5bd7d4513a9e1a5869e763a47ab5'

* commit 'fa3e5562793c5bd7d4513a9e1a5869e763a47ab5':
Change error message.
fa3e5562793c5bd7d4513a9e1a5869e763a47ab5 04-May-2009 Wu-cheng Li <wuchengli@google.com> Change error message.
ndroid_hardware_Camera.cpp
3bc15fcfdc9239218f21e58b3688e4b1bceda0a2 01-May-2009 Android (Google) Code Review <android-gerrit@google.com> am e5c4725: Merge change 873 into donut

Merge commit 'e5c4725666da25138193bed83831b66b9c0b2c45'

* commit 'e5c4725666da25138193bed83831b66b9c0b2c45':
pass original ptrs to JNI release functions (instead of += index to them)
ad8b8f57a457ff615112b7fa4987f39e75fc5ff6 01-May-2009 Mike Reed <reed@google.com> pass original ptrs to JNI release functions (instead of += index to them)
ndroid/graphics/Canvas.cpp
fa6eda01a9f3df0102ce6a65302c8674cc9c7e50 30-Apr-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master

Conflicts:
libs/surfaceflinger/Layer.cpp
libs/surfaceflinger/SurfaceFlinger.cpp
opengl/libagl/egl.cpp
opengl/libs/EGL/egl.cpp
opengl/libs/GLES_CM/gl.cpp
opengl/libs/GLES_CM/gl_api.in
opengl/libs/gl_entries.in
opengl/libs/tools/glapigen
245eb108d5d99ad7a2485b5ce0cd7a697ac1e00d 30-Apr-2009 Mike Lockwood <lockwood@android.com> am c21a08f: gps: Fix missing return value in android_location_GpsLocatio

Merge commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0'

* commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0':
gps: Fix missing return value in android_location_GpsLocationProvider_init
c21a08f747f6fd1d7b8c98176ff70abc57cf58a0 30-Apr-2009 Mike Lockwood <lockwood@android.com> gps: Fix missing return value in android_location_GpsLocationProvider_init

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
a5a51e172495a3aa793903ce6c62b06f8c5d0b42 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am 77c9990: Merge change 599 into donut

Merge commit '77c9990ae0806575ae7a2750459f3e74f0bec092'

* commit '77c9990ae0806575ae7a2750459f3e74f0bec092':
Add call to (new) Canvas.freeCaches() in response to low-memory
070d4c023a4b67e9e29d1c21a7bf9f25d7528c03 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am 3de05ff: Merge change 586 into donut

Merge commit '3de05ffb910b572f7816b838628567c760540f7d'

* commit '3de05ffb910b572f7816b838628567c760540f7d':
Manage imagecache ram budget
d1d2af6846156e9deddac7a256e6c3b756073267 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am 3eab744: Merge change 376 into donut

Merge commit '3eab744d018924189b1b8f5530accd52e91213de'

* commit '3eab744d018924189b1b8f5530accd52e91213de':
Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background
cb49634c7373e3b48bb73e516331901525af36c0 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am 1fb758e: Merge change 546 into donut

Merge commit '1fb758e94b5b9e342b6dc6452cb5bd7cf0cc4ed6'

* commit '1fb758e94b5b9e342b6dc6452cb5bd7cf0cc4ed6':
Add (hidden for now) purgeable bitmaps
772a767086575eea73e36483bcb9e0d6ca044250 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am 9e8ca9a: Merge change 551 into donut

Merge commit '9e8ca9a19c8625b22f37c2f8c0ac841d1f10d25a'

* commit '9e8ca9a19c8625b22f37c2f8c0ac841d1f10d25a':
Enable static Java APIs for OpenGL ES 1.1 extensions.
77c9990ae0806575ae7a2750459f3e74f0bec092 28-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 599 into donut

* changes:
Add call to (new) Canvas.freeCaches() in response to low-memory
3de05ffb910b572f7816b838628567c760540f7d 28-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 586 into donut

* changes:
Manage imagecache ram budget
caf0df1b7f99736aed1a0b923ef278fc4fd0fcca 27-Apr-2009 Mike Reed <reed@google.com> Add call to (new) Canvas.freeCaches() in response to low-memory

This is in conjunction with removing a similar call made by the browser.
Now it will be centralized, and the browser's call site will be removed.
ndroid/graphics/Canvas.cpp
3eab744d018924189b1b8f5530accd52e91213de 27-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 376 into donut

* changes:
Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background
e9d376b801b7890b1ef5006ed55de4208e64bb63 21-Apr-2009 San Mehat <san@google.com> Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background

Signed-off-by: San Mehat <san@google.com>
ndroid_util_Process.cpp
fc8db53eee11568b286e8d9c17e211bd6781fab6 27-Apr-2009 Mike Reed <reed@google.com> Manage imagecache ram budget

This code was lifted from the browser, and is now global since java clients may
also use this cache for decoded images
ndroidRuntime.cpp
1fb758e94b5b9e342b6dc6452cb5bd7cf0cc4ed6 27-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 546 into donut

* changes:
Add (hidden for now) purgeable bitmaps
f670127afccf156681db8a144e49cecb22d744e1 24-Apr-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
c70e06bbfac0d92ec218a32e35d9d7fa80f23cc9 24-Apr-2009 Mike Reed <reed@google.com> Add (hidden for now) purgeable bitmaps

BitmapFactory::Options now let you specify if the resulting bitmap can be
"purgeable". If so, then its decoded pixels may be purged when not actively
being drawn, freeing up that RAM. When such a bitmap is drawn, it will
automatically be re-decoded on demand. This is done by having the bitmap
keep a reference/copy of the encoded data.

Where it is a reference or a copy is controlled by the "shareable" flag in
Options. If this is true, the implementation *may* just reference the encode
data (e.g. a file descriptor) rathern than making a complete copy of it.

Currently, purgeable is not supported for generic inputstreams, but is
enabled for byte-array, file-descriptor, and assets, though for impl
reasons only file-descripts are currently enabled for "shareable", but that
may change in the future.
ndroid.mk
ndroid/graphics/BitmapFactory.cpp
a379585e6e3ff41db6d71a5cd0a0403931bc525d 24-Apr-2009 Jack Palevich <jackpal@google.com> Enable static Java APIs for OpenGL ES 1.1 extensions.

This is just plumbing. The Java APIs existed already, but there were no C APIs to hook the Java APIs
up to. Now there are C APIs, so we can call them.

Of course, whether or not the C APIs actually work when you call them depend upon the
capabilities of the active OpenGL driver, which must be checked at run time.

Also, while we're here, make the glGetString method static. It was always supposed to be static,
but was accidentally implemented as non-static, because the code was copied from the non-static
OpenGL ES classes.
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES11Ext.cpp
74008f608af0c567456d37e63d48643689388c74 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Merge donut into master
ac9fd3e423f568c671954d20945e2f2997842a75 19-Apr-2009 Evan Millar <> Merge branch 'readonly-p4-master'
74e258d63eccef41da923adad47bd2b20056aa5f 19-Apr-2009 Evan Millar <> AI 146854: am: CL 146853 Add kernel wakelock data to batteryinfo dump.
Original author: emillar

Automated import of CL 146854
ndroid_util_Process.cpp
4482d8c8e41b02786efae97987394f60b68d6f6e 18-Apr-2009 Evan Millar <> Merge branch 'readonly-p4-donut' into donut
c64edde69d18498fb2954f71a546357b07ab996a 18-Apr-2009 Evan Millar <> AI 146853: Add kernel wakelock data to batteryinfo dump.
BUG=1755458

Automated import of CL 146853
ndroid_util_Process.cpp
13b3b5c9b2594fe2a42e479ae4f3f733fce911dc 17-Apr-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
1c4907ee77392afb768c2f088e0dedbe4239f6fb 14-Apr-2009 Jack Palevich <jackpal@google.com> Manually merge 129, 174, and 233 from donut

This adds a static OpenGL ES API.

Here are the three commit messages for the original changes:

Clean up trivial Eclipse warnings and fix whitespace.

Added @Override to overridden methods.
Removed unused imports.
Converted tabs to spaces.
Removed \r characters from end-of-lines.
Add .gitignore file to ignore the .class files that are
generated when the "gen" script is run.

This is the 2nd commit message:

Improve glgen

+ gen script is really a bash script rather than a sh script,
so declare that to be true. (For example, it uses pushd,
which is a part of bash, but not a part of sh. Not sure
how this worked until now. Possibly gen was only run in
environments where /bin/sh was really bash.

+ Check the results of the java compile of the code generator,
and abort the script if the compile fails.

+ Turn on the bash shell option that guards against using
uninitialized variables in the script.

+ Remove the generated class files.

Refactor JniCodeEmitter into two classes: a general-purpose
JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is
to use JniCodeEmitter as a base for emitting static OpenGL ES
bindings.

This is the 3rd commit message:

Add an Android-specific static OpenGL ES 1.1 Java API.

This change adds four new public classes that expose a static OpenGL ES 1.1 API:

android.opengl.GLES10
android.opengl.GLES10Ext
android.opengl.GLES11
android.opengl.GLES11Ext

Benefits:

+ The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
+ The static API is similar to the C API, which should make it easier to import C-based
example code.
+ The static API provides a clear path for adding new OpenGL ES 1.1 extensions
and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.

Example:

import static android.opengl.GLES10.*;

...

glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.

Implementation details:

This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.

As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
ndroid.mk
ndroidRuntime.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
om_google_android_gles_jni_GLImpl.cpp
69d62097e8195c947de7e4cdc4a491181aa56e61 17-Apr-2009 Mathias Agopian <mathias@google.com> cleanup, remove unused fields. Also make sure that we don't systematically allocate a Surface in Surface.java if only a SurfaceControl is needed (Common case).
ndroid_view_Surface.cpp
17f638b39f2e8b610ecfa1290e5bc42ab7700c98 17-Apr-2009 Mathias Agopian <mathias@google.com> more splitting of Surface/SurfaceControl. Surface.java is now implemented in terms of Surface and SurfaceControl.

The WindowManager side of Surface.java holds a SurfaceControl, while the client-side holds a Surface. When the client is in the system process, Surface.java holds both (which is a problem we'll try to fix later).
ndroid_view_Surface.cpp
27f8002e591b5c579f75b2580183b5d1c4219cd4 16-Apr-2009 Jack Palevich <jackpal@google.com> Add an Android-specific static OpenGL ES 1.1 Java API.

This change adds four new public classes that expose a static OpenGL ES 1.1 API:

android.opengl.GLES10
android.opengl.GLES10Ext
android.opengl.GLES11
android.opengl.GLES11Ext

Benefits:

+ The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
+ The static API is similar to the C API, which should make it easier to import C-based
example code.
+ The static API provides a clear path for adding new OpenGL ES 1.1 extensions
and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.

Example:

import static android.opengl.GLES10.*;

...

glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.

Implementation details:

This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.

As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
ndroid.mk
ndroidRuntime.cpp
ndroid_opengl_GLES10.cpp
ndroid_opengl_GLES10Ext.cpp
ndroid_opengl_GLES11.cpp
ndroid_opengl_GLES11Ext.cpp
om_google_android_gles_jni_GLImpl.cpp
402c34649f514669517c2208e35caa58ff8bb2b9 15-Apr-2009 Mathias Agopian <mathias@google.com> fix some issues with Surface's lifetime management.

To deal with Java's lack of destructors and delayed garbage collection, we used to duplicate Surface.cpp objects in some case; this caused some issues because Surface is supposed to be reference-counted and unique.
ndroid_view_Surface.cpp
85d7a06826f00f40b56470ad9ec7c75dce1b45df 14-Apr-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
58bda987665af759c379cd494ff4873ac61acf29 14-Apr-2009 Mike Lockwood <lockwood@android.com> gps: Add support for bringing up a GSM data connection on demand for SUPL.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_location_GpsLocationProvider.cpp
d86e6ddfc18833178f5d560ed3c4dc235d12d4c2 14-Apr-2009 Lorenzo Colitti <> AI 146166: am: CL 145920 Don't filter out IPv6 multicast packets.
Original author: lorenzo

Automated import of CL 146166
ndroid_net_wifi_Wifi.cpp
e8624dd69d1647cf5fc10da0447386ade66f0a9e 13-Apr-2009 Lorenzo Colitti <> AI 145920: Don't filter out IPv6 multicast packets.

Automated import of CL 145920
ndroid_net_wifi_Wifi.cpp
1473f46cbc82aa6f0ba744cc896a36923823d55b 10-Apr-2009 Mathias Agopian <mathias@google.com> Integrate from //sandbox/mathias/donut/...@145728

SurfaceFlinger rework for new EGL driver model support.
ndroid.mk
ndroid_view_Surface.cpp
om_google_android_gles_jni_EGLImpl.cpp
e2b23e11a5475e5c35eb07ba883cb05eca18796f 03-Apr-2009 Andy McFadden <> AI 144469: Added test for dalvik.vm.check-dex-sum property.
Enables -Xcheckdexsum argument, which causes the VM to test checksums
when loading optimized DEX files.
BUG=1749836

Automated import of CL 144469
ndroidRuntime.cpp
28d139fa953c0b3bf2c66d92587e5287ec4dd5ab 03-Apr-2009 Robert Greenwalt <> AI 144392: am: CL 144241 Stop polling dbus.
Original author: rgreenwalt

Automated import of CL 144392
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
43ca00b0e82711f67246030e70bfb1f423e4a67f 02-Apr-2009 Ray Chen <> AI 144209: am: CL 144176 To fix the race condition in case "requestCancelDecode"
happens earlier than AutoDecoderCancel object is added
to the gAutoDecoderCancelMutex linked list.
Original author: raychen
Merged from: //branches/donutburger/...

Automated import of CL 144209
ndroid/graphics/BitmapFactory.cpp
84d8d693bd79082069d1781284213030006841b7 02-Apr-2009 Jack Palevich <> AI 144129: Remove hidden class android.os.Exec.
Change BugReportService to use java.os.ProcessBuilder instead.
Remove unused import from DumpStateReceiver.
An earlier change list created a private copy of this class for Term.
BUG=1750582

Automated import of CL 144129
ndroid.mk
ndroidRuntime.cpp
ndroid_os_Exec.cpp
d30b2568cd309053e0e7a0ac7a433d8dafcd3e28 02-Apr-2009 Robert Greenwalt <> AI 144241: Stop polling dbus.
BUG=1244263

Automated import of CL 144241
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
8ba88775fe9df1146de7683a6ef59e36e749b271 02-Apr-2009 Mike Reed <> AI 144018: change path to return its internal cached bounds, making it much lighter-weight to get the bounds.
BUG=1748928

Automated import of CL 144018
ndroid/graphics/Path.cpp
0a6a0e9e95fffc3b53be92ba617e97fff66d1401 02-Apr-2009 Ray Chen <> AI 144176: To fix the race condition in case "requestCancelDecode"
happens earlier than AutoDecoderCancel object is added
to the gAutoDecoderCancelMutex linked list.
BUG=1692286

Automated import of CL 144176
ndroid/graphics/BitmapFactory.cpp
f70188aa4716625781d9952c6b883180528d4644 01-Apr-2009 Andy McFadden <> AI 143840: Split VM initialization out into a separate function.
This makes the code marginally more readable, and cuts about 500 bytes
off the size of the main thread's stack.

Automated import of CL 143840
ndroidRuntime.cpp
ea600ccfb7568f60377c4abc85f56c80af7fdbfc 31-Mar-2009 Nick Pelly <> AI 143788: am: CL 143740 Don't clear supported profiles in settings app if getRemoteClass returns error.
Also clean up the error codes returned by the framework, so that the settings app can properly detect an error.
Original author: npelly
Merged from: //branches/cupcake/...

Automated import of CL 143788
ndroid_server_BluetoothDeviceService.cpp
2b5be0748d160c6df1a9197272a776dc35879081 31-Mar-2009 Nick Pelly <> AI 143812: am: CL 143788 am: CL 143740 Don't clear supported profiles in settings app if getRemoteClass returns error.
Also clean up the error codes returned by the framework, so that the settings app can properly detect an error.
Original author: npelly
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143812
ndroid_server_BluetoothDeviceService.cpp
3f46f0a0cd16186219d501199b59be64d00f3cdc 31-Mar-2009 Nick Pelly <> AI 143740: Don't clear supported profiles in settings app if getRemoteClass returns error.
Also clean up the error codes returned by the framework, so that the settings app can properly detect an error.
BUG=1748881

Automated import of CL 143740
ndroid_server_BluetoothDeviceService.cpp
eb0c86e18b7d620b679ff2a45a0233867a53a334 28-Mar-2009 Mathias Agopian <> AI 143320: am: CL 143171 am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor
Original author: mathias
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143320
ndroid_view_Surface.cpp
66b8ec99c5fc505877b3711a52e284bbb451f836 28-Mar-2009 Mathias Agopian <> AI 143171: am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor
Original author: mathias
Merged from: //branches/cupcake/...

Automated import of CL 143171
ndroid_view_Surface.cpp
c75c4364eae030a9ea6db658c4d1e38cdb05ab4c 26-Mar-2009 Mathias Agopian <> Automated import from //branches/cupcake/...@142873,142873
ndroid_view_Surface.cpp
1badb712b94f5d4a14ca8c3bdb55c215a4915000 25-Mar-2009 Jack Palevich <> Automated import from //branches/master/...@142578,142578
om_google_android_gles_jni_EGLImpl.cpp
4c7533cfc81a0dda4c25355e86558199accab3ea 25-Mar-2009 Jack Palevich <> Automated import from //branches/donutburger/...@142484,142484
om_google_android_gles_jni_EGLImpl.cpp
6c349db7f21b6887a06a783c13b0a78dc5da6a66 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/master/...@142373,142373
ndroid_media_AudioTrack.cpp
a5cb7b7e82bfee87c1ef40f8d5b5d81c8ca13a23 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/donutburger/...@142372,142372
ndroid_media_AudioTrack.cpp
708c17b4168404042852e480f25a91a02cf14247 25-Mar-2009 Jack Palevich <> Automated import from //branches/master/...@141860,141860
ndroid/opengl/util.cpp
0577b26b7fc0a0dba4445c7965e05e98d4253211 25-Mar-2009 Jack Palevich <> Automated import from //branches/donutburger/...@141859,141859
ndroid/opengl/util.cpp
71b8a66f99ebfe60e90cb4710d5a001ff1c4b203 25-Mar-2009 Jack Palevich <> Automated import from //branches/cupcake/...@142481,142481
om_google_android_gles_jni_EGLImpl.cpp
5d2d43356e4ffa29f3f8047ca776f67990e86714 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/cupcake/...@142370,142370
ndroid_media_AudioTrack.cpp
e89554b02d65eb87fb502b675b366d41abfa4979 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/master/...@140869,140869
ndroid_media_JetPlayer.cpp
d3ca04da8ad8f50b6abbf545e6de9a9a2bc2e0d1 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/donutburger/...@140867,140867
ndroid_media_JetPlayer.cpp
c8405b6d02306d4cba4a169a4c24d7791dbaa0b4 25-Mar-2009 Jack Palevich <> Automated import from //branches/cupcake/...@141857,141857
ndroid/opengl/util.cpp
c2ad241504fcaa12d4579d3b0b4038d1ca8d08c9 20-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@141571
ndroid_media_JetPlayer.cpp
7b0b1ed979aa665175bf3952c8902ce13c763ab8 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import //branches/master/...@140412
ndroidRuntime.cpp
105925376f8d0f6b318c9938c7b83ef7fef094da 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
ndroid_location_GpsLocationProvider.cpp
ndroid_os_Hardware.cpp
ndroid_os_Power.cpp
ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
ndroid_os_ParcelFileDescriptor.cpp
c39a6e0c51e182338deb8b63d07933b585134929 11-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137873
ndroidRuntime.cpp
ndroid_server_BluetoothEventLoop.cpp
b2a3dd88a53cc8c6d19f6dc8ec4f3d6c4abd9b54 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
ndroid.mk
ndroidRuntime.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_emoji_EmojiFactory.cpp
ndroid_net_wifi_Wifi.cpp
erver/Android.mk
erver/com_android_server_AlarmManagerService.cpp
erver/com_android_server_BatteryService.cpp
erver/com_android_server_HardwareService.cpp
erver/com_android_server_KeyInputQueue.cpp
erver/com_android_server_SensorService.cpp
erver/com_android_server_SystemServer.cpp
erver/onload.cpp
b22d55b9f8048b2a1ed99b90894c19388bebd7ae 06-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136620
ndroid_util_FileObserver.cpp
4df2423a947bcd3f024cc3d3a1a315a8dc428598 05-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136594
ndroid/graphics/Typeface.cpp
ndroid_text_format_Time.cpp
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ctivityManager.cpp
ndroid.mk
ndroidRuntime.cpp
indTest.cpp
ursorWindow.cpp
ursorWindow.h
raphicsExternGlue.h
raphicsRegisterGlue.h
ODULE_LICENSE_APACHE2
OTICE
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.h
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Interpolator.cpp
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/NIOBuffer.cpp
ndroid/graphics/NIOBuffer.h
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/PathMeasure.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Xfermode.cpp
ndroid/opengl/poly.h
ndroid/opengl/poly_clip.cpp
ndroid/opengl/util.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_Database.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_bluetooth_RfcommSocket.cpp
ndroid_bluetooth_ScoSocket.cpp
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteDebug.cpp
ndroid_database_SQLiteProgram.cpp
ndroid_database_SQLiteQuery.cpp
ndroid_database_SQLiteStatement.cpp
ndroid_ddm_DdmHandleNativeHeap.cpp
ndroid_debug_JNITest.cpp
ndroid_graphics_PixelFormat.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_SensorManager.cpp
ndroid_location_GpsLocationProvider.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_ToneGenerator.cpp
ndroid_message_digest_sha1.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_net_NetUtils.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_nio_utils.cpp
ndroid_nio_utils.h
ndroid_os_Debug.cpp
ndroid_os_Exec.cpp
ndroid_os_FileUtils.cpp
ndroid_os_Hardware.cpp
ndroid_os_MemoryFile.cpp
ndroid_os_ParcelFileDescriptor.cpp
ndroid_os_Power.cpp
ndroid_os_StatFs.cpp
ndroid_os_SystemClock.cpp
ndroid_os_SystemProperties.cpp
ndroid_os_UEventObserver.cpp
ndroid_pim_EventRecurrence.cpp
ndroid_security_Md5MessageDigest.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_text_AndroidCharacter.cpp
ndroid_text_KeyCharacterMap.cpp
ndroid_text_format_Time.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Base64.cpp
ndroid_util_Binder.cpp
ndroid_util_Binder.h
ndroid_util_EventLog.cpp
ndroid_util_FileObserver.cpp
ndroid_util_FloatMath.cpp
ndroid_util_Log.cpp
ndroid_util_Process.cpp
ndroid_util_StringBlock.cpp
ndroid_util_XmlBlock.cpp
ndroid_view_Display.cpp
ndroid_view_Surface.cpp
ndroid_view_ViewRoot.cpp
om_android_internal_graphics_NativeUtils.cpp
om_android_internal_os_ZygoteInit.cpp
om_google_android_gles_jni_EGLImpl.cpp
om_google_android_gles_jni_GLImpl.cpp
erver/Android.mk
erver/com_android_server_AlarmManagerService.cpp
erver/com_android_server_BatteryService.cpp
erver/com_android_server_HardwareService.cpp
erver/com_android_server_KeyInputQueue.cpp
erver/com_android_server_SensorService.cpp
erver/com_android_server_SystemServer.cpp
erver/onload.cpp
qlite3_exception.h
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ctivityManager.cpp
ndroid.mk
ndroidRuntime.cpp
indTest.cpp
ursorWindow.cpp
ursorWindow.h
raphicsExternGlue.h
raphicsRegisterGlue.h
ODULE_LICENSE_APACHE2
OTICE
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.h
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Interpolator.cpp
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/NIOBuffer.cpp
ndroid/graphics/NIOBuffer.h
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/PathMeasure.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Xfermode.cpp
ndroid/opengl/poly.h
ndroid/opengl/poly_clip.cpp
ndroid/opengl/util.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_Database.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_bluetooth_RfcommSocket.cpp
ndroid_bluetooth_ScoSocket.cpp
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteDebug.cpp
ndroid_database_SQLiteProgram.cpp
ndroid_database_SQLiteQuery.cpp
ndroid_database_SQLiteStatement.cpp
ndroid_ddm_DdmHandleNativeHeap.cpp
ndroid_debug_JNITest.cpp
ndroid_graphics_PixelFormat.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_SensorManager.cpp
ndroid_location_GpsLocationProvider.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_media_ToneGenerator.cpp
ndroid_message_digest_sha1.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_net_NetUtils.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_nio_utils.cpp
ndroid_nio_utils.h
ndroid_os_Debug.cpp
ndroid_os_Exec.cpp
ndroid_os_FileUtils.cpp
ndroid_os_Hardware.cpp
ndroid_os_MemoryFile.cpp
ndroid_os_ParcelFileDescriptor.cpp
ndroid_os_Power.cpp
ndroid_os_StatFs.cpp
ndroid_os_SystemClock.cpp
ndroid_os_SystemProperties.cpp
ndroid_os_UEventObserver.cpp
ndroid_pim_EventRecurrence.cpp
ndroid_security_Md5MessageDigest.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_text_AndroidCharacter.cpp
ndroid_text_KeyCharacterMap.cpp
ndroid_text_format_Time.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Base64.cpp
ndroid_util_Binder.cpp
ndroid_util_Binder.h
ndroid_util_EventLog.cpp
ndroid_util_FileObserver.cpp
ndroid_util_FloatMath.cpp
ndroid_util_Log.cpp
ndroid_util_Process.cpp
ndroid_util_StringBlock.cpp
ndroid_util_XmlBlock.cpp
ndroid_view_Display.cpp
ndroid_view_Surface.cpp
ndroid_view_ViewRoot.cpp
om_android_internal_graphics_NativeUtils.cpp
om_android_internal_os_ZygoteInit.cpp
om_google_android_gles_jni_EGLImpl.cpp
om_google_android_gles_jni_GLImpl.cpp
erver/Android.mk
erver/com_android_server_AlarmManagerService.cpp
erver/com_android_server_BatteryService.cpp
erver/com_android_server_HardwareService.cpp
erver/com_android_server_KeyInputQueue.cpp
erver/com_android_server_SensorService.cpp
erver/com_android_server_SystemServer.cpp
erver/onload.cpp
qlite3_exception.h
076357b8567458d4b6dfdcf839ef751634cd2bfb 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
ndroid_database_SQLiteDatabase.cpp
ndroid_hardware_Camera.cpp
ndroid_media_AudioTrack.cpp
ndroid_os_ParcelFileDescriptor.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_util_Binder.cpp
erver/com_android_server_AlarmManagerService.cpp
3dec7d563a2f3e1eb967ce2054a00b6620e3558c 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
ndroid_database_SQLiteDatabase.cpp
ndroid_hardware_Camera.cpp
ndroid_media_AudioTrack.cpp
ndroid_os_ParcelFileDescriptor.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_util_Binder.cpp
erver/com_android_server_AlarmManagerService.cpp
3001a035439d8134a7d70d796376d1dfbff3cdcd 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
ndroid_hardware_Camera.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_os_Debug.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_view_Surface.cpp
da996f390e17e16f2dfa60e972e7ebc4f868f37e 13-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@131421
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_util_EventLog.cpp
d24b8183b93e781080b2c16c487e60d51c12da31 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/NinePatch.cpp
ndroid_hardware_Camera.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_os_Debug.cpp
ndroid_os_NetStat.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_util_AssetManager.cpp
om_google_android_gles_jni_EGLImpl.cpp
erver/com_android_server_HardwareService.cpp
erver/com_android_server_KeyInputQueue.cpp
f1e484acb594a726fb57ad0ae4cfe902c7f35858 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127436
ndroid/graphics/Bitmap.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
22f7dfd23490a3de2f21ff96949ba47003aac8f8 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
ndroid_hardware_Camera.cpp
9266c558bf1d21ff647525ff99f7dadbca417309 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
ndroid.mk
ndroid_database_SQLiteStatement.cpp
ndroid_location_GpsLocationProvider.cpp
ndroid_os_Hardware.cpp
ndroid_os_Power.cpp
ndroid_os_UEventObserver.cpp
ndroid_server_BluetoothA2dpService.cpp
erver/Android.mk
erver/com_android_server_HardwareService.cpp
b798689749c64baba81f02e10cf2157c747d6b46 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/Bitmap.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/Shader.cpp
ndroid/opengl/util.cpp
ndroid_hardware_Camera.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_JetPlayer.cpp
ndroid_os_Power.cpp
ndroid_view_ViewRoot.cpp
om_google_android_gles_jni_EGLImpl.cpp
f013e1afd1e68af5e3b868c26a653bbfb39538f8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ndroid.mk
ndroidRuntime.cpp
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Shader.cpp
ndroid_bluetooth_common.h
ndroid_database_SQLiteProgram.cpp
ndroid_database_SQLiteQuery.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_SensorManager.cpp
ndroid_media_AudioRecord.cpp
ndroid_media_AudioTrack.cpp
ndroid_media_ToneGenerator.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_net_NetUtils.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_pim_Time.cpp
ndroid_server_BluetoothA2dpService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_text_AndroidCharacter.cpp
ndroid_text_format_Time.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Process.cpp
om_google_android_gles_jni_EGLImpl.cpp
om_google_android_gles_jni_GLImpl.cpp
erver/Android.mk
erver/com_android_server_AlarmManagerService.cpp
erver/com_android_server_SensorService.cpp
54b6cfa9a9e5b861a9930af873580d6dc20f773c 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ctivityManager.cpp
ndroid.mk
ndroidRuntime.cpp
indTest.cpp
ursorWindow.cpp
ursorWindow.h
raphicsExternGlue.h
raphicsRegisterGlue.h
ODULE_LICENSE_APACHE2
OTICE
ndroid/graphics/Bitmap.cpp
ndroid/graphics/BitmapFactory.cpp
ndroid/graphics/Camera.cpp
ndroid/graphics/Canvas.cpp
ndroid/graphics/ColorFilter.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.cpp
ndroid/graphics/CreateJavaOutputStreamAdaptor.h
ndroid/graphics/DrawFilter.cpp
ndroid/graphics/Graphics.cpp
ndroid/graphics/GraphicsJNI.h
ndroid/graphics/Interpolator.cpp
ndroid/graphics/LayerRasterizer.cpp
ndroid/graphics/MaskFilter.cpp
ndroid/graphics/Matrix.cpp
ndroid/graphics/Movie.cpp
ndroid/graphics/NIOBuffer.cpp
ndroid/graphics/NIOBuffer.h
ndroid/graphics/NinePatch.cpp
ndroid/graphics/NinePatchImpl.cpp
ndroid/graphics/Paint.cpp
ndroid/graphics/Path.cpp
ndroid/graphics/PathEffect.cpp
ndroid/graphics/PathMeasure.cpp
ndroid/graphics/Picture.cpp
ndroid/graphics/PorterDuff.cpp
ndroid/graphics/Rasterizer.cpp
ndroid/graphics/Region.cpp
ndroid/graphics/Shader.cpp
ndroid/graphics/Typeface.cpp
ndroid/graphics/Xfermode.cpp
ndroid/opengl/poly.h
ndroid/opengl/poly_clip.cpp
ndroid/opengl/util.cpp
ndroid_bluetooth_BluetoothAudioGateway.cpp
ndroid_bluetooth_Database.cpp
ndroid_bluetooth_HeadsetBase.cpp
ndroid_bluetooth_RfcommSocket.cpp
ndroid_bluetooth_ScoSocket.cpp
ndroid_bluetooth_common.cpp
ndroid_bluetooth_common.h
ndroid_database_CursorWindow.cpp
ndroid_database_SQLiteDatabase.cpp
ndroid_database_SQLiteDebug.cpp
ndroid_database_SQLiteProgram.cpp
ndroid_database_SQLiteQuery.cpp
ndroid_database_SQLiteStatement.cpp
ndroid_ddm_DdmHandleNativeHeap.cpp
ndroid_debug_JNITest.cpp
ndroid_graphics_PixelFormat.cpp
ndroid_hardware_Camera.cpp
ndroid_hardware_SensorManager.cpp
ndroid_location_GpsLocationProvider.cpp
ndroid_media_AudioSystem.cpp
ndroid_media_ToneGenerator.cpp
ndroid_message_digest_sha1.cpp
ndroid_net_LocalSocketImpl.cpp
ndroid_net_NetUtils.cpp
ndroid_net_wifi_Wifi.cpp
ndroid_nio_utils.cpp
ndroid_nio_utils.h
ndroid_os_Debug.cpp
ndroid_os_Exec.cpp
ndroid_os_FileUtils.cpp
ndroid_os_Hardware.cpp
ndroid_os_MemoryFile.cpp
ndroid_os_NetStat.cpp
ndroid_os_ParcelFileDescriptor.cpp
ndroid_os_Power.cpp
ndroid_os_StatFs.cpp
ndroid_os_SystemClock.cpp
ndroid_os_SystemProperties.cpp
ndroid_os_UEventObserver.cpp
ndroid_pim_EventRecurrence.cpp
ndroid_pim_Time.cpp
ndroid_security_Md5MessageDigest.cpp
ndroid_server_BluetoothDeviceService.cpp
ndroid_server_BluetoothEventLoop.cpp
ndroid_text_AndroidCharacter.cpp
ndroid_text_KeyCharacterMap.cpp
ndroid_util_AssetManager.cpp
ndroid_util_Base64.cpp
ndroid_util_Binder.cpp
ndroid_util_Binder.h
ndroid_util_EventLog.cpp
ndroid_util_FileObserver.cpp
ndroid_util_FloatMath.cpp
ndroid_util_Log.cpp
ndroid_util_Process.cpp
ndroid_util_StringBlock.cpp
ndroid_util_XmlBlock.cpp
ndroid_view_Display.cpp
ndroid_view_Surface.cpp
ndroid_view_ViewRoot.cpp
om_android_internal_graphics_NativeUtils.cpp
om_android_internal_os_ZygoteInit.cpp
om_google_android_gles_jni_EGLImpl.cpp
om_google_android_gles_jni_GLImpl.cpp
erver/Android.mk
erver/com_android_server_AlarmManagerService.cpp
erver/com_android_server_BatteryService.cpp
erver/com_android_server_HardwareService.cpp
erver/com_android_server_KeyInputQueue.cpp
erver/com_android_server_SensorService.cpp
erver/com_android_server_SystemServer.cpp
erver/onload.cpp
qlite3_exception.h