129755 Commits

Author SHA1 Message Date
Narayan Kamath
531381056f am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '5dca099df7100c531e111b50435605c318f1e6d4':
  Don't adjust ABI if PackageSetting#pkg is null.
2014-05-01 14:39:20 +00:00
Narayan Kamath
d6809b35af am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic."
* commit 'c1f81f9086037dde6e082b8a80c84277cb727726':
  Fix dex file pruning logic.
2014-05-01 14:39:16 +00:00
Narayan Kamath
fbd80b58db am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit '51f4367cac606580a5ca10ec1cf2dcab3982aebc':
  Adjust instruction sets for shared UID apps.
2014-05-01 14:39:12 +00:00
Narayan Kamath
4948f0eee8 Fix build.
Bad automatic merge by git resulted in a dup. of a function.

Change-Id: Idb8fd8a48e1a9f6aeac98a199d6b8c661efaab16
2014-05-01 15:37:15 +01:00
Narayan Kamath
3a951e52d9 resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp
Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
2014-05-01 15:32:20 +01:00
Narayan Kamath
6442494046 am d2ec8724: am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."
* commit 'd2ec8724d2a3407e28161299d44e2e113fe437ec':
  Fix OEM native library path bug.
2014-05-01 14:31:12 +00:00
Narayan Kamath
3009d40c1a am f5c6a1b3: am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"
* commit 'f5c6a1b3eb10f0374fcbab55853f400778f0f8e7':
  Fix native-lib dir assignment & updating
2014-05-01 14:31:07 +00:00
Narayan Kamath
a4a1c34525 am 0338af46: (-s ours) am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"
* commit '0338af46f968e2e1c2fd8c62e9387546fa9ed86b':
  Handle /oem and /vendor as well
2014-05-01 14:31:02 +00:00
George Mount
8df5a07d88 Merge "Fix "blink" when going "back" quickly after entering Activity." 2014-05-01 14:13:01 +00:00
George Mount
265f209d55 Fixed transition start delay propagation when duration = 0.
Bug 14443184

Also gave the propagation speed a tweak to make it more
obvious that there is a propagation.

Change-Id: If9dc3172ae6ce7e6a712ccd1b83ebec9bf880bfa
2014-05-01 07:11:52 -07:00
Narayan Kamath
9ad2380c9d am 5bc12a1b: (-s ours) am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps"
* commit '5bc12a1b5dadfd504fb03875fad97cda8d39cf25':
  Support per-package lib dirs for bundled apps
2014-05-01 14:06:37 +00:00
Narayan Kamath
d2ec8724d2 am d85ded89: am 645a920f: Merge "Fix OEM native library path bug."
* commit 'd85ded890d86d454a0571c63911ff911633e3a95':
  Fix OEM native library path bug.
2014-05-01 14:01:14 +00:00
Narayan Kamath
f5c6a1b3eb am eb573498: am 986b901a: Merge "Fix native-lib dir assignment & updating"
* commit 'eb5734989b3ef5455359f8807684a860ad04c134':
  Fix native-lib dir assignment & updating
2014-05-01 14:01:10 +00:00
Narayan Kamath
5dca099df7 am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '1cec7f8539e6465ff80577169d7d07df3c2574b7':
  Don't adjust ABI if PackageSetting#pkg is null.
2014-05-01 14:00:52 +00:00
Narayan Kamath
c1f81f9086 am 27f2bfc4: Merge "Fix dex file pruning logic."
* commit '27f2bfc406157039c5241f6a4f38f597b2076e2a':
  Fix dex file pruning logic.
2014-05-01 14:00:49 +00:00
Narayan Kamath
51f4367cac am bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit 'bcc3b312b0662ae2f8b8444eaedd5f35fc75c411':
  Adjust instruction sets for shared UID apps.
2014-05-01 14:00:46 +00:00
Narayan Kamath
69da8a124e am 2a9a0471: Merge "Package manager changes for dual zygote stack."
* commit '2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a':
  Package manager changes for dual zygote stack.
2014-05-01 14:00:43 +00:00
Narayan Kamath
2e2c7d2325 am 6af42aea: am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."
* commit '6af42aea725c2afd8e5fbff9bc33ba353c05e1a9':
  Implement FileUtils#contains.
2014-05-01 14:00:25 +00:00
Narayan Kamath
0338af46f9 am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"
* commit '99253c2da945cbd4725efced6cac2dc40c858d6c':
  Handle /oem and /vendor as well
2014-05-01 13:57:21 +00:00
Narayan Kamath
5bc12a1b5d am a7b465ef: am d91358b2: Merge "Support per-package lib dirs for bundled apps"
* commit 'a7b465efc4eede46b8dfc8932c6c30346e8e79de':
  Support per-package lib dirs for bundled apps
