Elliott Hughes
434a481b21
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
...
* commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5':
constify JNINativeMethod function pointer tables
2015-09-24 17:23:00 +00:00
Elliott Hughes
ea1831d211
am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
...
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
constify JNINativeMethod function pointer tables
2015-09-24 17:14:10 +00:00
Elliott Hughes
b57dd722f1
resolved conflicts for a884d81e to stage-aosp-master
...
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
2015-09-24 10:01:32 -07:00
Daniel Micay
76f6a86de2
constify JNINativeMethod function pointer tables
...
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
2015-09-22 17:10:35 -04:00
Stefan Kuhne
fe1f99c2b2
Merge "MultiThreaded rendering of different renderNodes"
2015-09-21 22:08:30 +00:00
Skuhne
ea7a7fb75a
MultiThreaded rendering of different renderNodes
...
This is adding the renderer side infrastructure to allow
rendering multiple render nodes with different threads.
This is a pre-step for decoupling a non client decor
resize reder from a content resize render.
Multiple render nodes can be added to be drawn, and to
prevent overdrawing, a content bounds area can be set
Bug: 22527834
Change-Id: Ie7271e20895bf38957e5a84aeefc883e282039ad
2015-09-21 07:18:00 -07:00
Matthew Dempsky
1fa606b867
Eliminate uses of Skia's SkDELETE macro
...
Skia no longer uses these macros internally. They're now only
provided for backwards compatibility, so remove their uses within
Android.
See thread on skia-discuss:
https://groups.google.com/d/msg/skia-discuss/l9TSgpYCHpU/sNpA1y8YCQAJ
Change-Id: Ia7313f5bbdf4d2d9fb4a10fc5bdc1572e6b84f6c
2015-09-18 19:17:57 -07:00
Pablo Ceballos
3aa8ede9e1
Merge "Implement single buffer mode using setMaxBufferCount"
2015-09-16 20:20:00 +00:00
Tao Bai
ab5bca1519
Merge "Load app resource as shared library."
2015-09-09 16:08:12 +00:00
Tao Bai
a6d7e3fb9c
Load app resource as shared library.
...
- Added aapt command line flag --app-as-shared-lib to build app resources
that could be loaded as shared lib at runtime.
- Added new method AssetManager.addAssetPathAsSharedLibrary() to load an
app resource as shared library.
Bug 22487604
Change-Id: Ib9b33c35f9c2b7129f3ba205de03d4564623ea39
2015-09-08 18:48:42 -07:00
Dan Stoza
4b4d29a6fa
am 8dcd14cd: am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
...
* commit '8dcd14cdc95a5b71597fa428b9c2a45c3a86944c':
SurfaceControl: Add colorTransform to DisplayInfo
2015-09-04 14:28:31 +00:00
Dan Stoza
8dcd14cdc9
am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
...
* commit '4a90942ea75039f916d8371111fdc41a80039b98':
SurfaceControl: Add colorTransform to DisplayInfo
2015-09-04 02:21:41 +00:00
Sharvil Nanavati
db8a6ee56b
am 80770c09: am 16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev
...
* commit '80770c099144b65e9c7768bbdb56608eebf03b01':
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
2015-09-04 02:21:21 +00:00
Dan Stoza
f615872cb4
am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
...
* commit '0b887e579b766012c09626e7089a3fade5415ee6':
SurfaceControl: Add colorTransform to DisplayInfo
2015-09-03 22:03:08 +00:00
Sharvil Nanavati
16db410182
Merge "DO NOT MERGE Add 'bluetooth' user to the 'system' group." into cw-e-dev
2015-09-03 21:02:43 +00:00
Dan Stoza
904f485bc6
SurfaceControl: Add colorTransform to DisplayInfo
...
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.
Bug: 20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
2015-09-03 13:38:39 -07:00
Pablo Ceballos
e442b63c83
Implement single buffer mode using setMaxBufferCount
...
Bug 13174928
Change-Id: I5319c3d7d07b8ddeaf8fd8e8efe0dbfb58d5c1ac
2015-09-02 16:49:20 -07:00
Yasuhiro Matsuda
6d444185e5
resolved conflicts for merge of fcf9ab5a to master
...
Change-Id: I69ad6e525430c5c4fc3c274b8bf6ebf653716124
2015-09-03 00:12:30 +09:00
Yasuhiro Matsuda
fcf9ab5ab3
am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master
...
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
Add trace code to system server.
2015-09-02 14:31:26 +00:00
Yasuhiro Matsuda
ebf9465d21
resolved conflicts for merge of ef57e5e0 to stage-aosp-master
...
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
ef57e5e03b
Merge "Add trace code to system server."
2015-09-02 12:54:23 +00:00
Christopher Ferris
1eaecf5c6d
am 7dd51792: am d6597cb4: am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev
...
* commit '7dd51792e2131891d402b4f86c78afa86b6d5758':
Save/restore errno in SIGCHLD handler.
2015-09-01 16:10:01 +00:00
Sharvil Nanavati
babe81546e
DO NOT MERGE Add 'bluetooth' user to the 'system' group.
...
Also grant the Bluetooth process CAP_BLOCK_SUSPEND so it can acquire
wake locks directly from /sys/power/wake_lock.
Bug: 23375670
Change-Id: Ib094c5752d49488c2560897ff6bb821daf98a281
2015-08-31 23:25:06 -07:00
Christopher Ferris
7dd51792e2
am d6597cb4: am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev
...
* commit 'd6597cb43c1985ec955f2f5c5daf7be52a9f12a2':
Save/restore errno in SIGCHLD handler.
2015-09-01 00:41:06 +00:00
Christopher Ferris
a8a795428a
Save/restore errno in SIGCHLD handler.
...
The SIGCHLD handler can set the errno, which can change the errno found
on the thread on which the signal handler is invoked. Most of the time
this is harmless, but it's possible that if the main thread was making
a system call, and allows certain failures based on errno, that logic
can fail. The fix is to save/restore errno in the handler.
Bug: 23572286
Bug: 23689391
Change-Id: I4542fd60cc1398ce0a8902d8df98a3d089fb6efe
2015-08-31 16:36:14 -07:00
Ruben Brunk
847370ce61
am 7ba74bf2: am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
...
* commit '7ba74bf2600d3227521c4a1a61197df4a48cc805':
Fix DngCreator default crop calculations.
2015-08-28 22:16:11 +00:00
Ruben Brunk
7ba74bf260
am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
...
* commit 'e65066d30eb52d2ef938501890ba4cf99d8f1b7b':
Fix DngCreator default crop calculations.
2015-08-28 22:05:46 +00:00
Ruben Brunk
96990d0cdd
Merge "Fix DngCreator default crop calculations." into mnc-dr-dev
2015-08-28 21:42:26 +00:00
Ruben Brunk
a4ff47ced1
Fix DngCreator default crop calculations.
...
Bug: 23591407
Change-Id: I1b0e46e7371b3db63e8d68230964d09d7537c3ce
2015-08-28 11:35:42 -07:00
John Reck
43c2091a65
Merge "Serializing display lists"
2015-08-28 15:09:55 +00:00
Eric Laurent
4803708270
am 155c1ad1: am 38f6f487: am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()
...
* commit '155c1ad113dd6ec6bab9fdcb0934db255603237a':
AudioTrack: error reporting for getTimestamp()
2015-08-27 19:22:22 +00:00
Eric Laurent
aef51d09ef
am 4a8034ca: AudioTrack: error reporting for getTimestamp()
...
* commit '4a8034caea13a90c01800ff554539772c6ff5523':
AudioTrack: error reporting for getTimestamp()
2015-08-27 18:28:48 +00:00
Eric Laurent
4a8034caea
AudioTrack: error reporting for getTimestamp()
...
Add a new getTimestamp() method that returns an error code.
Bug: 21886109.
Bug: 22202349.
Bug: 17548098.
Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
(cherry picked from commit 4e1ccd370fc268f3207c5baee08ac8c943c3fdf9)
2015-08-27 17:52:38 +00:00
Yasuhiro Matsuda
1ab43d5978
Add trace code to system server.
...
- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.
BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327
2015-08-27 12:22:07 +09:00
John Reck
e248bd1b2c
Serializing display lists
...
This is a WIP prototype
Change-Id: Id4bfcf2b7bf905221c3734b7b6887c9b2efd37e6
2015-08-26 16:29:15 -07:00
Matt Sarett
2a4db1327e
Build fix for change in skia headers
...
Change-Id: I3cfb15cd31186a90ee60f89035efa6b237c1d3ec
2015-08-26 14:39:21 +00:00
Pablo Ceballos
a39f61359f
Merge "Explicitly construct all Rects"
2015-08-25 22:13:01 +00:00
Eric Laurent
61483d885a
Merge "AudioTrack: error reporting for getTimestamp()"
2015-08-24 17:06:32 +00:00
Eric Laurent
4e1ccd370f
AudioTrack: error reporting for getTimestamp()
...
Add a new getTimestamp() method that returns an error code.
Bug: 21886109.
Bug: 22202349.
Bug: 17548098.
Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
2015-08-21 18:11:21 -07:00
Chris Craik
86c03ca534
Fixup DisplayListCanvas jni variable names
...
Change-Id: I279833f5fe4525ebbab3330c5b36582560ca87e9
2015-08-21 14:05:06 -07:00
Chris Craik
3aadd60521
Revert "Revert "Simplify TextureView draw path""
...
Fixed build breakage
This reverts commit d35dcb13115ca1dd8c07e397f43a186cd7fd1a01.
Change-Id: Id3a103fbaac15a05f558bce2161ce17b6e8d2ea3
2015-08-21 10:33:02 -07:00
Elliott Hughes
1262059c07
am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process"
...
* commit '260cb53fdb751dd6997b6b6f60a358257c4df82a':
zygote: fix memory leak when fork process
2015-08-20 19:31:45 +00:00
Derek Sollenberger
1ad545d207
Fix path direction enum to match native SkPath values
...
Change-Id: I4010e400cef0baf6dd23d7f7e837a2bfb7154059
2015-08-20 14:27:10 -04:00
Ben Wagner
b03198de9f
Merge "Use static_assert instead of SK_COMPILE_ASSERT."
2015-08-20 14:56:10 +00:00
Bart Sears
3b1c32eb5d
Merge "Revert "Simplify TextureView draw path""
2015-08-20 02:25:30 +00:00
Bart Sears
d35dcb1311
Revert "Simplify TextureView draw path"
...
This reverts commit 20a248934c67b19c8734362dba76a5cc94254686.
Change-Id: Iaa3ebb1d868acbe184080087aec312b43e87e3c7
2015-08-20 02:23:39 +00:00
Elliott Hughes
45793a71e7
am 31b1b276: am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process"
...
* commit '31b1b2766d80a9a1979488e57a49d1015cfb5538':
zygote: fix memory leak when fork process
2015-08-20 01:39:10 +00:00
Elliott Hughes
31b1b2766d
am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process"
...
* commit '260cb53fdb751dd6997b6b6f60a358257c4df82a':
zygote: fix memory leak when fork process
2015-08-20 01:30:41 +00:00
Elliott Hughes
ce4fbb4da6
Merge "zygote: fix memory leak when fork process"
2015-08-20 01:14:00 +00:00
Chris Craik
20a248934c
Simplify TextureView draw path
...
bug:20461288
Change-Id: I239fbd26ab2177481c84feb62a1da68faeb634ac
2015-08-19 16:59:45 -07:00