OSDN Git Service

android-x86/frameworks-base.git
9 years agoAdd new header to support 32 bit/64 bit dumps.
Christopher Ferris [Tue, 2 Sep 2014 19:49:32 +0000 (12:49 -0700)]
Add new header to support 32 bit/64 bit dumps.

Bug: 17319589

(cherry picked from commit 0d3c045a0d48193150689e5924bd04c511380a8a)

Change-Id: I79aa035098115de7b02171a9432ff7e9393328ab

9 years agoMerge "Frameworks/base: Add native bridge post-fork initialization"
Andreas Gampe [Thu, 4 Sep 2014 21:47:12 +0000 (21:47 +0000)]
Merge "Frameworks/base: Add native bridge post-fork initialization"

9 years agoMerge "android_media_MediaMuxer_setLocation: amended signature."
Narayan Kamath [Thu, 4 Sep 2014 11:06:47 +0000 (11:06 +0000)]
Merge "android_media_MediaMuxer_setLocation: amended signature."

9 years agoandroid_media_MediaMuxer_setLocation: amended signature.
Robert Shih [Wed, 5 Feb 2014 18:42:01 +0000 (10:42 -0800)]
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

9 years agoFrameworks/base: Add native bridge post-fork initialization
Andreas Gampe [Wed, 3 Sep 2014 04:23:06 +0000 (21:23 -0700)]
Frameworks/base: Add native bridge post-fork initialization

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67

9 years agoMerge "Revert "SELinuxMMAC unit tests""
Nick Kralevich [Wed, 3 Sep 2014 20:04:26 +0000 (20:04 +0000)]
Merge "Revert "SELinuxMMAC unit tests""

9 years agoRevert "SELinuxMMAC unit tests"
Nick Kralevich [Wed, 3 Sep 2014 20:03:17 +0000 (20:03 +0000)]
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

9 years agoMerge "SELinuxMMAC unit tests"
Nick Kralevich [Wed, 3 Sep 2014 17:48:31 +0000 (17:48 +0000)]
Merge "SELinuxMMAC unit tests"

9 years agoSELinuxMMAC unit tests
Robert Craig [Tue, 2 Sep 2014 16:41:42 +0000 (12:41 -0400)]
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>
9 years agoMerge "Add testing api to SELinuxMMAC code."
Nick Kralevich [Tue, 2 Sep 2014 16:52:13 +0000 (16:52 +0000)]
Merge "Add testing api to SELinuxMMAC code."

9 years agoAdd testing api to SELinuxMMAC code.
Robert Craig [Tue, 2 Sep 2014 11:16:52 +0000 (07:16 -0400)]
Add testing api to SELinuxMMAC code.

Added needed api for local unit testing.

Change-Id: If52555ecb4f0e6bc06e153b6a17e2c706b11253e
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
9 years agoMerge "Update WebViewFactory.java to compile in AOSP."
Marcin Kosiba [Mon, 1 Sep 2014 08:50:25 +0000 (08:50 +0000)]
Merge "Update WebViewFactory.java to compile in AOSP."

9 years agoMerge "Load the WebView Java code via createPackageContext."
Marcin Kosiba [Mon, 1 Sep 2014 08:50:08 +0000 (08:50 +0000)]
Merge "Load the WebView Java code via createPackageContext."

9 years agoMerge "Remove WebView library preloading mechanism."
Marcin Kosiba [Mon, 1 Sep 2014 08:48:48 +0000 (08:48 +0000)]
Merge "Remove WebView library preloading mechanism."

9 years agoMerge "Fixing android.text.format.Time for non-English locales"
Neil Fuller [Fri, 29 Aug 2014 08:27:29 +0000 (08:27 +0000)]
Merge "Fixing android.text.format.Time for non-English locales"

9 years agoFixing android.text.format.Time for non-English locales
Neil Fuller [Wed, 27 Aug 2014 16:15:09 +0000 (17:15 +0100)]
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

9 years agoMerge "Remove obsolete pruneDexCache"
Brian Carlstrom [Thu, 28 Aug 2014 23:45:09 +0000 (23:45 +0000)]
Merge "Remove obsolete pruneDexCache"

