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

3255 Commits

Author SHA1 Message Date
Igor Murashkin
033a68ca10 Merge "camera2: Don't log vendor tag errors when camera HAL too old" 2014-03-17 21:53:48 +00:00
Igor Murashkin
5614cbe644 camera2: Don't log vendor tag errors when camera HAL too old 
Change-Id: Id7fe9464d7599a566cea976cddc62ad101cf4a10
 2014-03-17 14:00:55 -07:00
Chris Craik
34f67f26e3 Remove castsShadow and globalCamera APIs 
Change-Id: I5c1c375f45946609b1635d952c5adf55e23bdd60
 2014-03-17 13:24:08 -07:00
John Reck
0a6b0031f0 Merge "Rename DisplayList->RenderNode" 2014-03-17 18:12:02 +00:00
John Reck
f666ad7046 Rename DisplayList->RenderNode 
Change-Id: Idcca6f26ba6282594789962f5edb3ed53a290fef
 2014-03-17 10:30:32 -07:00
John Reck
e2d3f28e85 Merge "Revert "Rename DisplayList->RenderNode"" 2014-03-15 02:15:34 +00:00
John Reck
31f9458908 Revert "Rename DisplayList->RenderNode" 
Missed some test(s), reverting to fix build

This reverts commit ef09d8cf946443e7f4ac4541f843368ac4338c59.

Change-Id: Ifee6c694e5f4b962d03dee200ccbf8dc9662e666
 2014-03-15 02:14:53 +00:00
John Reck
759067f39a Merge "Rename DisplayList->RenderNode" 2014-03-15 00:25:34 +00:00
John Reck
ef09d8cf94 Rename DisplayList->RenderNode 
Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad
 2014-03-14 17:14:16 -07:00
Dave Allison
dbcd5b70ca am 273fe6a3: am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope" 
* commit '273fe6a327de8051ac075855ceb7b33a9422c7a7':
  Move options buffers to top scope
 2014-03-14 21:35:51 +00:00
Dave Allison
4a02e0716d am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope" 
* commit '788fb96d7f1cfe27cf8dd56a053258964427286f':
  Move options buffers to top scope
 2014-03-14 21:21:50 +00:00
Dave Allison
07a1e2323b 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
 2014-03-14 21:15:08 +00:00
Ruben Brunk
dba764426b Merge "camera3: Pass vendor tags through binder." 2014-03-13 20:18:37 +00:00
Ruben Brunk
85c4388de1 camera3: Pass vendor tags through binder. 
Bug: 12134423

Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
 2014-03-13 12:14:49 -07:00
John Reck
acb6f07623 Split out RenderProperties 
Change-Id: Ia9888b4fb2c849d95a8c395cafef2e2294a23aae
 2014-03-12 23:32:24 +00:00
John Reck
33896588e8 No-op isolatedZVolumen property 
Change-Id: I7aa474d65a3d12efd4ffb731e07ee42f4d348183
 2014-03-12 15:14:12 -07:00
John Reck
e18264b079 Rename DisplayList->RenderNode 
Change-Id: Id42e23c9a1a6eb6eaeafef707ced7fa6887b03d0
 2014-03-12 13:56:30 -07:00
Jean-Michel Trivi
7ca2b89585 Merge "AudioTrack write method with data in ByteBuffer" 2014-03-11 17:12:59 +00:00
Narayan Kamath
42a51ae881 Fix scaleNinePatch. 
Use yDivs for yDivs, and not xDivs.

bug: 13394494
Change-Id: I4ca5fe33cf61922a894f071927ef08b2d7db7dd0
 2014-03-11 16:50:30 +00:00
Narayan Kamath
549046038e 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).
 2014-03-11 15:24:42 +00:00
Narayan Kamath
a870652789 am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 
* commit 'b071a07da89a8736fa4fd757f9a6c6e990d0e858':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
 2014-03-11 15:17:45 +00:00
Narayan Kamath
b3802a8e23 Remove java.io.tmpdir assignment in AndroidRuntime (again). 
This was brought back by a bad merge conflict resolution
in change 0efbd9a463c848118c7685f4bfc8765a82caa761.

Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
 2014-03-11 15:02:10 +00:00
Jean-Michel Trivi
7ca0452fa6 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
 2014-03-11 01:34:03 +00:00
Brian Carlstrom
02c7f9582b am 7b7d111b: am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit '7b7d111ba21c7c5ad161207a75f72948c427b1b0':
  Only pass -Xprofile-* options to ART
 2014-03-10 17:57:35 +00:00
