120195 Commits

Author SHA1 Message Date
Chris Wren
90abb78b51 am 678f7edd: Merge "Avoid SystemUI crash due to NPE"
* commit '678f7edd140f3914655bc600d207d3dcb986f881':
  Avoid SystemUI crash due to NPE
2014-05-08 21:03:04 +00:00
Chris Wren
678f7edd14 Merge "Avoid SystemUI crash due to NPE" 2014-05-08 21:00:21 +00:00
Ying Wang
4463cbc61d am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
  Remove unused LOCAL_LDLIBS.
2014-05-08 00:21:38 +00:00
Ying Wang
3b9600b673 Merge "Remove unused LOCAL_LDLIBS." 2014-05-08 00:15:14 +00:00
Ying Wang
b38e3fdf5a Remove unused LOCAL_LDLIBS.
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
2014-05-07 15:23:37 -07:00
yingying
1ec4f36060 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
2014-05-07 23:00:28 +08:00
Brian Carlstrom
691079ddc0 am a21ba5be: Merge "Add BackgroundDexOptService"
* commit 'a21ba5bec748e2f10d7e6d38181ec1124991cb60':
  Add BackgroundDexOptService
2014-05-07 03:33:41 +00:00
Brian Carlstrom
f2db00fdcd 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
2014-05-07 03:33:37 +00:00
Brian Carlstrom
a21ba5bec7 Merge "Add BackgroundDexOptService" 2014-05-07 03:29:28 +00:00
Brian Carlstrom
edb88bcd23 Merge "Use package usage information to decide what dex files to optimize in PackageManagerService" 2014-05-07 03:29:25 +00:00
Jim Miller
cc6b9eb23c am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions."
* commit '92ddac0457de85704b1f9b6d6fbfcaada56fe182':
  Fix can't change airplane mode from GlobalActions.
2014-05-07 00:34:38 +00:00
Jim Miller
92ddac0457 Merge "Fix can't change airplane mode from GlobalActions." 2014-05-07 00:29:26 +00:00
Brian Carlstrom
7395a8ab8a Add BackgroundDexOptService
Change-Id: I0439a04f693ba92df906cbda34f8e53b32f63329
2014-05-06 15:14:29 -07:00
Brian Carlstrom
ff1ec4d9e7 Use package usage information to decide what dex files to optimize in PackageManagerService
Change-Id: Iac137311e2e9d5139b5aa8651c6f3d296802612a
2014-05-06 15:06:25 -07:00
Elliott Hughes
b593ad6068 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.
2014-05-06 02:27:44 +00:00
Elliott Hughes
f1f28d1d86 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." 2014-05-06 02:25:05 +00:00
Igor Viarheichyk
47843df11f 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
2014-05-05 18:13:41 -07:00
Chris Craik
5d8343b8e2 am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail"
* commit 'a85db5ab785c59726c3644999801e48f449714f3':
  libhwui: Handle the blurImage() implement once RS::init fail
2014-05-05 21:46:48 +00:00
Chris Craik
a85db5ab78 Merge "libhwui: Handle the blurImage() implement once RS::init fail" 2014-05-05 21:44:08 +00:00
Michael Wright
09446329b1 am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."
* commit '52025796cd264fd8ba3851c8e42fd5508366456a':
  Map KEY_APPSELECT to APP_SWITCH.
2014-05-02 19:16:16 +00:00
Michael Wright
52025796cd Merge "Map KEY_APPSELECT to APP_SWITCH." 2014-05-02 19:12:15 +00:00
Selim Gurun
e1a561620d am 83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
* commit '83a538e40ed8bdcda64c4bb5a448c0357b8e5e73':
  DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
2014-05-01 22:57:45 +00:00
Selim Gurun
83a538e40e Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext" 2014-05-01 22:53:01 +00:00
Bo Liu
61a7f61007 DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
Change-Id: I5a515c348c058264361ca9191f8fd7f0e6ff932b
2014-05-01 15:51:41 -07:00
Brian Carlstrom
e3cceef7ec am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
* commit '0f7c0570e091a284481c2406d8275d87c3786c1d':
  Minor cleanup of UsageStatsService
2014-05-01 21:41:58 +00:00
Brian Carlstrom
0f7c0570e0 Merge "Minor cleanup of UsageStatsService" 2014-05-01 21:38:34 +00:00
Brian Carlstrom
393fbe71f8 Minor cleanup of UsageStatsService
Change-Id: Idea0e29f347d14e48e87aad38a261d0493bd5fd3
2014-05-01 14:12:14 -07:00
Wink Saville
74ec580873 am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '7e411f74efe6dd383e59634760cccd96da1c209b':
  Add support for NETWORK_TYPE_GSM
2014-05-01 17:57:51 +00:00
Wink Saville
7e411f74ef Merge "Add support for NETWORK_TYPE_GSM" 2014-05-01 17:53:55 +00:00
Sandeep Kunta
10731a6140 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
2014-05-01 17:53:42 +00:00
Marco Nelissen
ab962b54e3 am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit 'ab3977d21161815c130bdedf21e2571382d208da':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
2014-05-01 15:28:14 +00:00
Marco Nelissen
ab3977d211 Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 2014-05-01 15:25:13 +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
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