118262 Commits

Author SHA1 Message Date
Narayan Kamath
bcc3b312b0 Merge "Adjust instruction sets for shared UID apps." 2014-05-01 13:55:49 +00:00
Narayan Kamath
1b46093d33 Adjust instruction sets for shared UID apps.
Since shared UID apps are run in the same process,
we'll need to make sure they're compiled for the same
instruction set.

This change implements the recompilation of apps that
don't have any ABI constraints.

Apps that *do* have ABI constraints are harder to deal
with, since we'll need to rescan them to figure out the
full list of ABIs they support and then re-extract the
native libraries from these apps once we find an ABI we
can use throughout.

(cherry picked from commit 85703d58af1dac692d7d83c03220e45ab2a5aded)

Change-Id: I8311a683468488cc7e30381965487a3d391609ae
2014-05-01 13:55:35 +00:00
Narayan Kamath
2a9a047140 Merge "Package manager changes for dual zygote stack." 2014-05-01 13:55:06 +00:00
Narayan Kamath
0349e8c478 Package manager changes for dual zygote stack.
- Pass down the app's instruction set to dexopt so that
  it can compile the dex file for the right architecture.

- Also pass down the app's instruction set to rmdex, movedex
  and getSize so that they can construct the cache file
  location properly.

- Temporarily compile "system" jars such as am,wm etc. for
  both architectures. A follow up change will ensure that
  they're compiled only for one architecture (the same
  arch. as the system server).

- Java "shared" libraries are now compiled for the right
  architecture when an app requires them.

- Improve the app native library ABI detection to account
  for system apps installed in /system/lib{64}/<packagename>
  and also handle sdcard and forward locked apps correctly.

(cherry-picked from commit b4d35dc8e9702f9d0d82d35a105f0eea35672b52)
2014-05-01 13:54:48 +00:00
Narayan Kamath
645a920fd2 Merge "Fix OEM native library path bug." 2014-05-01 13:52:44 +00:00
Jeff Sharkey
66309e2bf7 Fix OEM native library path bug.
Bug: 13340779

(cherry picked from commit 7d3328d14bbbee01a9de1ff5b13b0446c709d835)

Change-Id: I1b4c5d138cafe3651d475ca1e048f495ff6c5f10
2014-05-01 13:52:33 +00:00
Narayan Kamath
986b901ae2 Merge "Fix native-lib dir assignment & updating" 2014-05-01 13:52:16 +00:00
Christopher Tate
c38a807b2f Fix native-lib dir assignment & updating
The per-package /system/lib/* feature introduced bugs in the
native library path handling during app upgrade installs.  The
crux of the fix is that when recalulating the desired native
library directory, the basis for the calculation needs to be
the scanned APK's location rather than the extant package
settings entry -- because that entry refers to the pre-upgrade
state of the application, not the new state.

Bug 14233983

(cherry picked from commit 353e39a973dbbadce82fee2f83ad194e04a47449)

Change-Id: I26f17a596ca2cd7f963955c0642548c15138ae26
2014-05-01 13:52:06 +00:00
Narayan Kamath
fde594288b Merge "Handle /oem and /vendor as well" 2014-05-01 13:51:44 +00:00
Christopher Tate
c84471c2e0 Handle /oem and /vendor as well
Bug 13170859

(cherry-picked from commit 740888f62eae158d5775be716620f0d56d87f587)

Change-Id: I7b5e206697fcbec146cac6cd83fca5c583a8cbd7
2014-05-01 13:51:33 +00:00
Narayan Kamath
d91358b2b9 Merge "Support per-package lib dirs for bundled apps" 2014-05-01 13:51:08 +00:00
Narayan Kamath
fc0810e565 Support per-package lib dirs for bundled apps
Bundled apps can now use /system/lib/apkname or /system/lib64/apkname
in addition to the (globally shared) /system/lib and /system/lib64
directories.  Note that when an app is updated post hoc the update APK
will look to its normal library install directory in
/data/data/[packagename]/lib, so such updates must include *all*
needed libraries -- the private /system/lib/apkname dir will not be in
the path following such an update.

"apkname" here is the base name of the physical APK that holds the
package's code.  For example, if a 32-bit package is resident on disk
as /system/priv-app/SettingsProvider.apk then its app-specific lib
directory will be /system/lib/SettingsProvider

Bug 13170859

(cherry picked from commit addfbdc09ccf258395db8bfc510989a4c583f7ab)

Change-Id: Id82da78024a6325458b8b134d7d91ad0e5f0785e
2014-05-01 13:50:47 +00:00
Narayan Kamath
b916d8adff Merge "Implement FileUtils#contains." 2014-05-01 13:50:36 +00:00
Narayan Kamath
d6d1dbac3f Implement FileUtils#contains.
Partial cherry-pick of changes 4ca728c0 and 21de56a9, which
can't be cherry-picked due to their large surface area.

Change-Id: Ife46e150d360cd5241dea93863141749233c1805
2014-05-01 14:01:44 +01:00
Narayan Kamath
41f40581ee Merge "Fix x86 build in app_process." 2014-05-01 10:36:31 +00:00
Narayan Kamath
27b03e6272 Merge "Create arch specific cache dirs during zygote startup." 2014-05-01 10:36:28 +00:00
Narayan Kamath
d6183204e4 Fix x86 build in app_process.
Look for __i386__ and not __x86__.

(cherry picked from commit 47d526217b3fd0d17ba751c66d25cfaf1c6ed7cd)

Change-Id: I848ba351c378e59ab6744ca1983ae4463ae75ba4
2014-05-01 11:27:49 +01: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
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
Olivier Gay
8840f1f13a Map KEY_APPSELECT to APP_SWITCH.
Change-Id: Iec801f2edfec9923aac088cb66663f64d62b3df6
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
2014-05-01 11:11:27 +02: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
54c3529b4d Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 2014-04-30 19:02:56 +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
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
Michael Wright
ade631eed0 Merge "NULL previous background bitmap upon changing wallpaper" 2014-04-30 01:19:10 +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
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
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
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
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
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
bbd87eb919 Merge "Track libcore.os' move to android.system." 2014-04-28 18:14:00 +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
Mathieu Chartier
0cd623bb9f Merge "Use Runtime.gc instead of System.gc for DDMS." 2014-04-28 18:10:42 +00:00
Mathieu Chartier
83f7d0d67f Use Runtime.gc instead of System.gc for DDMS.
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.

Bug: 14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
2014-04-28 11:07:22 -07:00
Stefan Wysocki
22d3990273 Set ActionMode title to the number of selected files
After change of orientation ActionMode is recreated without previously
set title. It needs to be updated in onCreateActionMode callback.

Change-Id: If5f36e8ad6d1b5cf04ed242611fd037969d73517
2014-04-28 10:47:34 +02:00