Narayan Kamath
ff34f6faaa
am 27b03e62: Merge "Create arch specific cache dirs during zygote startup."
...
* commit '27b03e6272479ed82762a4a5d6e4be4f26c1ed58':
Create arch specific cache dirs during zygote startup.
2014-05-01 10:39:52 +00:00
Narayan Kamath
27b03e6272
Merge "Create arch specific cache dirs during zygote startup."
2014-05-01 10:36:28 +00:00
Narayan Kamath
973cdeed8e
Create arch specific cache dirs during zygote startup.
...
The runtime expects them to exist before it's launched.
The boot image / art files are created during the first
zygote launch.
(cherry picked from commit da738713e4e2120a324e8ab6fd11aa0e54a3c66e)
Change-Id: I7472aa25c16a1cf95791af2bdf80ed0d73123872
2014-05-01 11:26:49 +01:00
Narayan Kamath
7034422382
am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
...
* commit 'fbb0ab02bed5c49159acb3dba6848a154e524169':
Fix broken logging in Zygote.cpp.
2014-05-01 10:18:11 +00:00
Narayan Kamath
fbb0ab02be
Merge "Fix broken logging in Zygote.cpp."
2014-05-01 10:15:01 +00:00
Narayan Kamath
160992da04
Fix broken logging in Zygote.cpp.
...
- Differentiate between clean exits and signals.
- Change the logic for the waitpid warning. We should log it
only if the *first* call to waitpid returned ECHILD.
Change-Id: I6bc50e4ffd100fb7f3f526d6b4056bed10b8045f
2014-05-01 10:11:57 +00:00
Elliott Hughes
6a6979ad17
am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
...
* commit '86315c452b955bf0b874f45c1a2e15aedda91a52':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
2014-04-30 21:33:06 +00:00
Elliott Hughes
86315c452b
Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
2014-04-30 21:29:52 +00:00
Michael Wright
809c369892
am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
...
* commit '54c3529b4d3f86488799caa0e62a1f3929a79a39':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
2014-04-30 19:06:40 +00:00
Michael Wright
54c3529b4d
Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
2014-04-30 19:02:56 +00:00
Elliott Hughes
91ff3c18db
am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
...
* commit '7d3f9e9730b100de4c0e643e13bf59bf54ef7819':
Fix for native leaks in YuvToJpegEncoder.cpp
2014-04-30 19:02:53 +00:00
Elliott Hughes
7d3f9e9730
Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
2014-04-30 18:59:54 +00:00
Igor Viarheichyk
84410b054c
Fixes issue causing pseudolocalization of strings
...
in non-translatable resource files.
Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376
2014-04-30 11:56:42 -07:00
Narayan Kamath
414d94059f
am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
...
* commit '56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
Cast CallVoidMethod's size_t parameters to jint
2014-04-30 15:13:02 +00:00
Narayan Kamath
dbbf431b28
am d0f7f418: Merge "Freeing frame map"
...
* commit 'd0f7f41828493b0679e908f7bb3ed3b8e838c463':
Freeing frame map
2014-04-30 15:12:58 +00:00
Narayan Kamath
56cd8dbfbd
Merge "Cast CallVoidMethod's size_t parameters to jint"
2014-04-30 13:34:04 +00:00
Narayan Kamath
d0f7f41828
Merge "Freeing frame map"
2014-04-30 10:58:31 +00:00
Mykola Kondratenko
0c1eeb3c8a
Freeing frame map
...
FileMap memory is never released until application exit
Release it now as the texture is already loaded and the memory
used for the packed resource can be released.
Change-Id: Id08a1e466337b3a0179684eb6a444e18147ee343
2014-04-30 10:58:20 +00:00
Allen Shen
1c0f21ea84
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
...
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer
Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
2014-04-30 17:09:19 +08:00
Bill Yi
9a76e9ba1a
Fix build error
...
Change-Id: I6f52954a780b747f1ad2a4e429ef192d58c40e76
2014-04-29 18:52:48 -07:00
Michael Wright
263c36a144
am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"
...
* commit 'ade631eed0df228e343f2a00db653058ff588846':
NULL previous background bitmap upon changing wallpaper
2014-04-30 01:22:05 +00:00
Michael Wright
ade631eed0
Merge "NULL previous background bitmap upon changing wallpaper"
2014-04-30 01:19:10 +00:00
Michael Wright
108846942f
am 357c75e7: Merge "Add missing character combinations for international layouts"
...
* commit '357c75e74760933f05ff89352ee86dd540633782':
Add missing character combinations for international layouts
2014-04-30 00:07:11 +00:00
Michael Wright
9feab5f278
am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
...
* commit '8a02b20f6f3fdd5baa5d22321769303ce76ba80a':
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
2014-04-30 00:03:29 +00:00
Michael Wright
357c75e747
Merge "Add missing character combinations for international layouts"
2014-04-30 00:01:38 +00:00
Michael Wright
8a02b20f6f
Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
2014-04-29 23:58:17 +00:00
Bill Yi
293513a59d
Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
2014-04-29 16:07:29 -07:00
Nick Kralevich
1866e5dc8b
am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
...
* commit 'af40649e4ad506e312b53518cd2b9f2b58dee3ba':
Set NO_NEW_PRIVS on zygote init
2014-04-29 22:24:32 +00:00
Nick Kralevich
af40649e4a
Merge "Set NO_NEW_PRIVS on zygote init"
2014-04-29 22:20:47 +00:00
Nick Kralevich
195c73c9b2
Set NO_NEW_PRIVS on zygote init
...
When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set.
This prevents zygote spawned apps from acquiring new privileges
on exec.
In particular, this allows the CTS test
android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set
as the default runtime.
Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
2014-04-29 15:10:58 -07:00
Selim Gurun
c23f5651fd
am 5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub"
...
* commit '5c220cc4e4c0584a9083529b58e30e17ab7d2d9e':
DO NOT MERGE Add invokeFunctor stub
2014-04-29 18:45:53 +00:00
Selim Gurun
5c220cc4e4
Merge "DO NOT MERGE Add invokeFunctor stub"
2014-04-29 18:42:25 +00:00
Bo Liu
02931d9af6
DO NOT MERGE Add invokeFunctor stub
...
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
2014-04-29 11:38:37 -07:00
Mathieu Meisser
04f8532776
Add missing character combinations for international layouts
...
Czech: add missing capslock for numbers and shift+ralt
mappings.
Slovak: fix wrong ralt mappings, add missing ralt mappings
and fixed wrong PLUS key character.
US intl: add missing capslock+ralt support.
Swiss French and Swiss German: add missing ralt mapping for key
numbers 4 and 5, and add missing capslock and capslock+
shift for SEMICOLON and APOSTROPHE.
Change-Id: I02c94bf13d5268d5d1e648c96b7251cb7564f233
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
2014-04-29 16:52:40 +02:00
Elliott Hughes
7af8f5ba9c
am 10d57c4b: Merge "Fix two zygote imports."
...
* commit '10d57c4bc7459d0c73b254af006a3528e9a0c33e':
Fix two zygote imports.
2014-04-29 04:01:01 +00:00
Elliott Hughes
cf939672f8
am 2e9d924d: Merge "Remove unused import."
...
* commit '2e9d924d4f4275c72df4be28d85482064cee43f8':
Remove unused import.
2014-04-29 03:56:19 +00:00
Elliott Hughes
10d57c4bc7
Merge "Fix two zygote imports."
2014-04-29 03:54:49 +00:00
Elliott Hughes
a9569ff70f
Fix two zygote imports.
...
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
2014-04-28 20:53:52 -07:00
Elliott Hughes
2e9d924d4f
Merge "Remove unused import."
2014-04-29 03:52:11 +00:00
Elliott Hughes
f25f14eeba
Remove unused import.
...
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
2014-04-28 20:51:34 -07:00
Elliott Hughes
fff28619d8
am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
...
* commit 'f4a7ac00a734343b8d2760def352cbdf99fa08c7':
Move the Zygote off libcore.os and onto android.system.
2014-04-29 02:31:34 +00:00
Elliott Hughes
f4a7ac00a7
Merge "Move the Zygote off libcore.os and onto android.system."
2014-04-29 02:28:07 +00:00
Elliott Hughes
860c5911a2
Move the Zygote off libcore.os and onto android.system.
...
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
2014-04-28 19:19:13 -07:00
Elliott Hughes
12928a07c5
am 2336c4ec: Merge "Fix build."
...
* commit '2336c4ecc5735eb374e5c804b1fe863650c24d7f':
Fix build.
2014-04-28 19:45:06 +00:00
Elliott Hughes
2336c4ecc5
Merge "Fix build."
2014-04-28 19:41:24 +00:00
Elliott Hughes
9790190fee
Fix build.
...
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
2014-04-28 12:40:12 -07:00
Elliott Hughes
685a0a72d4
am bbd87eb9: Merge "Track libcore.os\' move to android.system."
...
* commit 'bbd87eb9193e9730869171324ee4f5fc1abeae55':
Track libcore.os' move to android.system.
2014-04-28 18:17:06 +00:00
Elliott Hughes
bbd87eb919
Merge "Track libcore.os' move to android.system."
2014-04-28 18:14:00 +00:00
Mathieu Chartier
18582a827c
am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
...
* commit '0cd623bb9f832194cdd9c08625fa32583e947c76':
Use Runtime.gc instead of System.gc for DDMS.
2014-04-28 18:13:07 +00:00
Elliott Hughes
34385d352d
Track libcore.os' move to android.system.
...
(This is partial, but should cover everything in AOSP master except
for the zygote.)
Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
2014-04-28 11:11:32 -07:00