388 Commits

Author SHA1 Message Date
Sebastien Hertz
5fa6c7424a am 60a2716f: am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
* commit '60a2716f720e843a7de6e7209c2021d95538711e':
  Allow debugging only for apps forked from zygote
2015-08-18 09:59:11 +00:00
Sebastien Hertz
60a2716f72 am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
* commit '3244dc229af4d4c8b764bf9ca1e108b5cd933d90':
  Allow debugging only for apps forked from zygote
2015-08-18 09:52:46 +00:00
Sebastien Hertz
9a010d0a41 Merge "Allow debugging only for apps forked from zygote" into mnc-dev 2015-08-18 07:41:50 +00:00
Narayan Kamath
ae61c26534 am 0d2e3d3e: am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.
* commit '0d2e3d3ea3cd1bd0f77b3fdd8da6b17261cdd799':
  Fall back to persist.sys.language/country if locale isn't set.
2015-08-12 11:02:48 +00:00
Narayan Kamath
0d2e3d3ea3 am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.
* commit 'c42acbdb65d89b1e5fc1cafde4cbe0996c104f7a':
  Fall back to persist.sys.language/country if locale isn't set.
2015-08-12 10:55:33 +00:00
Narayan Kamath
bf88205bef Fall back to persist.sys.language/country if locale isn't set.
This will prevent users from losing their language setting when they
take an OTA to M.

bug: 23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
2015-08-12 11:03:46 +01:00
Sebastien Hertz
7a09b8322c Allow debugging only for apps forked from zygote
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463
Change-Id: If8ea719063a65db4cdeed69a838b52e87b078b08
2015-08-10 20:39:13 +02:00
Roozbeh Pournader
112d9c7f11 Remove EmojiFactory and its mentions from frameworks.
Bug: 18134313
Bug: 20158206
Change-Id: If46cdbd9d558e6592280b2b95f00b87d04de70a2
2015-08-07 12:57:01 -07:00
Andreas Gampe
d1fffe1c89 am 505a252c: am 851f5185: am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
* commit '505a252cf7120dda0f1afb72f532bd99ada23baa':
  Frameworks/base: Hand fingerprint to ART
2015-07-24 22:28:35 +00:00
Andreas Gampe
e60825033f Frameworks/base: Hand fingerprint to ART
To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.

Bug: 22693991
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
2015-07-24 14:19:44 -07:00
Narayan Kamath
bef809c4ba am 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework."
* commit '4da086ee7f4eba64265b28cdc5df9f690d97a7ac':
  Delete unused testing scripts and WithFramework.
2015-07-04 02:57:58 +00:00
Narayan Kamath
c21dab9dcb Delete unused testing scripts and WithFramework.
These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.

If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java

This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.

bug: 22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
2015-07-02 11:41:52 +01:00
Andreas Gampe
cadcd51e05 Frameworks/base: Add tracing system properties
Add system properties to support zygote-started method tracing.
These are needed as the limit on system properties does not allow
the reuse of the runtime extra options system property.

Bug: 21760614

(cherry picked from commit 98f406f6f31660d0f5ee32113ffadc720b426dc6)

Change-Id: I3785cc5715acadbee81ef7b45081ed780f1351d3
2015-06-24 18:44:05 -07:00
Andreas Gampe
98f406f6f3 Frameworks/base: Add tracing system properties
Add system properties to support zygote-started method tracing.
These are needed as the limit on system properties does not allow
the reuse of the runtime extra options system property.

Bug: 21760614
Change-Id: I3785cc5715acadbee81ef7b45081ed780f1351d3
2015-06-22 21:11:15 -07:00
David Srbecky
065075e1f9 Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.

(cherry picked from commit f39477b592e6e17fe41ace2e18602a69b2dd1619)

Bug: 21924613
Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
2015-06-19 02:20:06 +01:00
David Srbecky
f39477b592 Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.

Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
2015-05-28 17:16:09 +01:00
Andreas Gampe
27c39f1ade am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp
* commit 'b6d14a009e43a4d61ae2a4f98f6e3b914148d0a9':
  Frameworks/base: Add debug.gencfi property

