summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-06Merge "Skip resource files for locales en-XA and ar-XB during packaging if ↵idea133-weekly-releaseElliott Hughes
pseudolocalization was done automatically. This prevents attemts to add same resource twice."
2014-05-05Skip resource files for locales en-XA and ar-XBIgor Viarheichyk
during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice. Change-Id: I51e17f961ac44047bf466ce4aa0d4d17f4ded0d6
2014-05-05Merge "libhwui: Handle the blurImage() implement once RS::init fail"Chris Craik
2014-05-02Merge "Map KEY_APPSELECT to APP_SWITCH."Michael Wright
2014-05-01Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"Selim Gurun
2014-05-01DO NOT MERGE Add DrawGlInfo kModeProcessNoContextBo Liu
Change-Id: I5a515c348c058264361ca9191f8fd7f0e6ff932b
2014-05-01Merge "Minor cleanup of UsageStatsService"Brian Carlstrom
2014-05-01Minor cleanup of UsageStatsServiceBrian Carlstrom
Change-Id: Idea0e29f347d14e48e87aad38a261d0493bd5fd3
2014-05-01Merge "Add support for NETWORK_TYPE_GSM"Wink Saville
2014-05-01Add support for NETWORK_TYPE_GSMSandeep Kunta
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-01Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."Marco Nelissen
2014-05-01Merge "Don't adjust ABI if PackageSetting#pkg is null."Narayan Kamath
2014-05-01Don't adjust ABI if PackageSetting#pkg is null.Narayan Kamath
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-01Merge "Fix dex file pruning logic."Narayan Kamath
2014-05-01Fix dex file pruning logic.Narayan Kamath
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-01Merge "Adjust instruction sets for shared UID apps."Narayan Kamath
2014-05-01Adjust instruction sets for shared UID apps.Narayan Kamath
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-01Merge "Package manager changes for dual zygote stack."Narayan Kamath
2014-05-01Package manager changes for dual zygote stack.Narayan Kamath
- 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-01Merge "Fix OEM native library path bug."Narayan Kamath
2014-05-01Fix OEM native library path bug.Jeff Sharkey
Bug: 13340779 (cherry picked from commit 7d3328d14bbbee01a9de1ff5b13b0446c709d835) Change-Id: I1b4c5d138cafe3651d475ca1e048f495ff6c5f10
2014-05-01Merge "Fix native-lib dir assignment & updating"Narayan Kamath
2014-05-01Fix native-lib dir assignment & updatingChristopher Tate
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-01Merge "Handle /oem and /vendor as well"Narayan Kamath
2014-05-01Handle /oem and /vendor as wellChristopher Tate
Bug 13170859 (cherry-picked from commit 740888f62eae158d5775be716620f0d56d87f587) Change-Id: I7b5e206697fcbec146cac6cd83fca5c583a8cbd7
2014-05-01Merge "Support per-package lib dirs for bundled apps"Narayan Kamath
2014-05-01Support per-package lib dirs for bundled appsNarayan Kamath
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-01Merge "Implement FileUtils#contains."Narayan Kamath
2014-05-01Implement FileUtils#contains.Narayan Kamath
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-01Merge "Fix x86 build in app_process."Narayan Kamath
2014-05-01Merge "Create arch specific cache dirs during zygote startup."Narayan Kamath
2014-05-01Fix x86 build in app_process.Narayan Kamath
Look for __i386__ and not __x86__. (cherry picked from commit 47d526217b3fd0d17ba751c66d25cfaf1c6ed7cd) Change-Id: I848ba351c378e59ab6744ca1983ae4463ae75ba4
2014-05-01Create arch specific cache dirs during zygote startup.Narayan Kamath
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-01Merge "Fix broken logging in Zygote.cpp."Narayan Kamath
2014-05-01Fix broken logging in Zygote.cpp.Narayan Kamath
- 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-01Map KEY_APPSELECT to APP_SWITCH.Olivier Gay
Change-Id: Iec801f2edfec9923aac088cb66663f64d62b3df6 Signed-off-by: Olivier Gay <ogay@logitech.com> Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
2014-04-30Merge "Fixes issue causing pseudolocalization of strings in non-translatable ↵Elliott Hughes
resource files."
2014-04-30Merge "WallpaperManager: add NULL pointer check for ↵Michael Wright
getCropAndSetWallpaperIntent"
2014-04-30Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes
2014-04-30Fixes issue causing pseudolocalization of stringsIgor Viarheichyk
in non-translatable resource files. Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376
2014-04-30Merge "Cast CallVoidMethod's size_t parameters to jint"Narayan Kamath
2014-04-30Merge "Freeing frame map"Narayan Kamath
2014-04-30Freeing frame mapMykola Kondratenko
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-30WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntentAllen Shen
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-30Merge "NULL previous background bitmap upon changing wallpaper"Michael Wright
2014-04-30Merge "Add missing character combinations for international layouts"Michael Wright
2014-04-29Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"Michael Wright
2014-04-29Merge "Set NO_NEW_PRIVS on zygote init"Nick Kralevich
2014-04-29Set NO_NEW_PRIVS on zygote initNick Kralevich
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-29Merge "DO NOT MERGE Add invokeFunctor stub"Selim Gurun