OSDN Git Service
Michael Wright [Tue, 20 May 2014 05:42:58 +0000 (22:42 -0700)]
resolved conflicts for merge of
32912e0a to stage-aosp-master
Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26
Michael Wright [Tue, 20 May 2014 04:04:00 +0000 (04:04 +0000)]
Merge "wallpaper: limit wallpaper width to sys.max_texture_size"
Donghan Ryu [Tue, 15 Nov 2011 02:56:11 +0000 (18:56 -0800)]
wallpaper: limit wallpaper width to sys.max_texture_size
Image wallpapers are created ~1.5x screen size. On some devices this
may exceed the maximum supported texture size, which will either fail
allocation or fail to composite.
Bug 991597
Change-Id: I9948b09f6e00a724212e73d36901f2bbea42e2f4
Chris Craik [Mon, 19 May 2014 19:27:52 +0000 (19:27 +0000)]
am
b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit '
b1708e9b764268a06d91219a5c39ee9efd32ab00':
Use alpha channel instead of red in drawCachedGlyphBitmap
Chris Craik [Mon, 19 May 2014 19:23:07 +0000 (19:23 +0000)]
Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
Michael Wright [Mon, 19 May 2014 18:19:20 +0000 (18:19 +0000)]
am
a84d24c3: Merge "Extend support for nordic languages with Sami"
* commit '
a84d24c37a3e27cdd4f50807e9dc5fb6f14ea009':
Extend support for nordic languages with Sami
Michael Wright [Mon, 19 May 2014 18:15:38 +0000 (18:15 +0000)]
Merge "Extend support for nordic languages with Sami"
Narayan Kamath [Mon, 19 May 2014 13:29:57 +0000 (13:29 +0000)]
am
a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit '
a4fd1baac68dcd73957e0fca0c02089ecf9a268a':
Fail if we're unable to agree on an ISA for shared UIDs.
Narayan Kamath [Mon, 19 May 2014 13:26:44 +0000 (13:26 +0000)]
Merge "Fail if we're unable to agree on an ISA for shared UIDs."
Narayan Kamath [Thu, 15 May 2014 14:01:46 +0000 (15:01 +0100)]
Fail if we're unable to agree on an ISA for shared UIDs.
It's not worth the complexity of rescanning the APK and
extracting a shared library with a different ABI.
Also gets rid of an unnecessary command line argument and
checks for dex-opt failures while adjusting shared ABIs.
bug:
14453227
Change-Id: I6a0695e24cba37e93540c540507088e95b89089b
Mathieu Meisser [Tue, 17 Dec 2013 15:54:32 +0000 (16:54 +0100)]
Extend support for nordic languages with Sami
Add access (via ralt combination) of Sami characters
into Danish, Norwegian and Swedish mappings.
Update Finnish mapping by fixing wrong Sami characters,
removing wrong ralt+shift mappings and adding support
with capslock+ralt for capital Sami's.
Remove unnecessary swap of MINUS and SLASH key
mapping in kcm.
Change-Id: I872ae2ad31272e8cf55ae1db01c7e30c6a40d5bc
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
Michael Wright [Sat, 17 May 2014 01:06:51 +0000 (01:06 +0000)]
am
0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping"
* commit '
0a5236a7cd3fa5a62a97f14a512dbeb5eb34772a':
Add support for Latvian (qwerty) keyboard mapping
Michael Wright [Sat, 17 May 2014 01:02:54 +0000 (01:02 +0000)]
Merge "Add support for Latvian (qwerty) keyboard mapping"
John Reck [Fri, 16 May 2014 15:56:07 +0000 (15:56 +0000)]
am
0661ddee: Merge "Enable display list updates with zero delta time"
* commit '
0661ddee112477db180d65e605f34fd538fdf8bc':
Enable display list updates with zero delta time
John Reck [Fri, 16 May 2014 15:51:38 +0000 (15:51 +0000)]
Merge "Enable display list updates with zero delta time"
Narayan Kamath [Fri, 16 May 2014 12:26:34 +0000 (12:26 +0000)]
am
79e0206e: Merge "Init the static member when first used for CursorWindow."
* commit '
79e0206ef3203a1842949242e58fa8f3c25eb129':
Init the static member when first used for CursorWindow.
Narayan Kamath [Fri, 16 May 2014 12:24:32 +0000 (12:24 +0000)]
Merge "Init the static member when first used for CursorWindow."
Narayan Kamath [Fri, 16 May 2014 12:08:09 +0000 (12:08 +0000)]
am
8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
8a196c0676eebf10b2120f3305c0b9bcb99e97ce':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:06:09 +0000 (12:06 +0000)]
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
Narayan Kamath [Fri, 2 May 2014 16:53:33 +0000 (17:53 +0100)]
Change InputMessage.motion.pointerSize to a uint32_t.
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from commit
bc6001b026069714177526eb1120b0011d6f2a51)
Change-Id: Ide6bb4dc05cc92a7ae8833e615e8ebb2353255a6
Narayan Kamath [Thu, 15 May 2014 13:38:17 +0000 (13:38 +0000)]
am
402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit '
402120a2236b294dff9a51461cb22400a6ef67f6':
Wait for secondary zygote before bringing up the system_server.
Narayan Kamath [Thu, 15 May 2014 13:34:09 +0000 (13:34 +0000)]
Merge "Wait for secondary zygote before bringing up the system_server."
Narayan Kamath [Thu, 15 May 2014 12:41:47 +0000 (12:41 +0000)]
am
706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '
706b1d7ea0214b6858730e68c95c6a6d6d9a4c30':
Remove "required" prefix from ABI fields.
Narayan Kamath [Thu, 15 May 2014 12:39:34 +0000 (12:39 +0000)]
Merge "Remove "required" prefix from ABI fields."
Narayan Kamath [Wed, 30 Apr 2014 13:38:46 +0000 (14:38 +0100)]
Remove "required" prefix from ABI fields.
As per a comment on an earlier code review.
(cherry-picked from commit
a9d64733421d6765eab5c2730fa912f068e26047)
Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
Narayan Kamath [Thu, 15 May 2014 09:41:40 +0000 (09:41 +0000)]
am
c4c08803: Merge "app_process: change app_process a symlink of primary version"
* commit '
c4c08803a8cc090aa27720e97df342231e8433af':
app_process: change app_process a symlink of primary version
Narayan Kamath [Thu, 15 May 2014 09:36:27 +0000 (09:36 +0000)]
Merge "app_process: change app_process a symlink of primary version"
Digish Pandya [Mon, 12 May 2014 09:07:04 +0000 (14:37 +0530)]
Use alpha channel instead of red in drawCachedGlyphBitmap
the correct value to copy in bitmap is alpha component from
the cachebuffer. currently it is offset to red channel if format is
RGBA which is wrong.
this is followup fix for https://android-review.googlesource.com/#/c/93943/
Change-Id: I96b5ba35df5ccaef44caf2542d35d6585ba1df80
Signed-off-by: Digish Pandya <digishp@codeaurora.org>
Tina Zhang [Tue, 13 May 2014 08:30:54 +0000 (16:30 +0800)]
Enable display list updates with zero delta time
It's better not to cancel display lists updates. In the emulator, if we use
low precision clock source like refined-jiffies, the display list which
should be updated with a new frame, won't be updated due to the delta time
is 0 . And this makes all the hardware accelerated GUI out of order.
Change-Id: I41dba8965c96b6ad1b6d326ad1d6fa4a0a49173f
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Mathieu Chartier [Wed, 14 May 2014 23:52:02 +0000 (23:52 +0000)]
am
c4c77d63: Merge "Add property for background GC type"
* commit '
c4c77d63d889baca2abbdce6326077f0911b279e':
Add property for background GC type
Ian Rogers [Wed, 14 May 2014 23:51:59 +0000 (23:51 +0000)]
am
bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
* commit '
bcf76242134317a2f722eab5af2600fe2858f895':
Move FLATTENED_PATTERN to inner class.
Mathieu Chartier [Wed, 14 May 2014 23:07:39 +0000 (23:07 +0000)]
Merge "Add property for background GC type"
Mathieu Chartier [Wed, 14 May 2014 22:44:49 +0000 (15:44 -0700)]
Add property for background GC type
To disable background compaction do:
adb shell setprop dalvik.vm.backgroundgctype CMS
To enable:
adb shell setprop dalvik.vm.backgroundgctype SS
Change-Id: I1d87b95fceaedac4df5ce6e718d7c14b35d524cc
Ian Rogers [Wed, 14 May 2014 22:40:58 +0000 (22:40 +0000)]
Merge "Move FLATTENED_PATTERN to inner class."
Ian Rogers [Wed, 14 May 2014 22:29:35 +0000 (15:29 -0700)]
Move FLATTENED_PATTERN to inner class.
Avoid AOT compilation/initialization in ART failing due to regex.Pattern
requiring native support.
Bug:
14646037
Change-Id: I9d9c7fd9ed9fab7e21d37f9b31c00d037fc5a691
Yongqin Liu [Tue, 6 May 2014 15:30:40 +0000 (23:30 +0800)]
app_process: change app_process a symlink of primary version
Change app_process to be a symlink to the primary version
and have app_process32/app_process64 be the 32-bit/64-bit
versions respectively.
This will make it possible to use the primary zygote for
am/pm commands and other scripts that use app_process and
don't need a specific zygote.
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ibef545994eb95ddc82101c95df613ad1d06345e6
Torne (Richard Coles) [Wed, 14 May 2014 15:31:28 +0000 (15:31 +0000)]
am
41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '
41ec8c9672fccce90a7156bcd856f59a36e93ad3':
Avoid supported ABI list containing "unknown".
Torne (Richard Coles) [Wed, 14 May 2014 15:26:04 +0000 (15:26 +0000)]
Merge "Avoid supported ABI list containing "unknown"."
Torne (Richard Coles) [Wed, 14 May 2014 15:17:26 +0000 (16:17 +0100)]
Avoid supported ABI list containing "unknown".
If one of the ABI list system properties is undefined/empty (as
ro.product.cpu.abilist64 is on a 32-bit only device), getString returns
"unknown", which ends up creating a 1-element array with "unknown" as a
member. Fix this to instead just get the empty string and split that
into a 0-element array.
Change-Id: I0d0a54eb06bb04427bcf0487e2a16d4180b81116
Narayan Kamath [Tue, 13 May 2014 12:35:14 +0000 (13:35 +0100)]
Wait for secondary zygote before bringing up the system_server.
The zygote that's responsible for starting up the system server
now checks if there's another zygote on the system, and waits
for it to start up. Also, a few minor clean ups :
- Address a long standing TODO about zygote retries.
- Have functions throw IOException where appropriate and
wrap them in ZygoteStartFailedEx with a filled in cause.
bug:
14869939
Change-Id: I9e514659b79b3d2c98a4c5f93c0c376843f6c881
Brian Carlstrom [Tue, 13 May 2014 00:34:42 +0000 (00:34 +0000)]
am
b7d7cbc9: Merge "Fix background PackageUsage writing."
* commit '
b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a':
Fix background PackageUsage writing.
Brian Carlstrom [Tue, 13 May 2014 00:31:34 +0000 (00:31 +0000)]
Merge "Fix background PackageUsage writing."
Brian Carlstrom [Mon, 12 May 2014 23:56:34 +0000 (16:56 -0700)]
Fix background PackageUsage writing.
Change-Id: Ia358b61e648b427c86cf75ae096cd2a68ace209f
Jeff Sharkey [Sat, 10 May 2014 19:42:02 +0000 (19:42 +0000)]
am
e3e2c471: Merge "Set ActionMode title to the number of selected files"
* commit '
e3e2c471b2504335e99ed15975c3c5c9dfbf2795':
Set ActionMode title to the number of selected files
Jeff Sharkey [Sat, 10 May 2014 19:39:38 +0000 (19:39 +0000)]
Merge "Set ActionMode title to the number of selected files"
Chris Craik [Fri, 9 May 2014 21:46:43 +0000 (21:46 +0000)]
am
f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap"
* commit '
f6c9c4204c2f8f86277d081112c9dd863ddaa778':
Correct stride for drawing to cached glyph bitmap
Chris Craik [Fri, 9 May 2014 21:39:54 +0000 (21:39 +0000)]
Merge "Correct stride for drawing to cached glyph bitmap"
Brian Carlstrom [Fri, 9 May 2014 17:33:04 +0000 (17:33 +0000)]
am
b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
* commit '
b98ca5b0dd73f374178022b4a4b37412f01a3c03':
If PackageUsage information is missing, treat as first boot and compile everything
Brian Carlstrom [Fri, 9 May 2014 17:29:05 +0000 (17:29 +0000)]
Merge "If PackageUsage information is missing, treat as first boot and compile everything"
Brian Carlstrom [Fri, 9 May 2014 16:48:33 +0000 (09:48 -0700)]
If PackageUsage information is missing, treat as first boot and compile everything
Bug:
14663243
Change-Id: I0ae33882044211f777590f482e17e87596be4463
Digish Pandya [Fri, 9 May 2014 09:35:16 +0000 (15:05 +0530)]
Correct stride for drawing to cached glyph bitmap
fixes the glyph cachebuffer index to account for pixelbuffer
format size.
issue: in launcher home screen create icon group and rename the
group to some text string with emo-icons (smilies). without this
change the drop shadows for emo-icons will look bad.
Change-Id: I525a9219d35f4541363fd64e7fc5fd1053269725
Signed-off-by: Digish Pandya <digishp@codeaurora.org>
Chris Wren [Thu, 8 May 2014 21:03:04 +0000 (21:03 +0000)]
am
678f7edd: Merge "Avoid SystemUI crash due to NPE"
* commit '
678f7edd140f3914655bc600d207d3dcb986f881':
Avoid SystemUI crash due to NPE
Chris Wren [Thu, 8 May 2014 21:00:20 +0000 (21:00 +0000)]
Merge "Avoid SystemUI crash due to NPE"
Ying Wang [Thu, 8 May 2014 00:21:38 +0000 (00:21 +0000)]
am
3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '
3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
Remove unused LOCAL_LDLIBS.
Ying Wang [Thu, 8 May 2014 00:15:13 +0000 (00:15 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Wed, 7 May 2014 22:23:37 +0000 (15:23 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
yingying [Wed, 7 May 2014 09:12:25 +0000 (17:12 +0800)]
Init the static member when first used for CursorWindow.
As the CursorWindow will be preloaded by zygote, and there is one static
member need use the system resource to initialize. But actually the zygote
do not preload the resource now. (In fact, the zygote will preload classes
first, then preload the resource.) We need ensure the zygote to create the
system resource first.
So change to init this static member as -1, and it will be evaluated when
first used.
Change-Id: Ibccb84e3c410c73788ac682fe76b720306e81dc4
Brian Carlstrom [Wed, 7 May 2014 03:33:41 +0000 (03:33 +0000)]
am
a21ba5be: Merge "Add BackgroundDexOptService"
* commit '
a21ba5bec748e2f10d7e6d38181ec1124991cb60':
Add BackgroundDexOptService
Brian Carlstrom [Wed, 7 May 2014 03:33:37 +0000 (03:33 +0000)]
am
edb88bcd: Merge "Use package usage information to decide what dex files to optimize in PackageManagerService"
* commit '
edb88bcd232176e575f2dbee2cfdb1bfbe33faef':
Use package usage information to decide what dex files to optimize in PackageManagerService
Brian Carlstrom [Wed, 7 May 2014 03:29:27 +0000 (03:29 +0000)]
Merge "Add BackgroundDexOptService"
Brian Carlstrom [Wed, 7 May 2014 03:29:25 +0000 (03:29 +0000)]
Merge "Use package usage information to decide what dex files to optimize in PackageManagerService"
Jim Miller [Wed, 7 May 2014 00:34:38 +0000 (00:34 +0000)]
am
92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions."
* commit '
92ddac0457de85704b1f9b6d6fbfcaada56fe182':
Fix can't change airplane mode from GlobalActions.
Jim Miller [Wed, 7 May 2014 00:29:26 +0000 (00:29 +0000)]
Merge "Fix can't change airplane mode from GlobalActions."
Brian Carlstrom [Tue, 29 Apr 2014 05:11:01 +0000 (22:11 -0700)]
Add BackgroundDexOptService
Change-Id: I0439a04f693ba92df906cbda34f8e53b32f63329
Brian Carlstrom [Mon, 17 Mar 2014 22:21:35 +0000 (15:21 -0700)]
Use package usage information to decide what dex files to optimize in PackageManagerService
Change-Id: Iac137311e2e9d5139b5aa8651c6f3d296802612a
Elliott Hughes [Tue, 6 May 2014 02:27:44 +0000 (02:27 +0000)]
am
f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."
* commit '
f1f28d1d86aea6dd1419e94aadf051e433914680':
Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
Elliott Hughes [Tue, 6 May 2014 02:25:04 +0000 (02:25 +0000)]
Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."
Igor Viarheichyk [Fri, 2 May 2014 00:04:39 +0000 (17:04 -0700)]
Skip resource files for locales en-XA and ar-XB
during packaging if pseudolocalization was done automatically.
This prevents attemts to add same resource twice.
Change-Id: I51e17f961ac44047bf466ce4aa0d4d17f4ded0d6
Chris Craik [Mon, 5 May 2014 21:46:48 +0000 (21:46 +0000)]
am
a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail"
* commit '
a85db5ab785c59726c3644999801e48f449714f3':
libhwui: Handle the blurImage() implement once RS::init fail
Chris Craik [Mon, 5 May 2014 21:44:08 +0000 (21:44 +0000)]
Merge "libhwui: Handle the blurImage() implement once RS::init fail"
Michael Wright [Fri, 2 May 2014 19:16:16 +0000 (19:16 +0000)]
am
52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."
* commit '
52025796cd264fd8ba3851c8e42fd5508366456a':
Map KEY_APPSELECT to APP_SWITCH.
Michael Wright [Fri, 2 May 2014 19:12:15 +0000 (19:12 +0000)]
Merge "Map KEY_APPSELECT to APP_SWITCH."
Selim Gurun [Thu, 1 May 2014 22:57:45 +0000 (22:57 +0000)]
am
83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
* commit '
83a538e40ed8bdcda64c4bb5a448c0357b8e5e73':
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
Selim Gurun [Thu, 1 May 2014 22:53:01 +0000 (22:53 +0000)]
Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
Bo Liu [Thu, 1 May 2014 22:46:27 +0000 (15:46 -0700)]
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
Change-Id: I5a515c348c058264361ca9191f8fd7f0e6ff932b
Brian Carlstrom [Thu, 1 May 2014 21:41:58 +0000 (21:41 +0000)]
am
0f7c0570: Merge "Minor cleanup of UsageStatsService"
* commit '
0f7c0570e091a284481c2406d8275d87c3786c1d':
Minor cleanup of UsageStatsService
Brian Carlstrom [Thu, 1 May 2014 21:38:34 +0000 (21:38 +0000)]
Merge "Minor cleanup of UsageStatsService"
Brian Carlstrom [Mon, 10 Mar 2014 20:39:25 +0000 (13:39 -0700)]
Minor cleanup of UsageStatsService
Change-Id: Idea0e29f347d14e48e87aad38a261d0493bd5fd3
Wink Saville [Thu, 1 May 2014 17:57:51 +0000 (17:57 +0000)]
am
7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '
7e411f74efe6dd383e59634760cccd96da1c209b':
Add support for NETWORK_TYPE_GSM
Wink Saville [Thu, 1 May 2014 17:53:54 +0000 (17:53 +0000)]
Merge "Add support for NETWORK_TYPE_GSM"
Sandeep Kunta [Sat, 10 Aug 2013 15:25:38 +0000 (20:55 +0530)]
Add support for NETWORK_TYPE_GSM
Add support for NETWORK_TYPE_GSM in TelephonyManager and
corresponding mapping in ServicState.java so that when
application queries for getVoiceNetworkType() and currently
camped rat is GSM, they get network mode as GSM instead
of network mode unknown.
Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf
Marco Nelissen [Thu, 1 May 2014 15:28:14 +0000 (15:28 +0000)]
am
ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit '
ab3977d21161815c130bdedf21e2571382d208da':
MetadataRetriever: Check null pointer to avoid tombstone crash.
Marco Nelissen [Thu, 1 May 2014 15:25:13 +0000 (15:25 +0000)]
Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
Narayan Kamath [Thu, 1 May 2014 14:00:52 +0000 (14:00 +0000)]
am
1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '
1cec7f8539e6465ff80577169d7d07df3c2574b7':
Don't adjust ABI if PackageSetting#pkg is null.
Narayan Kamath [Thu, 1 May 2014 14:00:49 +0000 (14:00 +0000)]
am
27f2bfc4: Merge "Fix dex file pruning logic."
* commit '
27f2bfc406157039c5241f6a4f38f597b2076e2a':
Fix dex file pruning logic.
Narayan Kamath [Thu, 1 May 2014 14:00:46 +0000 (14:00 +0000)]
am
bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit '
bcc3b312b0662ae2f8b8444eaedd5f35fc75c411':
Adjust instruction sets for shared UID apps.
Narayan Kamath [Thu, 1 May 2014 14:00:43 +0000 (14:00 +0000)]
am
2a9a0471: Merge "Package manager changes for dual zygote stack."
* commit '
2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a':
Package manager changes for dual zygote stack.
Narayan Kamath [Thu, 1 May 2014 13:56:58 +0000 (13:56 +0000)]
Merge "Don't adjust ABI if PackageSetting#pkg is null."
Narayan Kamath [Thu, 1 May 2014 13:56:59 +0000 (13:56 +0000)]
am
645a920f: Merge "Fix OEM native library path bug."
* commit '
645a920fd2c478c545c6bb659f2eab36545fe116':
Fix OEM native library path bug.
Narayan Kamath [Thu, 1 May 2014 13:56:56 +0000 (13:56 +0000)]
am
986b901a: Merge "Fix native-lib dir assignment & updating"
* commit '
986b901ae280928e91193527f7c883b296fc62fc':
Fix native-lib dir assignment & updating
Narayan Kamath [Wed, 30 Apr 2014 12:33:38 +0000 (13:33 +0100)]
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
Narayan Kamath [Thu, 1 May 2014 13:56:34 +0000 (13:56 +0000)]
Merge "Fix dex file pruning logic."
Narayan Kamath [Tue, 29 Apr 2014 15:49:27 +0000 (16:49 +0100)]
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
Narayan Kamath [Thu, 1 May 2014 13:55:48 +0000 (13:55 +0000)]
Merge "Adjust instruction sets for shared UID apps."
Narayan Kamath [Mon, 28 Apr 2014 13:18:34 +0000 (14:18 +0100)]
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
Narayan Kamath [Thu, 1 May 2014 13:55:05 +0000 (13:55 +0000)]
Merge "Package manager changes for dual zygote stack."
Narayan Kamath [Thu, 1 May 2014 10:41:20 +0000 (11:41 +0100)]
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)
Narayan Kamath [Thu, 1 May 2014 13:53:08 +0000 (13:53 +0000)]
am
fde59428: Merge "Handle /oem and /vendor as well"
* commit '
fde594288bff0b8f95567e6b27f273f50f0c5f87':
Handle /oem and /vendor as well
Narayan Kamath [Thu, 1 May 2014 13:52:59 +0000 (13:52 +0000)]
am
d91358b2: Merge "Support per-package lib dirs for bundled apps"
* commit '
d91358b2b977ef7c3551a486f51475c0441aba6e':
Support per-package lib dirs for bundled apps
Narayan Kamath [Thu, 1 May 2014 13:52:55 +0000 (13:52 +0000)]
am
b916d8ad: Merge "Implement FileUtils#contains."
* commit '
b916d8adffd7ea3588bc178e1ee03f68f0a409e5':
Implement FileUtils#contains.