Brian Carlstrom
9e73672362 am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
  Only pass -Xprofile-* options to ART
 2014-03-10 17:51:05 +00:00
Brian Carlstrom
98ba7bd5d1 Only pass -Xprofile-* options to ART 
Bug: 13391896
Change-Id: I5d6a3b900c9b20f02e1d4ccb73f712e9260c7dfd
 2014-03-10 10:22:10 -07:00
John Reck
be34f2f3b3 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
 2014-03-10 10:12:32 -07:00
Narayan Kamath
b5c4e7fd38 resolved conflicts for merge of 92860a74 to master 
Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
 2014-03-10 10:57:05 +00:00
Narayan Kamath
8272c84cb5 am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic." 
* commit 'bbf826659e8e5d0be683b2459207c495303d53b6':
  LP64: Make 9 patches architecture agnostic.
 2014-03-10 10:47:45 +00:00
Narayan Kamath
6381dd4ff2 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
 2014-03-10 10:00:02 +00:00
Dave Allison
2d3ddc2ba9 am 199670c4: am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage." 
* commit '199670c46a9950bd2e06af43ea082427b542060a':
  ART profiler usage.
 2014-03-08 07:26:41 +00:00
Dave Allison
324aa693b8 am b94904ab: am 3fc3b9fd: Merge "ART profiler usage." 
* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
  ART profiler usage.
 2014-03-08 01:56:29 +00:00
Dave Allison
0efbd9a463 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
 2014-03-07 12:32:44 -08:00
Chris Craik
b7d0cfa0d8 Merge "Add Path.isConvex, and force View outlines to be convex" 2014-03-06 18:18:59 +00:00
Brian Carlstrom
aa1d023bb9 am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '674fd6c442cd3886b3ab12be1d36c5d05ef48cdb':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 20:09:52 +00:00
Brian Carlstrom
a258b4a9e8 am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '485e3b459491267ae1390e1df5ff8f7d4695f819':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 19:29:40 +00:00
John Reck
24ba99c235 Merge "DisplayList overhaul" 2014-03-05 17:00:54 +00:00
John Reck
44fd8d24f7 DisplayList overhaul 
Change-Id: I53418d580c98f706e971545cff81b9921c12cc5f
 2014-03-04 15:18:16 -08:00
Brian Carlstrom
3beff1e023 Add dex2oat-flags plumbing to AndroidRuntime 
Change-Id: Idaa7e5351e146d76e1972cbe4d93af69f0b999a6
 2014-03-04 14:08:46 -08:00
Michael Chock
b506624536 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
 2014-03-04 09:59:30 -08:00
Chris Craik
5be83edd15 Add Path.isConvex, and force View outlines to be convex 
Change-Id: Idf3f1ee44240d77f7a7ddd0da898da8aa5d41864
 2014-03-03 16:16:19 -08:00
Chris Craik
adbd2ba1bc Call correct MaskFilter factory method 
Change-Id: Ibc30361427cc484443579930f729145ef19c6916
 2014-02-28 12:47:47 -08:00
Chris Craik
6786252405 Fix use of Skia deprecated methods 
Change-Id: Ib89c20fc94bcce29b7490d6f55c73492735befda
 2014-02-28 12:26:34 -08:00
Glenn Kasten
1489b09b64 Merge "AudioTrack constructor/set parameter frameCount is size_t" 2014-02-28 16:18:07 +00:00
Narayan Kamath
e0d10cd923 am d8ccf8b7: am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit 'd8ccf8b789461e1706d10df44d109849fa974fc5':
  Various format string fixes for 64bit
 2014-02-28 13:53:15 +00:00
Narayan Kamath
be094d89db am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
  Various format string fixes for 64bit
 2014-02-28 13:46:53 +00:00
Narayan Kamath
eee2c72f96 Merge "Various format string fixes for 64bit" 2014-02-28 13:41:58 +00:00
Derek Sollenberger
fc92763408 Merge "Fix includes so that they no longer rely on the global Skia includes directories." 2014-02-28 13:23:15 +00:00
Glenn Kasten
3118ca9b09 AudioTrack constructor/set parameter frameCount is size_t 
Change-Id: Ie92ab0433531b3852747a81d2bfce9625644a2ae
 2014-02-27 15:53:50 -08:00
Derek Sollenberger
eece0dda56 Fix includes so that they no longer rely on the global Skia includes directories. 
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
 2014-02-27 14:31:29 -05:00