(cherry picked from commit a5b55a017a984608eacdf414bc1cbcd7615f1c13)
2015-04-28 13:46:00 -07:00
Andreas Gampe
a876b35d48 Frameworks/base: Add debug.gencfi property
Add the debug.gencfi system property that forces generation of
CFI data.

Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
2015-04-24 16:31:41 -07:00
Dmitriy Ivanov
d95e58cb60 Merge "Load libraries directly from apk" 2015-04-07 17:28:15 +00:00
Dmitriy Ivanov
dec4688f40 Load libraries directly from apk
Introduced new 'extractNativeLibs' attribute to manifest/application.
 Setting it to false prevents installer from extracting library from apk.

 The default value for extractNativeLibs is true.

Bug: 8076853
(cherry picked from commit ff193d642eea7128faad837d19e347cd25212c27)
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-04-07 17:25:23 +00:00
Andreas Gampe
305b44b948 am f29be77f: am a4f39ed9: am f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"
* commit 'f29be77f07084e88ae7104a375a1a54fd91de0dd':
  Frameworks/base: Pass variant and feature-set to runtime
2015-04-04 05:02:27 +00:00
Andreas Gampe
605cca1a98 Frameworks/base: Pass variant and feature-set to runtime
This is required so we pick up the settings correctly when compiling
the boot image on device, or compile any dex files through a
DexClassLoader.

Bug: 20055104
Change-Id: Ia3ab2e48855060894b36f7fd360fe17b978e45a6
2015-04-03 16:08:20 -07:00
Andreas Gampe
ac038f3b69 resolved conflicts for merge of 844e44c9 to master
Change-Id: I8f682da1a50151547f01b4d3a949852525fe6299
2015-04-01 15:57:17 -07:00
Andreas Gampe
e324ba0e7c Frameworks/base: Use system property for cache prune counter
Expose ART's -Xzygote-max-boot-retry through a new system property
dalvik.vm.zygote.max-boot-retry.

Bug: 19983101
Change-Id: Ib88f807e0082d71292c14c7af38e02cca5a5602c
2015-04-01 19:50:58 +00:00
Andreas Gampe
a60e809994 am abeba1ff: am c10fa20b: am 02c4bbb9: Merge "Frameworks/base: Support dex2oat threads system property"
* commit 'abeba1ff3306eab6ba6e58dce895cd2cf9117700':
  Frameworks/base: Support dex2oat threads system property
2015-03-31 03:44:02 +00:00
Andreas Gampe
e035238823 Frameworks/base: Support dex2oat threads system property
Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART
with "-j" as a compiler option, if found.

Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to
ART with "-j" as an image compiler option, if found.

Bug: 19992386
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
2015-03-30 20:16:03 -07:00
Dmitriy Ivanov
ff193d642e Load libraries directly from apk
Introduced new 'extractNativeLibs' attribute to manifest/application.
 Setting it to false prevents installer from extracting library from apk.

 The default value for extractNativeLibs is true.

Bug: 8076853
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-03-21 11:46:11 -07:00
Mathieu Chartier
543a3578ad am 05844d57: am b7d997a7: Merge "Revert "Change jit properties to be debug properties""
* commit '05844d573f33c77cd7bb608a118a998506a6996d':
  Revert "Change jit properties to be debug properties"
2015-03-19 17:06:43 +00:00
Mathieu Chartier
1fb7aab9b2 Revert "Change jit properties to be debug properties"
Bug: 19735273

This reverts commit 1ad10ef1e4b83ef9e845761a82e202bb57e2379d.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
2015-03-18 19:07:02 -07:00
Mathieu Chartier
6f6f825ebb am 5ec7c78d: am 008ec61e: Merge "Change jit properties to be debug properties"
* commit '5ec7c78d52a5a01ed1755ad8b8e486e4c6f05a93':
  Change jit properties to be debug properties
2015-03-17 14:47:24 +00:00
Mathieu Chartier
1ad10ef1e4 Change jit properties to be debug properties
Bug: 19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
2015-03-16 16:22:52 -07:00
Eric Laurent
633cb563f3 broadcast radio JNI.
Initial implementation of broadcast radio JNI.

Change-Id: Ia01f567292295928fbf6d9c23de362867dc15314
2015-03-13 15:32:59 -07:00
Chris Craik
c9070ebd13 Rename and simplify DisplayList Canvas classes
Change-Id: I49fd2ce02e01401209fe2a378e9f9547c7b27c61
2015-03-09 19:09:55 -07:00
Mathieu Chartier
5e3c29956b am ea3d53f5: am 773bcfa7: am e59b7ce2: Merge "Add JIT system properties"
* commit 'ea3d53f5a8f8e396bf8918041087db4603d444e5':
  Add JIT system properties