9 years agoRemove obsolete pruneDexCache
Alex Light [Thu, 28 Aug 2014 23:17:55 +0000 (16:17 -0700)]
Remove obsolete pruneDexCache

Bug: 16875245

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893

9 years agoMerge "Change /dalvik-cache to be owned by root."
Brian Carlstrom [Thu, 28 Aug 2014 23:17:04 +0000 (23:17 +0000)]
Merge "Change /dalvik-cache to be owned by root."

9 years agoChange /dalvik-cache to be owned by root.
Alex Light [Wed, 27 Aug 2014 22:39:17 +0000 (15:39 -0700)]
Change /dalvik-cache to be owned by root.

Bug: 16875245

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66

9 years agoMerge "Fix the length of a profiler system property"
Calin Juravle [Wed, 27 Aug 2014 16:36:52 +0000 (16:36 +0000)]
Merge "Fix the length of a profiler system property"

9 years agoMerge "Update the handling of the native bridge property."
Calin Juravle [Wed, 27 Aug 2014 15:50:36 +0000 (15:50 +0000)]
Merge "Update the handling of the native bridge property."

9 years agoMerge "Pass vmSafeMode (manifest attribute) to installd."
Calin Juravle [Wed, 27 Aug 2014 15:50:09 +0000 (15:50 +0000)]
Merge "Pass vmSafeMode (manifest attribute) to installd."

9 years agoFix the length of a profiler system property
Wei Jin [Wed, 27 Aug 2014 00:16:08 +0000 (17:16 -0700)]
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

9 years agoUpdate the handling of the native bridge property.
Calin Juravle [Tue, 26 Aug 2014 22:00:11 +0000 (23:00 +0100)]
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

9 years agoPass vmSafeMode (manifest attribute) to installd.
Calin Juravle [Wed, 27 Aug 2014 13:22:15 +0000 (14:22 +0100)]
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

9 years agoMerge "Make native bridge property read-only."
Calin Juravle [Wed, 27 Aug 2014 13:19:18 +0000 (13:19 +0000)]
Merge "Make native bridge property read-only."

9 years agoMerge "We need to specify a target SDK < 21 to use graphics RS."
Stephen Hines [Fri, 22 Aug 2014 23:21:45 +0000 (23:21 +0000)]
Merge "We need to specify a target SDK < 21 to use graphics RS."

9 years agoWe need to specify a target SDK < 21 to use graphics RS.
Stephen Hines [Fri, 15 Aug 2014 23:03:58 +0000 (16:03 -0700)]
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)

9 years agoMerge "Replace NULL macros with nullptr literals."
Stephen Hines [Fri, 22 Aug 2014 05:27:55 +0000 (05:27 +0000)]
Merge "Replace NULL macros with nullptr literals."

9 years agoMerge "Mark configuration strings as non-translatable."
Robert Greenwalt [Wed, 20 Aug 2014 23:35:37 +0000 (23:35 +0000)]
Merge "Mark configuration strings as non-translatable."

9 years agoMark configuration strings as non-translatable.
Igor Viarheichyk [Wed, 20 Aug 2014 23:22:54 +0000 (16:22 -0700)]
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

9 years agoMerge "Clean up ExceptionOccurred."
Mathieu Chartier [Wed, 20 Aug 2014 23:31:38 +0000 (23:31 +0000)]
Merge "Clean up ExceptionOccurred."

9 years agoClean up ExceptionOccurred.
Mathieu Chartier [Wed, 20 Aug 2014 17:04:08 +0000 (10:04 -0700)]
Clean up ExceptionOccurred.

Use ExceptionCheck before ExceptionOccurred since ExceptionCheck
doesn't acquire any locks and is faster.

Change-Id: Ibd87fd1e33b339bd2a6effa1d20d3253c8a61bdc

9 years agoMerge "Remove unnecessary explicit GC in ZygoteInit."
Mathieu Chartier [Wed, 20 Aug 2014 23:17:06 +0000 (23:17 +0000)]
Merge "Remove unnecessary explicit GC in ZygoteInit."

9 years agoRemove unnecessary explicit GC in ZygoteInit.
Mathieu Chartier [Wed, 20 Aug 2014 17:24:11 +0000 (10:24 -0700)]
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

