summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move FLATTENED_PATTERN to inner class.Ian Rogers2014-05-141-2/+14
| | | | | | | | | Avoid AOT compilation/initialization in ART failing due to regex.Pattern requiring native support. Bug: 14646037 Change-Id: I9d9c7fd9ed9fab7e21d37f9b31c00d037fc5a691
* Merge "Set ActionMode title to the number of selected files"Jeff Sharkey2014-05-101-0/+2
|\
| * Set ActionMode title to the number of selected filesStefan Wysocki2014-04-281-0/+2
| | | | | | | | | | | | | | After change of orientation ActionMode is recreated without previously set title. It needs to be updated in onCreateActionMode callback. Change-Id: If5f36e8ad6d1b5cf04ed242611fd037969d73517
* | Merge "Correct stride for drawing to cached glyph bitmap"Chris Craik2014-05-091-5/+15
|\ \
| * | Correct stride for drawing to cached glyph bitmapDigish Pandya2014-05-091-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge "If PackageUsage information is missing, treat as first boot and ↵Brian Carlstrom2014-05-091-1/+8
|\ \ \ | |/ / |/| | | | | compile everything"
| * | If PackageUsage information is missing, treat as first boot and compile ↵Brian Carlstrom2014-05-091-1/+8
|/ / | | | | | | | | | | | | everything Bug: 14663243 Change-Id: I0ae33882044211f777590f482e17e87596be4463
* | Merge "Avoid SystemUI crash due to NPE"Chris Wren2014-05-081-0/+3
|\ \
| * | Avoid SystemUI crash due to NPERaju Yadav2014-03-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BaseStatusBar.createNotificationViews() returns null when it reports handleNotificationError(), leading to a forced crash of the misbehaving app. However, it should not add a null object of Notification.Entry since it will also crash SystemUI (crashing at compare). Change-Id: I86678c8024e931420b0fbab1f36b330e7e75d581
* | | Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-083-5/+0
|\ \ \
| * | | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-073-5/+0
|/ / / | | | | | | | | | Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
* | | Merge "Add BackgroundDexOptService"Brian Carlstrom2014-05-074-2/+183
|\ \ \
| * | | Add BackgroundDexOptServiceBrian Carlstrom2014-05-064-2/+183
| | | | | | | | | | | | | | | | Change-Id: I0439a04f693ba92df906cbda34f8e53b32f63329
* | | | Merge "Use package usage information to decide what dex files to optimize in ↵Brian Carlstrom2014-05-074-76/+284
|\ \ \ \ | |/ / / | | | | | | | | PackageManagerService"
| * | | Use package usage information to decide what dex files to optimize in ↵Brian Carlstrom2014-05-064-76/+284
| | | | | | | | | | | | | | | | | | | | | | | | PackageManagerService Change-Id: Iac137311e2e9d5139b5aa8651c6f3d296802612a
* | | | Merge "Fix can't change airplane mode from GlobalActions."Jim Miller2014-05-070-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Fix can't change airplane mode from GlobalActions.Eiichi Ohnishi2014-02-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A PhoneStateListener is registered in the constructor of GlobalActions which, on rare occasions, leads to a callback being received immediately. In these cases because mHasTelephony has not been initialized, airplane mode is not refreshed in the callback which disables the option to set airplane mode from GlobalActions. To fix this issue mHasTelephony has to be set before registering the listener. Change-Id: If117a879d3244414b369a1711bf46526b7a5ae24
* | | | Merge "Skip resource files for locales en-XA and ar-XB during packaging if ↵Elliott Hughes2014-05-061-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | pseudolocalization was done automatically. This prevents attemts to add same resource twice."
| * | | | Skip resource files for locales en-XA and ar-XBIgor Viarheichyk2014-05-051-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice. Change-Id: I51e17f961ac44047bf466ce4aa0d4d17f4ded0d6
* | | | | Merge "libhwui: Handle the blurImage() implement once RS::init fail"Chris Craik2014-05-051-20/+24
|\ \ \ \ \
| * | | | | libhwui: Handle the blurImage() implement once RS::init failLu, Shenghua2014-04-251-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the RS::init failed, go through the original single thread path, this will avoid blocking the main thread(ANR), but we also should have some implement in RenderScript component. Change-Id: I3a21395ffd5bc144c15254893f425b1dd2643ba4 Signed-off-by: Shenghua Lu <shenghua.lu@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com>
* | | | | | Merge "Map KEY_APPSELECT to APP_SWITCH."Michael Wright2014-05-021-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Map KEY_APPSELECT to APP_SWITCH.Olivier Gay2014-05-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec801f2edfec9923aac088cb66663f64d62b3df6 Signed-off-by: Olivier Gay <ogay@logitech.com> Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
* | | | | | Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"Selim Gurun2014-05-011-1/+2
|\ \ \ \ \ \
| * | | | | | DO NOT MERGE Add DrawGlInfo kModeProcessNoContextBo Liu2014-05-011-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I5a515c348c058264361ca9191f8fd7f0e6ff932b
* | | | | | Merge "Minor cleanup of UsageStatsService"Brian Carlstrom2014-05-011-130/+132
|\ \ \ \ \ \
| * | | | | | Minor cleanup of UsageStatsServiceBrian Carlstrom2014-05-011-130/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idea0e29f347d14e48e87aad38a261d0493bd5fd3
* | | | | | | Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add support for NETWORK_TYPE_GSMSandeep Kunta2014-05-012-0/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."Marco Nelissen2014-05-011-0/+7
|\ \ \ \ \ \
| * | | | | | MetadataRetriever: Check null pointer to avoid tombstone crash.wang, biao2014-04-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the app's vm-heap is not enough, memory allocation for big object like bitmap may failed. This patch add protection for bitmap creating to avoid segment fault error in the following GetIntField function. Change-Id: I63977dc602f4ed395afd11004a0ed027173fb685 Signed-off-by: wang, biao <biao.wang@intel.com> Signed-off-by: TingX Li <tingx.li@intel.com> Signed-off-by: Wang LiangX <liangx.wang@intel.com>
* | | | | | | Merge "Don't adjust ABI if PackageSetting#pkg is null."Narayan Kamath2014-05-011-6/+7
|\ \ \ \ \ \ \
| * | | | | | | Don't adjust ABI if PackageSetting#pkg is null.Narayan Kamath2014-05-011-6/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Fix dex file pruning logic."Narayan Kamath2014-05-011-18/+32
|\ \ \ \ \ \ \
| * | | | | | | Fix dex file pruning logic.Narayan Kamath2014-05-011-18/+32
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Adjust instruction sets for shared UID apps."Narayan Kamath2014-05-012-0/+66
|\ \ \ \ \ \ \
| * | | | | | | Adjust instruction sets for shared UID apps.Narayan Kamath2014-05-012-0/+66
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Package manager changes for dual zygote stack."Narayan Kamath2014-05-014-109/+278
|\ \ \ \ \ \ \
| * | | | | | | Package manager changes for dual zygote stack.Narayan Kamath2014-05-014-109/+278
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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)
* | | | | | | Merge "Fix OEM native library path bug."Narayan Kamath2014-05-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix OEM native library path bug.Jeff Sharkey2014-05-011-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13340779 (cherry picked from commit 7d3328d14bbbee01a9de1ff5b13b0446c709d835) Change-Id: I1b4c5d138cafe3651d475ca1e048f495ff6c5f10
* | | | | | | Merge "Fix native-lib dir assignment & updating"Narayan Kamath2014-05-011-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix native-lib dir assignment & updatingChristopher Tate2014-05-011-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Handle /oem and /vendor as well"Narayan Kamath2014-05-012-15/+68
|\ \ \ \ \ \ \
| * | | | | | | Handle /oem and /vendor as wellChristopher Tate2014-05-012-15/+68
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 13170859 (cherry-picked from commit 740888f62eae158d5775be716620f0d56d87f587) Change-Id: I7b5e206697fcbec146cac6cd83fca5c583a8cbd7
* | | | | | | Merge "Support per-package lib dirs for bundled apps"Narayan Kamath2014-05-011-3/+29
|\ \ \ \ \ \ \
| * | | | | | | Support per-package lib dirs for bundled appsNarayan Kamath2014-05-011-3/+29
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Implement FileUtils#contains."Narayan Kamath2014-05-011-0/+22
|\ \ \ \ \ \ \
| * | | | | | | Implement FileUtils#contains.Narayan Kamath2014-05-011-0/+22
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial cherry-pick of changes 4ca728c0 and 21de56a9, which can't be cherry-picked due to their large surface area. Change-Id: Ife46e150d360cd5241dea93863141749233c1805
* | | | | | | Merge "Fix x86 build in app_process."Narayan Kamath2014-05-011-1/+1
|\ \ \ \ \ \ \