120626 Commits

Author SHA1 Message Date
Dan Albert
1d99636fcc am 8085477f: Merge "Don\'t check for null references."
* commit '8085477fb98eab36bbc8c3e9add76f398235b469':
  Don't check for null references.
2014-09-09 16:35:02 +00:00
Dan Albert
8085477fb9 Merge "Don't check for null references." 2014-09-09 16:25:41 +00:00
Dan Albert
6c585756b4 am 2ffa4aab: Merge "Use char16_t for char things."
* commit '2ffa4aabd76353a907ee89a3e0c6f1961237f257':
  Use char16_t for char things.
2014-09-09 04:37:42 +00:00
Dan Albert
2ffa4aabd7 Merge "Use char16_t for char things." 2014-09-09 04:30:35 +00:00
Dan Albert
de86cf1362 am 5a6934c0: Merge "Don\'t pollute the namespace for two uses."
* commit '5a6934c07946743e622df52ba1155d97129b37f0':
  Don't pollute the namespace for two uses.
2014-09-09 04:23:57 +00:00
Dan Albert
5a6934c079 Merge "Don't pollute the namespace for two uses." 2014-09-09 04:15:29 +00:00
Dan Albert
00fe3544f6 am 294ce05e: Merge "Make string literal concatenation play nice with C++11."
* commit '294ce05e23a96353c8ddf934428bc60d1395b9a5':
  Make string literal concatenation play nice with C++11.
2014-09-09 04:06:56 +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
2008cff73b am ab94a167: Merge "Small documentation fixes across many files."
* commit 'ab94a1676e6280f1b6d83e0f8b02849ff62faf4f':
  Small documentation fixes across many files.
2014-09-08 18:51:22 +00:00
Elliott Hughes
ab94a1676e Merge "Small documentation fixes across many files." 2014-09-08 18:44:14 +00:00
Christopher Ferris
7c931e2e4b am f4eaaadb: Merge "Fix use of %llx for sscanf 64 bit values."
* commit 'f4eaaadb8cb0e2ff8d1704827883b5a62173311d':
  Fix use of %llx for sscanf 64 bit values.
2014-09-06 17:02:41 +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
ad29afab5e am 2b653eab: Merge "Add new header to support 32 bit/64 bit dumps."
* commit '2b653eabb999e2360c0f818242b32b4a141dc795':
  Add new header to support 32 bit/64 bit dumps.
2014-09-06 01:27:29 +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
82ad9ec3d1 am 523afd15: Merge "Frameworks/base: Add native bridge post-fork initialization"
* commit '523afd157be99ddce8c0f643caceb9db4a9227bb':
  Frameworks/base: Add native bridge post-fork initialization
2014-09-04 21:55:34 +00:00
Andreas Gampe
523afd157b Merge "Frameworks/base: Add native bridge post-fork initialization" 2014-09-04 21:47:13 +00:00
Narayan Kamath
04c72e304c am be76be83: Merge "android_media_MediaMuxer_setLocation: amended signature."
* commit 'be76be83b188bb4cbcd3bc9bd6398af4d444ecb0':
  android_media_MediaMuxer_setLocation: amended signature.
2014-09-04 11:14:42 +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
ad0a66acf4 am c1ce74ca: Merge "Revert "SELinuxMMAC unit tests""
* commit 'c1ce74cab0e83d574df1bd7bb7b7eb16eec171f6':
  Revert "SELinuxMMAC unit tests"
2014-09-03 20:14:31 +00: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
7f534190d6 am 3d4cfc04: Merge "SELinuxMMAC unit tests"
* commit '3d4cfc04a7bc882d534a49dfb475180907fcf842':
  SELinuxMMAC unit tests
2014-09-03 18:01:15 +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
60888dbad1 am 0988daaa: Merge "Add testing api to SELinuxMMAC code."
* commit '0988daaa23b469b3021ad93f819736160e21391f':
  Add testing api to SELinuxMMAC code.
2014-09-02 17:03:32 +00: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
b1ad72c484 am 25d928f6: Merge "Update WebViewFactory.java to compile in AOSP."
* commit '25d928f687408058f007051878574ea66691d9dc':
  Update WebViewFactory.java to compile in AOSP.
2014-09-01 09:13:45 +00:00
Marcin Kosiba
0b0c8c0a26 am 5ddbe722: Merge "Load the WebView Java code via createPackageContext."
* commit '5ddbe722befa58db3b14bcbec55bf5313cd80962':
  Load the WebView Java code via createPackageContext.
2014-09-01 09:13:40 +00:00
Marcin Kosiba
f524961949 am 2453f611: Merge "Remove WebView library preloading mechanism."
* commit '2453f611d9b7c60c4ae9766b4bad42b9e1d13777':
  Remove WebView library preloading mechanism.
2014-09-01 09:13:35 +00: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
23f6a4ab5d am 8178edfc: Merge "Fixing android.text.format.Time for non-English locales"
* commit '8178edfc096e797917257c8cbc715f0a31fe551a':
  Fixing android.text.format.Time for non-English locales
2014-08-29 09:16: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
d1dc039438 am 6d3c8255: Merge "Remove obsolete pruneDexCache"
* commit '6d3c8255ff41e5967f45d9fa0b0c677bbf3c34b5':
  Remove obsolete pruneDexCache
2014-08-29 01:13:11 +00:00
Brian Carlstrom
c22e56dd12 am 7d86375b: Merge "Change /dalvik-cache to be owned by root."
* commit '7d86375b1e02bff726911ed20070bc8e0553daaa':
  Change /dalvik-cache to be owned by root.
2014-08-29 01:13:06 +00: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