9 years agoReplace NULL macros with nullptr literals.
Chris Wailes [Thu, 14 Aug 2014 18:22:40 +0000 (11:22 -0700)]
Replace NULL macros with nullptr literals.

Change-Id: I6c2af76f1f134d3f233d5462fed3969910ae2f24

9 years agoMake native bridge property read-only.
Calin Juravle [Mon, 18 Aug 2014 15:56:08 +0000 (16:56 +0100)]
Make native bridge property read-only.

Bug: 17104449
Change-Id: If2e2a0c2cd1783883ef34d25a527ee93f9eadfa5

9 years agoMerge "Collapse code paths for single- and multi-input kernels."
Stephen Hines [Mon, 18 Aug 2014 19:36:43 +0000 (19:36 +0000)]
Merge "Collapse code paths for single- and multi-input kernels."

9 years agoCollapse code paths for single- and multi-input kernels.
Chris Wailes [Tue, 15 Jul 2014 17:56:14 +0000 (10:56 -0700)]
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

9 years agoMerge "WifiP2pWfdInfo set device type bugfix"
Elliott Hughes [Mon, 18 Aug 2014 19:28:31 +0000 (19:28 +0000)]
Merge "WifiP2pWfdInfo set device type bugfix"

9 years agoWifiP2pWfdInfo set device type bugfix
Grigoriy Kraynov [Sat, 16 Aug 2014 10:42:44 +0000 (14:42 +0400)]
WifiP2pWfdInfo set device type bugfix

Change-Id: I37a53aed80574e78c80dc4a4192bd8cc4320de9d
Signed-off-by: Grigoriy Kraynov <kraynov@mgpro.ru>
9 years agoMerge "Use gettid directly in frameworks JNI."
Elliott Hughes [Mon, 18 Aug 2014 17:40:42 +0000 (17:40 +0000)]
Merge "Use gettid directly in frameworks JNI."

9 years agoUse gettid directly in frameworks JNI.
Elliott Hughes [Mon, 18 Aug 2014 17:26:52 +0000 (10:26 -0700)]
Use gettid directly in frameworks JNI.

Bug: 17048545
Change-Id: I1cd45d85368c799b75f76e778722979cbbb68ed2

9 years agoMerge "Update ziparchive usage to the new API."
Piotr Jastrzebski [Mon, 18 Aug 2014 08:27:56 +0000 (08:27 +0000)]
Merge "Update ziparchive usage to the new API."

9 years agoMerge "PackageInfo is a class, not a struct"
Brian Carlstrom [Sun, 17 Aug 2014 23:48:02 +0000 (23:48 +0000)]
Merge "PackageInfo is a class, not a struct"

9 years agoPackageInfo is a class, not a struct
Brian Carlstrom [Sun, 17 Aug 2014 23:02:33 +0000 (16:02 -0700)]
PackageInfo is a class, not a struct

(cherry picked from commit 646d1b8ea801d92b04ead6cbae2899d8256ec3ff)

Change-Id: Id9ddc520fbfc4787c3b267df9a35a45e8cc52d65

9 years agoMerge "Disable verification based on vold.decrypt. [frameworks/base]"
Brian Carlstrom [Fri, 15 Aug 2014 17:22:07 +0000 (17:22 +0000)]
Merge "Disable verification based on vold.decrypt. [frameworks/base]"

9 years agoDisable verification based on vold.decrypt. [frameworks/base]
Brian Carlstrom [Fri, 15 Aug 2014 16:31:27 +0000 (09:31 -0700)]
Disable verification based on vold.decrypt. [frameworks/base]

Bug: 15165413

(cherry picked from commit 6d05323e97e98022be7fc1a803115e2628f2d1f4)

Change-Id: I5454488a9db0fd70c64e8fc78b622c56ea96e6fd

9 years agoUpdate ziparchive usage to the new API.
Piotr Jastrzebski [Wed, 13 Aug 2014 06:50:20 +0000 (07:50 +0100)]
Update ziparchive usage to the new API.

Bug: 16162465

Change-Id: If3064e2be3e7e85366b07434294a7879b0e5f9bc

9 years agoIntegrate NativeActivity with NativeBridge interfaces
Yong WU [Mon, 28 Jul 2014 13:20:18 +0000 (21:20 +0800)]
Integrate NativeActivity with NativeBridge interfaces

