3895 Commits

Author SHA1 Message Date
John Reck
7dd9776fa8 am d73a1aa3: am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev
* commit 'd73a1aa3b97d9cd9792dec4a58ab6150b76afb31':
  DO NOT MERGE Copy shaders
2014-08-26 15:13:50 +00:00
John Reck
1698297daf Merge "DO NOT MERGE Copy shaders" into lmp-dev 2014-08-26 14:53:34 +00:00
Ruben Brunk
36340182c0 am 4d4e16a0: am 34b23108: Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev
* commit '4d4e16a094d674d5a6f62ef8ec3b5671cc24f002':
  camera2: Fix number of DNG NoiseProfile coeffs.
2014-08-26 11:29:13 +00:00
Ruben Brunk
6d388af853 Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev 2014-08-26 06:55:26 +00:00
Chris Craik
c53e7c8578 am b0640084: am 6210c6dc: Merge "Create z reordering boundaries around dispatchDraw" into lmp-dev
* commit 'b06400847cdfae6da8d3d4d5b52e2ff29d06cb7a':
  Create z reordering boundaries around dispatchDraw
2014-08-26 04:56:01 +00:00
Raph Levien
8433bf7190 am a8eb3b2e: am 66cb62c6: Merge "Preserve paint parameters in Paint copy constructor" into lmp-dev
* commit 'a8eb3b2ed7e91d601fe4ec0e763b1e8ca8ecbc13':
  Preserve paint parameters in Paint copy constructor
2014-08-26 04:53:01 +00:00
Chris Craik
8afd0f245c 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
2014-08-25 15:35:40 -07:00
John Reck
c1469f39b5 DO NOT MERGE Copy shaders
Bug: 16733996

Change-Id: I84afc1b24a23dd6ddf5ab48fb2bfcbe779f8d3e3
2014-08-25 15:27:11 -07:00
Ruben Brunk
d70132c373 camera2: Fix number of DNG NoiseProfile coeffs.
Bug: 16369384
Change-Id: I3ceca5ed3489120664990c0d057e6537b357c788
2014-08-25 12:58:13 -07:00
Raph Levien
908040534d 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
2014-08-25 09:36:29 -07:00
Pat Tjin
59935635a2 am dce17b0f: am e0eb27c6: Merge "SurfaceControl: free ref when not used anymore" into lmp-dev
* commit 'dce17b0faee9594b31839502966c03504d9684c0':
  SurfaceControl: free ref when not used anymore
2014-08-22 22:23:11 +00:00
Pat Tjin
5fa3f3a995 Merge "SurfaceControl: free ref when not used anymore" into lmp-dev 2014-08-22 22:04:37 +00:00
John Reck
a5f9567f2e am 661e8029: am 673b5523: Merge "Revert immutable Shader change" into lmp-dev
* commit '661e8029fd1e74f4a452ba57a21ef0912cf0df53':
  Revert immutable Shader change
2014-08-22 20:43:34 +00:00
Thierry Strudel
5474f3396a 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>
2014-08-22 19:48:27 +00:00
John Reck
01edef10b9 Revert immutable Shader change
Bug: 16733996

Change-Id: I51686aaf8f6ae8d0e390e298ad70f98f81c5f555
2014-08-22 11:15:37 -07:00
Lorenzo Colitti
18bcd9561d am f325858e: am fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev
* commit 'f325858e128c77791d245a9a54aec0dbfc8665f0':
  Rework the per-network URL API.
2014-08-22 03:35:06 +00:00
Lorenzo Colitti
9f1274b7e4 Rework the per-network URL API.
This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
2014-08-21 19:09:27 -07:00
Chris Craik
16b77f116f am 08ae94e2: am d093d695: Merge "Add bounds checking to nine patch scaling" into lmp-dev
* commit '08ae94e2d2f4643c40f7be24e72202132fb99e9e':
  Add bounds checking to nine patch scaling
2014-08-21 03:03:17 +00:00
John Reck
e4ed4f74d1 am 17ed6e74: am 876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev
* commit '17ed6e74ce560916d4a06198d4f6446562d9db34':
  Implement full View.buildLayer
2014-08-21 03:00:11 +00:00
Chris Craik
2d84cdb414 Merge "Add bounds checking to nine patch scaling" into lmp-dev 2014-08-21 00:16:54 +00:00
Mathieu Chartier
cbed4e523b am be39e991: am 977c4a5b: Merge "Clean up ExceptionOccurred."
* commit 'be39e99187eec88222722e9ec4c91f1744731cf4':
  Clean up ExceptionOccurred.
2014-08-21 00:02:38 +00:00
Chris Craik
bd8db2e87e 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
2014-08-20 16:37:16 -07:00
Mathieu Chartier
98671c34fa Clean up ExceptionOccurred.
Use ExceptionCheck before ExceptionOccurred since ExceptionCheck
doesn't acquire any locks and is faster.

Change-Id: Ibd87fd1e33b339bd2a6effa1d20d3253c8a61bdc
2014-08-20 16:24:47 -07:00
Lorenzo Colitti
56d4c18e2f am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev
* commit '45b565ffdbd2962c336f385d80d6516cd1cc489a':
  Stop using LinkProperties for static configuration.
2014-08-19 19:37:53 +00:00
Elliott Hughes
7380d866e5 am 72d3cef8: am 708da446: Merge "Use gettid directly in frameworks JNI."
* commit '72d3cef8675b4a8eced300adeb148a835b7fdd57':
  Use gettid directly in frameworks JNI.
