drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,134 Commits 1 Branch 0 Tags
Commit Graph

122134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
6c2e806200 am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp." 
* commit '703442238200c2f1a35b51e7aadc693322feb69d':
  Fix broken logging in Zygote.cpp.
 2014-05-01 10:22:56 +00: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
Robert Ly
f05bef95fb am b76f7b35: am 8873025b: am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs 
* commit 'b76f7b35db0040591492f026d0dc17678141b6cf':
  update wear stack notifications to coincide with devbyte code
 2014-05-01 09:42:08 +00:00
Robert Ly
b76f7b35db am 8873025b: am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs 
* commit '8873025b2a52ca1ecccfaa9840e82681e17900d4':
  update wear stack notifications to coincide with devbyte code
 2014-05-01 09:37:01 +00:00
Robert Ly
8873025b2a am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs 
* commit 'f26a71003de069355931eab340433ba8345ba3f7':
  update wear stack notifications to coincide with devbyte code
 2014-05-01 08:22:05 +00:00
Robert Ly
f26a71003d Merge "update wear stack notifications to coincide with devbyte code" into klp-docs 2014-05-01 07:27:23 +00:00
Robert Ly
b8e3f209af update wear stack notifications to coincide with devbyte code 
Change-Id: I4ccfc39eb47c938b9c1e9ba9309aaba54319f53b
 2014-05-01 00:23:42 -07:00
Ricardo Cervera
6824e4e351 am 8bef5ea7: am 27515952: am ba333f2f: docs: Added release notes for Android Studio 0.5.2 
* commit '8bef5ea70161586287ec06e9bd74b30604cd3f2c':
  docs: Added release notes for Android Studio 0.5.2
 2014-04-30 22:40:00 +00:00
Ricardo Cervera
8bef5ea701 am 27515952: am ba333f2f: docs: Added release notes for Android Studio 0.5.2 
* commit '27515952f54a8c98eaec694ce74c3b9d9b152746':
  docs: Added release notes for Android Studio 0.5.2
 2014-04-30 22:03:40 +00:00
Ricardo Cervera
27515952f5 am ba333f2f: docs: Added release notes for Android Studio 0.5.2 
* commit 'ba333f2f4c2ca5325b4df1b131c6c26a18beb877':
  docs: Added release notes for Android Studio 0.5.2
 2014-04-30 21:59:19 +00:00
Ricardo Cervera
ba333f2f4c docs: Added release notes for Android Studio 0.5.2 
Change-Id: Ia364620d0ab14648b4db523890c529a0dc5b940d
 2014-04-30 14:41:44 -07:00
Elliott Hughes
fd955f14d6 am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files." 
* commit '6a6979ad17dfb492fb85a979e8f8688e4ed973b2':
  Fixes issue causing pseudolocalization of strings in non-translatable resource files.
 2014-04-30 21:35:45 +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
Deepanshu Gupta
cd50f72946 am c046c767: am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit 'c046c76739b210d912dae38bf945d60b8d69ab11':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-04-30 20:38:49 +00:00
Deepanshu Gupta
c046c76739 am c0c96012: am 4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit 'c0c96012c667d1d91d8f6b763df45e566cae0eaf':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-04-30 20:35:04 +00:00