Bug: 16884833

Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41

9 years agoMerge "Integrate NativeActivity with NativeBridge interfaces"
Calin Juravle [Fri, 15 Aug 2014 11:35:59 +0000 (11:35 +0000)]
Merge "Integrate NativeActivity with NativeBridge interfaces"

9 years agoMerge "Prevent system_server shutdown when trying to format external storage"
Jeff Sharkey [Tue, 12 Aug 2014 22:12:17 +0000 (22:12 +0000)]
Merge "Prevent system_server shutdown when trying to format external storage"

9 years agoMerge "Revert "Collapse code paths for single- and multi-input kernels.""
Stephen Hines [Wed, 13 Aug 2014 17:32:49 +0000 (17:32 +0000)]
Merge "Revert "Collapse code paths for single- and multi-input kernels.""

9 years agoRevert "Collapse code paths for single- and multi-input kernels."
Stephen Hines [Wed, 13 Aug 2014 17:32:19 +0000 (17:32 +0000)]
Revert "Collapse code paths for single- and multi-input kernels."

This reverts commit eb3470219dea322efa93eb4b5457813ce71d0c5d.

Change-Id: Id943abf953e832ef831318e6699d4b46e9b46201

9 years agoMerge "Collapse code paths for single- and multi-input kernels."
Stephen Hines [Wed, 13 Aug 2014 16:57:04 +0000 (16:57 +0000)]
Merge "Collapse code paths for single- and multi-input kernels."

9 years agoMerge "Revert "Fix a bug: unable to start activity when AM is killing the process.""
Craig Mautner [Tue, 12 Aug 2014 21:09:21 +0000 (21:09 +0000)]
Merge "Revert "Fix a bug: unable to start activity when AM is killing the process.""

9 years agoRevert "Fix a bug: unable to start activity when AM is killing the process."
Craig Mautner [Tue, 12 Aug 2014 21:09:07 +0000 (21:09 +0000)]
Revert "Fix a bug: unable to start activity when AM is killing the process."

This reverts commit 5073145f85c8197ec4387d5e2599442a7291ca9c.

I spoke to Dianne and she said that if this is making a problem go away then it is only hiding it and there is a deeper problem we need to fix.

I think if killedByApp is true then we should set app and app.thread to null. I'll look at it further when I have more time.

Change-Id: I44c29e15ca654666440472eab2d2af1c5af80b9a

9 years agoFix a bug: unable to start activity when AM is killing the process.
Leo Hsu [Thu, 3 Jul 2014 08:51:24 +0000 (16:51 +0800)]
Fix a bug: unable to start activity when AM is killing the process.

Symptom: No activity was started for startActivity, low repro rate.
Root Cause: Starting activity on a process which was killed by ActivityManagerService.killUnneededProcessLocked() and before receiving AppDeathRecipient of it.
Solution: Choose the flow of starting a new process if ProcessRecord.killedByAm is true.

Change-Id: Ida2639b0fb4631222fc92d65aadc9fd2da637b45

9 years agoMerge "Fix a bug: unable to start activity when AM is killing the process."
Craig Mautner [Tue, 12 Aug 2014 16:59:39 +0000 (16:59 +0000)]
Merge "Fix a bug: unable to start activity when AM is killing the process."

9 years agoMerge "Don't unnecessarily set LayoutParams on children"
Adam Powell [Mon, 11 Aug 2014 17:46:53 +0000 (17:46 +0000)]
Merge "Don't unnecessarily set LayoutParams on children"

9 years agoFix the instruction set for dex file during (re)moving ops.
Calin Juravle [Thu, 7 Aug 2014 16:38:41 +0000 (17:38 +0100)]
Fix the instruction set for dex file during (re)moving ops.

This complements https://android-review.googlesource.com/#/c/103231/
where the instruction set was mapped just for comptilation. The same
should have been done for move,remove and getSize.

The list of dex code ISAs is alo de-duped.

Bug: 16185267
Change-Id: I8fe453a800812e382e8f41b5f7922997aa9c18a9

9 years agoPass the name of the native bridge library to the runtime
Calin Juravle [Thu, 7 Aug 2014 13:45:53 +0000 (14:45 +0100)]
Pass the name of the native bridge library to the runtime