2015-03-08 00:17:40 +00:00
Mathieu Chartier
773bcfa7ec am e59b7ce2: Merge "Add JIT system properties"
* commit 'e59b7ce2564a916240e561b36f4476f2d72a65c5':
  Add JIT system properties
2015-03-06 01:36:55 +00:00
Mathieu Chartier
6909c0e1e7 Add JIT system properties
Added the following runtime options.
"dalvik.vm.usejit" -> "-Xusejit:"
"dalvik.vm.jitcodecachesize" -> "-Xjitcodecachesize:"
"dalvik.vm.jitthreshold" -> "-Xjitthreshold:"

Bug: 17950037
Change-Id: I4996cdd1e34a1743d83c37069f545e6e09bccdb9
2015-03-05 17:02:54 -08:00
Narayan Kamath
56bbefccf2 Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: 117f161
automerge: 1194e75

* commit '1194e754a95e1fa5d4eba6d0bca109156dd4df94':
  Add support for persist.sys.locale.
2015-01-22 14:00:51 +00:00
Narayan Kamath
1194e754a9 Merge "Add support for persist.sys.locale." automerge: dca2332
automerge: 117f161

* commit '117f161fee52dfa200f89282c487d58c29b41d4f':
  Add support for persist.sys.locale.
2015-01-22 13:56:01 +00:00
Narayan Kamath
d30dbb8ae1 Add support for persist.sys.locale.
AndroidRuntime has been changed to read "ro.product.locale" and
"persist.sys.locale" instead of "ro.product.locale.language" etc.
This is passed down as "-Duser.locale" to the runtime.

The system_server has been changed to write out persist.sys.locale
on locale changes.

bug: 17691569

Change-Id: I93360c8795c9620a133656dc491d13d7b6ed162e
2015-01-22 13:48:20 +00:00
Ben Wagner
177612335a Remove last mention of SkFontHost.
SkFontHost is now almost removed from Skia, and nothing is left in it
which interests Android. Remove the last few references to it to aid
in final removal.

Change-Id: I7d59cf7e08bdd5b9c3923c9ffaf03b1cc2f9f7b4
2015-01-15 14:16:46 -05:00
Andreas Gampe
555ea653ba am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit 'ec64c0b6e639b743398fb543218100fdaf9a7f69':
  Core/jni: Disallow relocation for decryption
2015-01-07 22:16:11 +00:00
neo.chae
155118fee8 Core/jni: Disallow relocation for decryption
When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.

If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.

This patch ensures that the boot image is not being relocated.

Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
2015-01-07 13:28:36 -08:00
Andreas Gampe
83cfb97323 am 5470c169: am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
* commit '5470c1699121135f0f1c615d080359f0bc9cf1c4':
  Core/jni: Remove Dalvik options from AndroidRuntime
2014-12-23 03:44:12 +00:00
Andreas Gampe
08b2d585b1 Core/jni: Remove Dalvik options from AndroidRuntime
Dalvik is dead. Remove old command-line options from AndroidRuntime.

Bug: 18833580
Bug: 18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
2014-12-22 14:57:18 -08:00
Elliott Hughes
e6f2f9db42 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java."
automerge: e37f3af

* commit 'e37f3af76dc0c876ea7169b9153f79175d0c703d':
  Move the remaining ZygoteInit native code over to Java.
2014-12-18 20:54:28 +00:00
Elliott Hughes
26b56e628b Move the remaining ZygoteInit native code over to Java.
Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
2014-12-17 12:28:29 -08:00
Andreas Gampe
2e706eb5b7 am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev
* commit 'f1c84568bc48d51ace404452c9e18250c4d36de4':
  Frameworks/base: Compiled-classes support
2014-11-18 22:57:02 +00:00
Andreas Gampe
f59fb28cb8 Frameworks/base: Compiled-classes support
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571

(cherry picked from commit ca775941f3b7981aabf3a6a3b84d6c94f4f76aff)

Change-Id: I2510316381f2661166af24d7e14b013f4e045556
2014-11-18 14:48:31 -08:00
Andreas Gampe
ca775941f3 Frameworks/base: Compiled-classes support
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571
Change-Id: I2510316381f2661166af24d7e14b013f4e045556
2014-11-18 11:48:22 -08:00
Ying Wang
e77a906653 am bb637938: am 7f5fbe9e: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev
* commit 'bb637938d476e7927d2eed53255a3be7f5dd2d19':
  Frameworks/base: AndroidRuntime standalone preloaded-classes
2014-11-17 19:23:25 +00:00