120462 Commits

Author SHA1 Message Date
Dan Albert
be23d47d1c Make string literal concatenation play nice with C++11.
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.

Change-Id: I24fbe1fda483db4a8c606e80dbe17430ad070dc2
2014-09-08 18:38:35 -07:00
Christopher Ferris
f4eaaadb8c Merge "Fix use of %llx for sscanf 64 bit values." 2014-09-06 16:55:50 +00:00
Christopher Ferris
2b653eabb9 Merge "Add new header to support 32 bit/64 bit dumps." 2014-09-06 01:19:03 +00:00
Christopher Ferris
bebb26725a Add new header to support 32 bit/64 bit dumps.
Bug: 17319589

(cherry picked from commit 0d3c045a0d48193150689e5924bd04c511380a8a)

Change-Id: I79aa035098115de7b02171a9432ff7e9393328ab
2014-09-05 17:17:04 -07:00
Andreas Gampe
523afd157b Merge "Frameworks/base: Add native bridge post-fork initialization" 2014-09-04 21:47:13 +00:00
Narayan Kamath
be76be83b1 Merge "android_media_MediaMuxer_setLocation: amended signature." 2014-09-04 11:06:47 +00:00
Robert Shih
39478fdfcf android_media_MediaMuxer_setLocation: amended signature.
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.

Bug: 12890910

(cherry picked from commit 3cb78498d3f664f541ba7d28f4543cf8c12733f1)

Reported-By: ashok.bhat@arm.com, marcus.oakland@arm.com

Change-Id: I624dfb41485be823d31797514664d3a5f9e52eb0
2014-09-04 11:18:25 +01:00
Andreas Gampe
aec67dcc02 Frameworks/base: Add native bridge post-fork initialization
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-03 21:38:34 -07:00
Christopher Ferris
c70b5e66f7 Fix use of %llx for sscanf 64 bit values.
Change-Id: Ie7a0e243dfcf24722783fe7d697a1412de7efe68
2014-09-03 19:59:08 -07:00
Nick Kralevich
c1ce74cab0 Merge "Revert "SELinuxMMAC unit tests"" 2014-09-03 20:04:27 +00:00
Nick Kralevich
01a5aa95d9 Revert "SELinuxMMAC unit tests"
Broken build.

frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:89: error: constructor PackageParser in class PackageParser cannot be applied to given types;
        PackageParser packageParser = new PackageParser(archiveFilePath);
                                      ^
  required: no arguments
  found: String
  reason: actual and formal argument lists differ in length
frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:93: error: method parsePackage in class PackageParser cannot be applied to given types;
        PackageParser.Package pkg = packageParser.parsePackage(sourceFile,
                                                 ^
  required: File,int
  found: File,String,DisplayMetrics,int
  reason: actual and formal argument lists differ in length
frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:99: error: incompatible types
        boolean savedCerts = packageParser.collectCertificates(pkg, 0);
                                                              ^
  required: boolean
  found:    void
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
3 errors
make: *** [out/target/common/obj/APPS/FrameworksServicesTests_intermediates/classes-full-debug.jar] Error 41

This reverts commit 2f446561f2f6d1b320b34432854d2f55e5b56f9e.

Change-Id: I0aa992d7b9eccce7e38c430a8a96084a6ee99866
2014-09-03 20:03:17 +00:00
Nick Kralevich
3d4cfc04a7 Merge "SELinuxMMAC unit tests" 2014-09-03 17:48:32 +00:00
Robert Craig
2f446561f2 SELinuxMMAC unit tests
Added unit tests to help with future integration and regression
testing.

Change-Id: I5e7d709e80ccbbe1dde1dc26b3e9a155f5009ad1
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-09-03 08:05:40 -04:00
Nick Kralevich
0988daaa23 Merge "Add testing api to SELinuxMMAC code." 2014-09-02 16:52:13 +00:00
Robert Craig
99891156fc Add testing api to SELinuxMMAC code.
Added needed api for local unit testing.

Change-Id: If52555ecb4f0e6bc06e153b6a17e2c706b11253e
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-09-02 12:50:29 -04:00
Marcin Kosiba
25d928f687 Merge "Update WebViewFactory.java to compile in AOSP." 2014-09-01 08:50:25 +00:00
Marcin Kosiba
5ddbe722be Merge "Load the WebView Java code via createPackageContext." 2014-09-01 08:50:10 +00:00
Marcin Kosiba
2453f611d9 Merge "Remove WebView library preloading mechanism." 2014-09-01 08:48:50 +00:00
Neil Fuller
8178edfc09 Merge "Fixing android.text.format.Time for non-English locales" 2014-08-29 08:27:30 +00:00
Neil Fuller
788cb18f65 Fixing android.text.format.Time for non-English locales
The test fixes for bug 17262063 showed up a real issue for
non-English locales with the Time.format() method:
If the Android string resources that contain the pattern use
non-ASCII characters then a '?' would be output instead of
those characters.

For example, in France the pattern for '%c' includes a 'à'
(a with a grave accent) and Japan includes 日.

The problem was due to converting the pattern to bytes using
the US_ASCII character set, which turns non-ASCII characters
into '?'. The code has been changed to use char throughout
and avoid bytes.

Internal documentation has been improved.

Some calls to modifyAndAppend() have been replaced with a
direct call to outputBuilder.append() because the
modify step is guaranteed to a no-op for the literals given.

The formatter has been changed to use Locale.US because it
is only used for outputting numbers. It has been renamed
to make this more obvious and the locale field has been
removed.

Bug: 17262063
Change-Id: I32b92f7f7e3e6931d3514d87f1d9a38f136d4021
2014-08-29 09:08:47 +01:00
Brian Carlstrom
6d3c8255ff Merge "Remove obsolete pruneDexCache" 2014-08-28 23:45:10 +00:00
Alex Light
09107db491 Remove obsolete pruneDexCache
Bug: 16875245

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
2014-08-28 23:30:45 +00:00
Brian Carlstrom
7d86375b1e Merge "Change /dalvik-cache to be owned by root." 2014-08-28 23:17:04 +00:00
Alex Light
79bf4007f5 Change /dalvik-cache to be owned by root.
Bug: 16875245

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-28 11:34:50 -07:00
Calin Juravle
2d3571cc17 Merge "Fix the length of a profiler system property" 2014-08-27 16:36:53 +00:00
Calin Juravle
852debcc90 Merge "Update the handling of the native bridge property." 2014-08-27 15:50:38 +00:00
Calin Juravle
3bec87c9fa Merge "Pass vmSafeMode (manifest attribute) to installd." 2014-08-27 15:50:10 +00:00
Wei Jin
4d033e1c44 Fix the length of a profiler system property
This patch changes the profiler system property
"dalvik.vm.profile.max-stack-depth" to "dalvik.vm.profile.stack-depth"
so that the length of the option is less than PROP_NAME_MAX.

Bug: 17294224
Change-Id: I5723883d7fa38dd5eaa276182e5d680d152cedad
2014-08-27 15:50:17 +01:00
Calin Juravle
d71de10c42 Update the handling of the native bridge property.
ro.dalvik.vm.native.bridge is expected to be always be set. A value of
"0" means that the native bridge is disabled and that no value should be
passed to the runtime.

Bug: 17104449

(cherry picked from commit 831bd75b2bbc126f02578a967e925271b9cac6d3)

Change-Id: Ib483ac8e96bdc66af2725815807d4deb36fb36ab
2014-08-27 15:00:55 +01:00
Calin Juravle
e8d2ffd733 Pass vmSafeMode (manifest attribute) to installd.
The flag is used to enforce --interpret-only flag when running dex2oat.

Bug: 12457423

(cherry picked from commit 11e08c010a42390803b65eaa698ca0e768aed896)

Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa
2014-08-27 14:49:11 +01:00
Calin Juravle
9b5112c36b Merge "Make native bridge property read-only." 2014-08-27 13:19:20 +00:00
Stephen Hines
007848ad8e Merge "We need to specify a target SDK < 21 to use graphics RS." 2014-08-22 23:21:46 +00:00
Stephen Hines
28aec0ef24 We need to specify a target SDK < 21 to use graphics RS.
Bug: 16031597

This change also removes some unnecessary code from ScriptC construction.

Change-Id: I6680109deb34de841dfade769d556f5060aee423
(cherry picked from commit 8277a692be3c89519e368159e7707c8d35b89475)
2014-08-22 01:04:43 -07:00
Stephen Hines
7a16ffe2e5 Merge "Replace NULL macros with nullptr literals." 2014-08-22 05:27:57 +00:00
Robert Greenwalt
bda0d8e3d6 Merge "Mark configuration strings as non-translatable." 2014-08-20 21:39:46 +00:00
Igor Viarheichyk
e1501d73c8 Mark configuration strings as non-translatable.
10 out of 36 strings in config.xml were not marked as non-translatable,
making pseudolocalization handle them incorrectly and leading to
potential issues with unexpected translations. Added translatable="false"
to all of them for consistency.

Change-Id: I55d8b0c24834722e71fa3e89ae508a95839416e9
2014-08-20 16:22:54 -07:00
Mathieu Chartier
977c4a5b81 Merge "Clean up ExceptionOccurred." 2014-08-20 21:39:46 +00: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
Mathieu Chartier
8f9ebc8a7c Merge "Remove unnecessary explicit GC in ZygoteInit." 2014-08-20 21:39:46 +00:00
Mathieu Chartier
9a88f10b89 Remove unnecessary explicit GC in ZygoteInit.
Removes > 1s of GC time and hundreds of GC during device boot.

Zygote size before: 8388608
Zygote size after: 8388608

No increase in zygote space size due to zygote compaction.

Bug: 16398684

Change-Id: I3c6f5a0b26a207ab39bb0a952400d7488e42f00c
2014-08-20 10:57:45 -07:00
Chris Wailes
488230c3fe Replace NULL macros with nullptr literals.
Change-Id: I6c2af76f1f134d3f233d5462fed3969910ae2f24
2014-08-18 15:21:16 -07:00
Calin Juravle
53db6ae781 Make native bridge property read-only.
Bug: 17104449
Change-Id: If2e2a0c2cd1783883ef34d25a527ee93f9eadfa5
2014-08-18 16:56:08 +01:00
Stephen Hines
4289556148 Merge "Collapse code paths for single- and multi-input kernels." 2014-08-16 04:08:14 +00:00
Chris Wailes
be7b1defb6 Collapse code paths for single- and multi-input kernels.
This patch simplifies the RenderScript JNI layer by replacing six functions
with a single funciton.  This new function now handles all previous cases.
Functions in android.renderscript.script have been updated to use this new JNI
function.

Change-Id: I6cd5448534c38123d51a589339bbeb7e98453e73
2014-08-18 08:03:52 -07:00
Elliott Hughes
085889e37f Merge "WifiP2pWfdInfo set device type bugfix" 2014-08-16 04:08:14 +00:00
Grigoriy Kraynov
8b3b81000c WifiP2pWfdInfo set device type bugfix
Change-Id: I37a53aed80574e78c80dc4a4192bd8cc4320de9d
Signed-off-by: Grigoriy Kraynov <kraynov@mgpro.ru>
2014-08-18 01:18:34 +04:00
Elliott Hughes
708da44695 Merge "Use gettid directly in frameworks JNI." 2014-08-16 04:08:14 +00:00
Elliott Hughes
06451fe081 Use gettid directly in frameworks JNI.
Bug: 17048545
Change-Id: I1cd45d85368c799b75f76e778722979cbbb68ed2
2014-08-18 10:39:55 -07:00
Piotr Jastrzebski
8a28e16cd3 Merge "Update ziparchive usage to the new API." 2014-08-16 05:59:09 +00:00
Brian Carlstrom
7c8318c0e8 Merge "PackageInfo is a class, not a struct" 2014-08-16 04:08:14 +00:00