Bug: 16843953
Change-Id: Ia0f57a9b3e30a74fe4e93eb4453f841c1ef512eb

9 years agoCollapse code paths for single- and multi-input kernels.
Chris Wailes [Tue, 15 Jul 2014 17:56:14 +0000 (10:56 -0700)]
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: I77e4b155cc7ca1581b05bf901c70ae53a9ff0b12

9 years agoMerge "Remove memory leak."
Piotr Jastrzebski [Mon, 11 Aug 2014 09:54:23 +0000 (09:54 +0000)]
Merge "Remove memory leak."

9 years agoRemove memory leak.
Piotr Jastrzebski [Fri, 8 Aug 2014 11:52:39 +0000 (12:52 +0100)]
Remove memory leak.

Call EndIteration in endIteration to free memory allocated for cookie in
StartIteration.

Change-Id: I3d58a461c2f3676565cfd7922dc6d8d5c35feae9

9 years agoMerge "Fix the instruction set for dex file during (re)moving ops."
Calin Juravle [Fri, 8 Aug 2014 17:48:02 +0000 (17:48 +0000)]
Merge "Fix the instruction set for dex file during (re)moving ops."

9 years agoMerge "Pass the name of the native bridge library to the runtime"
Calin Juravle [Fri, 8 Aug 2014 17:47:43 +0000 (17:47 +0000)]
Merge "Pass the name of the native bridge library to the runtime"

9 years agoMerge "Use native ISA for dex code (in case there's a NativeBridge)"
Calin Juravle [Thu, 7 Aug 2014 12:47:07 +0000 (12:47 +0000)]
Merge "Use native ISA for dex code (in case there's a NativeBridge)"

