120430 Commits

Author SHA1 Message Date
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
Brian Carlstrom
4d4e450a39 PackageInfo is a class, not a struct
(cherry picked from commit 646d1b8ea801d92b04ead6cbae2899d8256ec3ff)

Change-Id: Id9ddc520fbfc4787c3b267df9a35a45e8cc52d65
2014-08-17 16:10:48 -07: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
Piotr Jastrzebski
e2134a4b5d Update ziparchive usage to the new API.
Bug: 16162465

Change-Id: If3064e2be3e7e85366b07434294a7879b0e5f9bc
2014-08-15 14:41:08 +01:00
Yong WU
03c866020b Integrate NativeActivity with NativeBridge interfaces
Bug: 16884833

Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-15 10:18:40 +01:00
Calin Juravle
508e768d95 Merge "Integrate NativeActivity with NativeBridge interfaces" 2014-08-15 04:45:59 +00:00
Jeff Sharkey
2013cb1f91 Merge "Prevent system_server shutdown when trying to format external storage" 2014-08-12 20:07:20 +00:00
Stephen Hines
4179e88963 Merge "Revert "Collapse code paths for single- and multi-input kernels."" 2014-08-12 19:57:35 +00:00
Stephen Hines
c9c7daf69b Revert "Collapse code paths for single- and multi-input kernels."
This reverts commit eb3470219dea322efa93eb4b5457813ce71d0c5d.

Change-Id: Id943abf953e832ef831318e6699d4b46e9b46201
2014-08-13 17:32:19 +00:00
Stephen Hines
24a2ee660a Merge "Collapse code paths for single- and multi-input kernels." 2014-08-13 16:51:59 +00:00
Craig Mautner
67fe6d1f76 Merge "Revert "Fix a bug: unable to start activity when AM is killing the process."" 2014-08-12 19:23:43 +00:00
Craig Mautner
ca9ba58786 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
2014-08-12 21:09:07 +00:00
Leo Hsu
5073145f85 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
2014-08-12 13:47:23 +08:00
Craig Mautner
dc0afc91c2 Merge "Fix a bug: unable to start activity when AM is killing the process." 2014-08-11 18:15:12 +00:00
Adam Powell
dafcc61078 Merge "Don't unnecessarily set LayoutParams on children" 2014-08-08 20:41:34 +00:00
Calin Juravle
219b535673 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
2014-08-08 18:45:28 +01: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
Chris Wailes
eb3470219d 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
2014-08-07 14:57:22 -07:00
Piotr Jastrzebski
07291cccc0 Merge "Remove memory leak." 2014-08-07 18:51:06 +00:00
Piotr Jastrzebski
1a68b079d7 Remove memory leak.
Call EndIteration in endIteration to free memory allocated for cookie in
StartIteration.

Change-Id: I3d58a461c2f3676565cfd7922dc6d8d5c35feae9
2014-08-11 08:20:35 +01:00
Calin Juravle
94f3e47da5 Merge "Fix the instruction set for dex file during (re)moving ops." 2014-08-07 18:42:30 +00: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
7f93572650 Merge "Use native ISA for dex code (in case there's a NativeBridge)" 2014-08-07 09:28:10 +00:00
Calin Juravle
576c384ed8 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
2014-08-06 19:28:28 +01:00
Brian Carlstrom
8b8c718cbb Merge "Make system use patchoat to relocate during runtime." 2014-08-05 00:30:25 +00:00
Alex Light
1995d12d26 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
2014-08-05 10:22:10 -07:00
Mathieu Chartier
7782c6b381 Merge "Fix JNI error in exception reporting." 2014-08-05 00:20:48 +00: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
20bac14e52 Merge changes I69c064b0,I1972c5af
* changes:
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]
2014-08-01 08:22:51 +00:00