2014-05-01 13:57:17 +00:00
Narayan Kamath
6af42aea72 am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."
* commit '9f34234f1c0e39ee43c4a86e23d333ba2a30ec0e':
  Implement FileUtils#contains.
2014-05-01 13:57:13 +00:00
Narayan Kamath
1cec7f8539 Merge "Don't adjust ABI if PackageSetting#pkg is null." 2014-05-01 13:56:59 +00:00
Narayan Kamath
d85ded890d am 645a920f: Merge "Fix OEM native library path bug."
* commit '645a920fd2c478c545c6bb659f2eab36545fe116':
  Fix OEM native library path bug.
2014-05-01 13:56:59 +00:00
Narayan Kamath
eb5734989b am 986b901a: Merge "Fix native-lib dir assignment & updating"
* commit '986b901ae280928e91193527f7c883b296fc62fc':
  Fix native-lib dir assignment & updating
2014-05-01 13:56:56 +00:00
Narayan Kamath
f465db9f1d Don't adjust ABI if PackageSetting#pkg is null.
If means the package hasn't been scanned yet, and we
will adjust the ABI during the scan of the last package
in the shared user group.

NOTE: This needs some more cleaning up, which will be
done along with the remaining TODO in this function.

(cherry picked from commit 6609990e35b11c38f55f6e632160d4f2ff201ea3)

Change-Id: Ibace7849485865054e062d2b979f320bf89ff0f3
2014-05-01 13:56:43 +00:00
Narayan Kamath
27f2bfc406 Merge "Fix dex file pruning logic." 2014-05-01 13:56:37 +00:00
Narayan Kamath
57156572a7 Fix dex file pruning logic.
We should now prune all normal files from /data/dalvik-cache
in addition to looking for dex files in all subdirectories of
/data/dalvik-cache.

(cherry picked from commit 51a6f9253399588eedf77d75c578d9aa23d11529)

Change-Id: I536dfdc48e94155e7be64eb4efd9f7f2a1d2d00a
2014-05-01 13:56:22 +00:00
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
99253c2da9 am fde59428: Merge "Handle /oem and /vendor as well"
* commit 'fde594288bff0b8f95567e6b27f273f50f0c5f87':
  Handle /oem and /vendor as well
2014-05-01 13:53:08 +00:00
Narayan Kamath
a7b465efc4 am d91358b2: Merge "Support per-package lib dirs for bundled apps"
* commit 'd91358b2b977ef7c3551a486f51475c0441aba6e':
  Support per-package lib dirs for bundled apps
2014-05-01 13:52:59 +00:00
Narayan Kamath
9f34234f1c am b916d8ad: Merge "Implement FileUtils#contains."
* commit 'b916d8adffd7ea3588bc178e1ee03f68f0a409e5':
  Implement FileUtils#contains.
2014-05-01 13:52:55 +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
5c5f4b70db am b6c04899: am c8a045d4: am 41f40581: Merge "Fix x86 build in app_process."
* commit 'b6c04899e1ed614985d638b55dafe2c20e7b673a':
  Fix x86 build in app_process.
2014-05-01 11:01:34 +00:00
Narayan Kamath
0dcecf0fc1 am fd30a0e7: (-s ours) am ff34f6fa: am 27b03e62: Merge "Create arch specific cache dirs during zygote startup."
* commit 'fd30a0e7b747eb4b781ef8def3008626f14eddfe':
  Create arch specific cache dirs during zygote startup.
2014-05-01 11:01:30 +00:00
Alexandra Gherghina
3c4d9c56db Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager" 2014-05-01 10:49:21 +00:00
Narayan Kamath
b6c04899e1 am c8a045d4: am 41f40581: Merge "Fix x86 build in app_process."
* commit 'c8a045d451522adab5226b0063f3a15d34542bf7':
  Fix x86 build in app_process.
2014-05-01 10:43:23 +00:00
Narayan Kamath
fd30a0e7b7 am ff34f6fa: am 27b03e62: Merge "Create arch specific cache dirs during zygote startup."
* commit 'ff34f6faaad21f5f72decc0b6a0bbde8dab68e29':
  Create arch specific cache dirs during zygote startup.
2014-05-01 10:43:19 +00:00
Narayan Kamath
c8a045d451 am 41f40581: Merge "Fix x86 build in app_process."
* commit '41f40581ee0284660d30be8ef28f6bf721c4ce10':
  Fix x86 build in app_process.
2014-05-01 10:39:55 +00:00