9 years agoUse native ISA for dex code (in case there's a NativeBridge)
Calin Juravle [Mon, 4 Aug 2014 18:17:06 +0000 (19:17 +0100)]
Use native ISA for dex code (in case there's a NativeBridge)

In the presence of a native bridge it is more efficient to compile the
dex directly to the native ISA than to use the shared library ISA as a
reference.

This can be achieve by configuring the readonly system properties to map
between the .so ISA and the desired dex code .ISA (e.g.
ro.dalvik.vm.isa.ISA1=ISA2).

Bug: 16185267

Change-Id: I50baa7b37e1465b9adf72d6f6b96f526a08d59c7

9 years agoUpdate WebViewFactory.java to compile in AOSP.
Marcin Kosiba [Tue, 5 Aug 2014 10:00:49 +0000 (11:00 +0100)]
Update WebViewFactory.java to compile in AOSP.

Change-Id: I076ef48a3205969f1945bff93ea0305e9907b20a

9 years agoLoad the WebView Java code via createPackageContext.
Torne (Richard Coles) [Thu, 24 Jul 2014 15:10:59 +0000 (16:10 +0100)]
Load the WebView Java code via createPackageContext.

Bug: 16329371
Change-Id: I94b4bb0df46a373454eb8ee9742413e13ce1e6a8

9 years agoRemove WebView library preloading mechanism.
Torne (Richard Coles) [Fri, 2 May 2014 14:21:54 +0000 (15:21 +0100)]
Remove WebView library preloading mechanism.

We don't want to preload the WebView library in the zygote process any
more, as loading an updatable WebView in the zygote is a stability risk.
The memory benefits of preloading will be obtained in other ways.

Bug: 13005501
Change-Id: Ic89f2a1d057dc92b01fb775bf326b47ac2d4caa2

9 years agoMerge "Make system use patchoat to relocate during runtime."
Brian Carlstrom [Tue, 5 Aug 2014 17:47:12 +0000 (17:47 +0000)]
Merge "Make system use patchoat to relocate during runtime."

9 years agoMake system use patchoat to relocate during runtime.
Alex Light [Fri, 18 Jul 2014 23:34:38 +0000 (16:34 -0700)]
Make system use patchoat to relocate during runtime.

Make PackageManagerService aware of patchoat and make it use it when
appropriate.

Bug: 15358152

Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26

9 years agoMerge "Fix JNI error in exception reporting."
Mathieu Chartier [Wed, 6 Aug 2014 20:57:39 +0000 (20:57 +0000)]
Merge "Fix JNI error in exception reporting."

9 years agoFix JNI error in exception reporting.
Mathieu Chartier [Wed, 6 Aug 2014 20:39:17 +0000 (13:39 -0700)]
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

9 years agoMerge changes I69c064b0,I1972c5af
Brian Carlstrom [Mon, 4 Aug 2014 18:27:38 +0000 (18:27 +0000)]
Merge changes I69c064b0,I1972c5af

* changes:
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]

9 years agoMerge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [framework...
Brian Carlstrom [Mon, 4 Aug 2014 18:27:35 +0000 (18:27 +0000)]
Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]"

9 years agoMove image classes options from art to AndroidRuntime [frameworks/base]
Brian Carlstrom [Wed, 30 Jul 2014 22:13:17 +0000 (15:13 -0700)]
Move image classes options from art to AndroidRuntime [frameworks/base]

Bug: 15165413
Change-Id: I69c064b05f62a2e8a3801dc924f5b032dedc8e51

9 years agoMove from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
Brian Carlstrom [Tue, 29 Jul 2014 02:13:28 +0000 (19:13 -0700)]
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
Change-Id: I1676987c69a3cad4217dc4b56465ef3ae886122a

9 years agoDisable compilation based on vold.decrypt. [frameworks/base]
Brian Carlstrom [Wed, 30 Jul 2014 19:11:41 +0000 (12:11 -0700)]
Disable compilation based on vold.decrypt. [frameworks/base]

Bug: 15165413
Change-Id: I1972c5af5f392c2ed247888ef33c03e9ffe4d588

10 years agoMerge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​."
John Reck [Thu, 31 Jul 2014 18:28:07 +0000 (18:28 +0000)]
Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​."

10 years agoMerge "Fix a bug that the RecentTask list of other’s may show up to non-primary users."
Craig Mautner [Thu, 31 Jul 2014 16:04:18 +0000 (16:04 +0000)]
Merge "Fix a bug that the RecentTask list of other’s may show up to non-primary users."

9 years agoFix a bug that the RecentTask list of other’s may show up to non-primary users.
Eunae Kim [Fri, 25 Jul 2014 00:16:13 +0000 (09:16 +0900)]
Fix a bug that the RecentTask list of other’s may show up to non-primary users.

When switching to a newly created user, the user may face this bug when he opens the RecentTask screen.
A possible bug scenario is described as follows:
A user id of a removed user may be recycled when created a new user.
However, mRecentTasks is not correctly controlled so that old information may still remain and be possibly mapped to wrong user.
This patch prevents this bug by explicitly removing old information in mRecentTasks when removing existing user.

Change-Id: I1874dbd604598a5d740ae1e034981e21214c15c6
Signed-off-by: Eunae Kim <eunae.kim@lge.com>
9 years agoMerge "[ActivityManager] Prevent coredump file may not complete for testing."
Craig Mautner [Thu, 31 Jul 2014 03:53:15 +0000 (03:53 +0000)]
Merge "[ActivityManager] Prevent coredump file may not complete for testing."

9 years ago[ActivityManager] Prevent coredump file may not complete for testing.
riddle_hsu [Wed, 30 Jul 2014 16:15:05 +0000 (00:15 +0800)]
[ActivityManager] Prevent coredump file may not complete for testing.

Sympton:
During testing, skip kill native crash process manually because it will continue to die by default.

Root Cause:
Large process may take some time to do coredump.In auto test, crash process will be killed immediately that results incomplete coredump file.

Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.

Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494

9 years agoMerge "[ActivityManager] Avoid mistaking visibility by finishing task."
Craig Mautner [Thu, 31 Jul 2014 03:52:14 +0000 (03:52 +0000)]
Merge "[ActivityManager] Avoid mistaking visibility by finishing task."

9 years ago[ActivityManager] Avoid mistaking visibility by finishing task.
riddle_hsu [Wed, 30 Jul 2014 16:26:51 +0000 (00:26 +0800)]
[ActivityManager] Avoid mistaking visibility by finishing task.

Sympton:
Next activity only adds to history but does not launch/resume then results ANR.

Root Cause:
In a rare timing, some windows are switched at the same time,
it will cause some finishing records on the top temporarily,
then set startIt to false that skip to resume the real top activty.

Solution:
If all activities in a task are finishing, do not use it to check.
The behavior/checking is the same concept as in JellyBean:
            // If starting in an existing task, find where that is...
            boolean startIt = true;
            for (int i = NH-1; i >= 0; i--) {
                ActivityRecord p = mHistory.get(i);
                if (p.finishing) { // <--
                    continue;
                }

Change-Id: I9d81a7b5182400c52e173da23eee61c74692beee

10 years agoMerge "Don't assume languages are 2 letter codes."
Narayan Kamath [Thu, 31 Jul 2014 12:13:23 +0000 (12:13 +0000)]
Merge "Don't assume languages are 2 letter codes."

9 years agoDon't assume languages are 2 letter codes.
Narayan Kamath [Wed, 30 Jul 2014 14:42:25 +0000 (15:42 +0100)]
Don't assume languages are 2 letter codes.

Also, note that this method never worked. Locale
settings were stored with underscores (like Locale.toString)
but matched against AssetManager.getLocales() which
returned language-tag like output.

bug: 10090157
Change-Id: I36ffea6e39ff7d1907b2787f8fd4545c24d326a8

10 years agoMerge "Switch TextUtils over to new ICU API."
Narayan Kamath [Thu, 31 Jul 2014 11:29:56 +0000 (11:29 +0000)]
Merge "Switch TextUtils over to new ICU API."

9 years agoSwitch TextUtils over to new ICU API.
Narayan Kamath [Wed, 30 Jul 2014 15:51:27 +0000 (16:51 +0100)]
Switch TextUtils over to new ICU API.

.. and use Locale.getScript() instead of ICU.getScript.

bug: 15876704
Change-Id: Idf9462d8ef568dbc88c95e65a971184952e97872

10 years ago[View] Clear Hardware-Layers before system destroys HardwareRenderer​.
henry.uh_chen [Fri, 18 Jul 2014 07:11:18 +0000 (15:11 +0800)]
[View] Clear Hardware-Layers before system destroys HardwareRenderer​.

Symptom: Sometimes HardwareLayer display is corrupted.

Root Cause: In some cases, ViewRootImpl destroys HardwareRenderer​ without
clearing HardwareLayers in the view hirarchy. If the system trims memory fully
and kill the glContext at the same time, HardwareLayer may corrupt.

Solution: Clear Hardware-Layers before system destroys HardwareRenderer​.

Reproduce steps: Modify the cache's trim memory mechanism to make it easier to
trim fully, HardwareLayers implemented in app will easily be corrupted.
Modification of the cache is not required but make it easier to reproduce.

Change-Id: If57c802cdacf8dc37cbbcc199e74f9482834f981

10 years agoMerge "Update makefile for clang host build."
Tim Murray [Thu, 24 Jul 2014 20:59:33 +0000 (20:59 +0000)]
Merge "Update makefile for clang host build."

10 years agoMerge "Restore untrusted glStencilMask value on resume after functor"
Chris Craik [Wed, 23 Jul 2014 00:14:48 +0000 (00:14 +0000)]
Merge "Restore untrusted glStencilMask value on resume after functor"

10 years agoRestore untrusted glStencilMask value on resume after functor
Chris Craik [Tue, 22 Jul 2014 19:30:39 +0000 (12:30 -0700)]
Restore untrusted glStencilMask value on resume after functor

Fixes an issue where the stencil buffer is corrupted
(used in overdraw debugging, path clipping) when used in
conjunction with a HW accelerated WebView.

bug:15023700
bug:16465551

Change-Id: If201b503931380f7107a34e9a9a2f877a50f72b1

10 years agoMerge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"
Chris Craik [Tue, 22 Jul 2014 19:08:23 +0000 (19:08 +0000)]
Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"

10 years agoMerge "[HWUI] Fix invisible views are still shown in popup window"
Chris Craik [Tue, 22 Jul 2014 19:07:19 +0000 (19:07 +0000)]
Merge "[HWUI] Fix invisible views are still shown in popup window"

10 years agoUpdate makefile for clang host build.
Tim Murray [Thu, 17 Jul 2014 23:37:42 +0000 (16:37 -0700)]
Update makefile for clang host build.

bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434