• 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 >>>)
0e40462e11d27eb859b829b112cecb8c6f0d7afb 13-May-2015 John Reck <jreck@google.com> Revert "DO NOT MERGE Backport of limited jank-tracking metrics"

This reverts commit 2614bd225f84f7a23e6b30fc6b47bede153e5f4c.

Change-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8
ndroid_view_Surface.cpp
ndroid_view_ThreadedRenderer.cpp
d5a4a1aac980c304d6f46f07f15bfc5c94d8f9d0 19-Feb-2015 John Reck <jreck@google.com> DO NOT MERGE Backport of limited jank-tracking metrics

Bug: 19821830

Cherry-pick of ba6adf66d3c44c0aa2fd8a224862ff1901d64300
Cherry-pick of e70c5754d01f2ab0ff47ea3eabaa88aca5ed2a36

Change-Id: Id342fa0ab345f204bec58acf45ce72f6de950cfb
ndroid_view_Surface.cpp
ndroid_view_ThreadedRenderer.cpp
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
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
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
112e35b4641a1a8cad3616c8209ab47f03f9ab67 16-Jan-2015 Chris Craik <ccraik@google.com> Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev
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
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
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
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
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
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
65bc1125b4bdb0e982b37e76ab8a9a66adefd2e0 10-Dec-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev
3ef5033cdacbc44702d0b6ba687e81383348e2fd 10-Dec-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
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
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
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
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
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
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
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
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
29dc496a42d49a37dcd99c0465f3cec18a47e6ff 21-Nov-2014 Chris Craik <ccraik@google.com> Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
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
a582bd4b42e6bd52cb611bd551d0b60ba1ed664f 20-Nov-2014 Eric Laurent <elaurent@google.com> Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev
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
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
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
7f5fbe9e11e432a986387cdd72af9afaad8e7fd3 17-Nov-2014 Ying Wang <wangying@google.com> Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev
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
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
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
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
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
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
d17793ea2a93af6ba9bc64c77502f48aa32814e4 07-Nov-2014 Dan Stoza <stoza@google.com> Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
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
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
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
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
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
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
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
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
7ef463168c9ba08548858df086934b125c1ff57c 29-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev
85d6f299943017f939ecfee9708f10b4e5fddd3e 29-Oct-2014 Vladimir Marko <vmarko@google.com> Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev
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
8e5aafe57dd1f5e8ccd7ad1bf37e4487fbe8a110 28-Oct-2014 Dianne Hackborn <hackbod@google.com> Condense AndroidRuntime init log, include uid running under.

Change-Id: Ifda3001fdc25d759f07a93b8569c59da89a8bcfc
ndroidRuntime.cpp
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
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
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
36960fad6631f3cb5f2c6048e482e19319b6b2d3 22-Oct-2014 Leon Scroggins III <scroggo@google.com> Merge "Decoder only returns true on complete success." into lmp-mr1-dev
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.
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
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
86fd9278a98260e5812569381a07145221daa33d 08-Oct-2014 Chris Craik <ccraik@google.com> Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev
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
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
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
6a2296d856fe4db524ab71c6500f356ff0454f29 04-Oct-2014 John Reck <jreck@google.com> am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev

* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
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
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
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
cd8e73817d14798f9d2031ffd301a03a096b7907 01-Oct-2014 Adam Lesinski <adamlesinski@google.com> Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
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
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
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
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
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.
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
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."
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
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
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
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.
81ba98619b3b7d5856fe3787167333b05fe16f83 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
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
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
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
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
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
c1823452ad82d46534001434cf75b19cb986ca26 24-Sep-2014 Eric Laurent <elaurent@google.com> Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
bdad1afa92a6e7cd688061d5432f25a3dd15b64e 20-Sep-2014 Eric Laurent <elaurent@google.com> AudioRecord: add HW hotword capture flag

Bug: 17575019.
Change-Id: Ifa8b8342dffa12e1943b8f9105f6ab1fa4a2b1a6
ndroid_media_AudioRecord.cpp
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.
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
072707dfad1da6f49f4d3ce58ca104f6c46a7266 15-Sep-2014 Jorim Jaggi <jjaggi@google.com> Use RenderThread for navigation bar ripples

Bug: 17506181
Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
ndroid_view_GLES20Canvas.cpp
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
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
15040e0a58b620e0fd75c8a6a8cd8b403aad5c22 10-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Trim unnecessary pages when printing." into lmp-dev
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
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
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
8232d822aa97e78e982ed154ac618cde34baac2a 07-Sep-2014 Eric Laurent <elaurent@google.com> Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
1698297daf8068bc9e6971d43744d48f1672bab2 26-Aug-2014 John Reck <jreck@google.com> Merge "DO NOT MERGE Copy shaders" into lmp-dev
6d388af85379f4d534002118caa9ba4f7812e049 26-Aug-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev
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
5fa3f3a995ba5bd86e460b1b5f72b2f1ada699fb 23-Aug-2014 Pat Tjin <pattjin@google.com> Merge "SurfaceControl: free ref when not used anymore" into lmp-dev
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
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
2d84cdb414fe15fb8d12a870e76b1e9cfdb2e10b 21-Aug-2014 Chris Craik <ccraik@google.com> Merge "Add bounds checking to nine patch scaling" into lmp-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
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
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
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"
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: Ieb44a3f1f