120489 Commits

Author SHA1 Message Date
Bill Yi
1829a4b4d1 Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE" 2014-09-24 16:46:41 +00:00
Bill Yi
519c1f6433 Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE
Change-Id: I30305a3f821b4f75f5037ebf11b74cfb8f2c8bb2
2014-09-24 09:17:57 -07:00
Marco Nelissen
fa4362982c Merge "Broadcast an intent to mediascanner after executing screencap" 2014-09-22 14:34:03 +00:00
Christopher Ferris
b7442bbc8c Merge "Remove MALLOC_LEAK_CHECK references." 2014-09-20 01:23:27 +00:00
Christopher Ferris
9244436a05 Remove MALLOC_LEAK_CHECK references.
Bug: 17378595
Change-Id: Ie7f8af88c7f3b0c3dc2c2e75bbaaa9e6a81269ae
2014-09-19 18:08:29 -07:00
Christopher Ferris
b6f891c42f Merge "Remove MALLOC_LEAK_CHECK references." 2014-09-20 00:42:22 +00:00
Elliott Hughes
600ca140e2 Merge "Use constants instead of resources for ellipsis." 2014-09-19 22:02:45 +00:00
Igor Viarheichyk
ed0daa93e4 Use constants instead of resources for ellipsis.
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
2014-09-19 22:02:08 +00:00
Christopher Ferris
8b1dfddf50 Remove MALLOC_LEAK_CHECK references.
Bug: 17378595
Change-Id: Ib9680ef97dfea6bc20d96f0bed90f4553186315c
2014-09-19 12:24:59 -07:00
Dan Albert
799812cd6f Merge "Clean up makefile cruft." 2014-09-11 23:26:26 +00:00
Dan Albert
88ba339aef Clean up makefile cruft.
The build system already takes care of all these things.

Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
2014-09-11 16:21:19 -07:00
Dan Albert
bcaaebb8a8 Merge "Clean up test makefiles." 2014-09-11 23:21:14 +00:00
Dan Albert
715d01aedf Clean up test makefiles.
The build system takes care of linking the correct STL and gtest
libraries for you, and specifying them manually confuses the build
system when using libc++.

Change-Id: I9f76ab26a63ace51293614cfb5ca002f37438e02
2014-09-11 15:49:57 -07:00
Ian Rogers
296a712e6b Merge "Make a field final." 2014-09-11 20:01:22 +00:00
Dan Albert
8bbc526921 Merge "Don't check a staticly allocated array for null." 2014-09-10 17:31:55 +00:00
Dan Albert
4fb58b0360 Don't check a staticly allocated array for null.
Change-Id: I5568174f1a9d53078c2169cfd3401e43d88a7643
2014-09-10 08:17:30 -07:00
Dan Albert
8085477fb9 Merge "Don't check for null references." 2014-09-09 16:25:41 +00:00
Dan Albert
2ffa4aabd7 Merge "Use char16_t for char things." 2014-09-09 04:30:35 +00:00
Dan Albert
5a6934c079 Merge "Don't pollute the namespace for two uses." 2014-09-09 04:15:29 +00:00
Dan Albert
294ce05e23 Merge "Make string literal concatenation play nice with C++11." 2014-09-09 03:58:58 +00:00
Dan Albert
1c6c7573e9 Don't pollute the namespace for two uses.
Clang complains about ambiguity between std::hash and ::hash (locally
defined). There's no need to pull in the whole namespace for two uses of
std::map anyway.

Change-Id: Icbaa7ebbaad05999988784ad34662c721fb12b29
2014-09-08 18:44:12 -07:00
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
Dan Albert
a8995adc2b Don't check for null references.
The address of a reference will never be null in well formed C++ code.
The function returning the value being checked simply returns a
dereferenced pointer (which is just going to segfault if it is null!).

Change-Id: I3a4eb6adfc003c63ebf21b81d46088d52154d99d
2014-09-08 18:34:29 -07:00
Dan Albert
f348c15ecf Use char16_t for char things.
When compiling in C++ mode, the compiler will complain about conversions
from uint16_t to char16_t. Be consistent in using char16_t for strings.

Change-Id: I052b6176ced635162920b31560052d9a64f92764
2014-09-08 18:30:08 -07:00
Elliott Hughes
ab94a1676e Merge "Small documentation fixes across many files." 2014-09-08 18:44:14 +00: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
Mark Doliner
d0646dca40 Small documentation fixes across many files.
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
2014-09-05 13:57:51 -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
Ian Rogers
d8e34a6a0d Make a field final.
Make a field that can be final, final.

Change-Id: I597ef43bad5045a63e7e9fe6eedd8e0f0a637ca4
2014-08-27 16:32:57 -07:00