2014-08-18 19:34:27 +00:00
John Reck
3e8249568c Implement full View.buildLayer
Bug: 17152292

Change-Id: Ia3cc2aadf72fe14517f50762fc634794df51ad5a
2014-08-20 15:54:07 -07:00
Lorenzo Colitti
0a82e80073 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
2014-08-19 11:59:43 -07:00
Elliott Hughes
06451fe081 Use gettid directly in frameworks JNI.
Bug: 17048545
Change-Id: I1cd45d85368c799b75f76e778722979cbbb68ed2
2014-08-18 10:39:55 -07:00
Ruben Brunk
e364aecf17 Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev 2014-08-15 18:45:09 +00:00
Ruben Brunk
1dc1326eae camera2: Add jpeg metadata for LEGACY shim.
Bug: 15116722
Change-Id: I8abef3ca9a47b2f93978a758aa59c3b915a7e000
2014-08-16 00:03:04 +00:00
Ruben Brunk
a9bc355910 camera2: Fix shim aspect ratio scaling.
Bug: 16494207
Change-Id: I4bd40dee1caaf8c83a0853d48d44cc97151f9b41
2014-08-15 23:51:52 +00:00
Brian Carlstrom
21d1b115a1 Merge "Disable verification based on vold.decrypt. [frameworks/base]" 2014-08-15 15:23:41 +00:00
Brian Carlstrom
1567d2f0b7 Disable verification based on vold.decrypt. [frameworks/base]
Bug: 15165413

(cherry picked from commit 6d05323e97e98022be7fc1a803115e2628f2d1f4)

Change-Id: I5454488a9db0fd70c64e8fc78b622c56ea96e6fd
2014-08-15 10:08:16 -07:00
Calin Juravle
508e768d95 Merge "Integrate NativeActivity with NativeBridge interfaces" 2014-08-15 04:45:59 +00:00
Yong WU
03c866020b Integrate NativeActivity with NativeBridge interfaces
Bug: 16884833

Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-15 10:18:40 +01:00
Brian Carlstrom
261e240c05 Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev 2014-08-15 05:27:16 +00:00
Brian Carlstrom
df6c83fa7b Disable verification based on vold.decrypt. [frameworks/base]
Bug: 15165413
Change-Id: I7aff8e2a2890971fe97769d42121c207dc36aa7c
2014-08-15 09:58:03 -07:00
Calin Juravle
ec92397894 Merge "Integrate NativeActivity with NativeBridge interfaces" into lmp-dev 2014-08-15 04:38:54 +00:00
Yong WU
abd76d0a09 Integrate NativeActivity with NativeBridge interfaces
Bug: 16884833

(cherry picked from commit I73aab8e212860ba5aee9444d801806d3da326a41)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
2014-08-15 13:22:30 +01:00
Narayan Kamath
29564cd245 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
2014-08-15 13:37:03 +01:00
Ruben Brunk
3e19025049 DNG: Fix row stride check.
Bug: 16986715

Change-Id: I5337194f7078d394b9e972e81861794283925612
2014-08-12 22:54:13 +00:00
Adam Lesinski
ccf25c7bf6 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
2014-08-11 09:16:01 -07:00
Calin Juravle
2f4cf2cfd1 Pass the name of the native bridge library to the runtime
Bug: 16843953
Change-Id: Ia0f57a9b3e30a74fe4e93eb4453f841c1ef512eb
2014-08-08 18:45:19 +01:00
Calin Juravle
3d274434c7 Merge "Pass the name of the native bridge library to the runtime" 2014-08-07 18:51:06 +00:00
Calin Juravle
01db916970 Pass the name of the native bridge library to the runtime
Bug: 16843953

(cherry picked from commit 2f4cf2cfd1125abfe928d6137f3d1553b0888f61)

Change-Id: I223f9041e424be024265e46bcff19cd9dfd18dfc
2014-08-11 11:37:17 +01:00
Derek Sollenberger
6f03023ece Remove dependency on SkPaintOptionsAndroid
Change-Id: I579a3503697efe3b8fd9bc809a6c9bfbf735cb1b
2014-08-07 14:38:51 -04:00
Mathieu Chartier
cf6775eece Fix JNI error in exception reporting.
There was a JNI error where when you got an OOM and called
report_exception, it would call two NewStringUTF in a row without
checking the return values. This could mean that the first one
threw a new OOME and the second one would cause a JNI error when
it also attempted to throw an OOME with a pending OOME.

Bug: 16843627
Change-Id: Ie4f9f9a5f8b7993cd3655d42a6718c0a5e1199f8
2014-08-06 13:41:19 -07:00
Brian Carlstrom
ce5bbbea08 Move image classes options from art to AndroidRuntime [frameworks/base]
Bug: 15165413

(cherry picked from commit 108166c749f0418d45f220419a9611c4afec1311)

Change-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa
2014-08-06 22:25:01 -07:00
Brian Carlstrom
0d8fb01963 Disable compilation based on vold.decrypt. [frameworks/base]
Bug: 15165413

(cherry picked from commit 4fd561637a173c7fa6a1d71e9115db1db90514ff)

Change-Id: I2a13b63f9d4a7ffd69a8d21666c6dce84739c6ed
2014-08-06 22:25:01 -07:00
Brian Carlstrom
3fbfbb4ade 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
2014-08-06 22:25:00 -07:00