summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update makefile for clang host build.Tim Murray2014-07-171-2/+2
| | | | | | bug 16172793 Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
* Merge "[ActivityManager]: Update home process when home activity resumed"Craig Mautner2014-07-161-0/+8
|\
| * [ActivityManager]: Update home process when home activity resumedlouis_chang2014-07-161-0/+8
|/ | | | | | | | | | | | | | | | | | | Symptom: When switch between two home activities, the home process might not be updated to the correct one. In that case, the home activity might be killed easily. Root Cause: The home process is updated only when a home activity is newly created or being restarted. ActivityManager did not update the home process when simply resume a home activity. Solution: Update home process when home activity resumed Reproduce Steps: 1. Install a launcher application, such as Apex Launcher 2. Press home key to change to Apex Launcher by "Just once" option 3. Press home key to switch back to original home activity by "Just once" option. (The home process is still the Apex Launcher's process because ActivityManager does not update the home process when resuming the original home activity.) Change-Id: I046279ca7ba851a283ee67ea19202890f7b3f343
* Merge "[ActivityManager] Do not finish root activity when reset task"Craig Mautner2014-07-151-0/+4
|\
| * [ActivityManager] Do not finish root activity when reset tasklouis_chang2014-07-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Symptom: The root activity not always located at index 0 of the task. For example, the index 1 activity will become the new root when the original root activity (at index 0) finished. The new root activity might be finished unexpectedly before the original root activity actually destroyed. Solution: Check frontOfTask to avoid finishing the root activity unexpectedly Change-Id: I623ab97e9c95c83b3cfe7c9dfc151a291a391ea4
* | Merge "[ActivityManager] Move top task to top in window manager"Craig Mautner2014-07-151-1/+1
|\ \
| * | [ActivityManager] Move top task to top in window managerlouis_chang2014-07-161-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symptom: In certain situations, application starts activity while it is in background. When an existing background activity starts a new activity which results to be kept in the same background task, the new activity won't be resumed. In that case, the background task (sourceTask) should not be moved to top in window manager. Solution: Move top task of the target stack to top in window manager Change-Id: Id7a37ea67ce1f80e0c2b5399865c51fd7113deb8
* | Merge "Removed useless test"Narayan Kamath2014-07-161-5/+3
|\ \
| * | Removed useless testCuihtlauac ALVARADO2013-12-161-5/+3
| | | | | | | | | | | | Change-Id: I6269e4ca4ced5c9d2ef68522d26e94e419980c0a
* | | Merge "Add an internal API to get all asset locales."Narayan Kamath2014-07-161-9/+14
|\ \ \ | |_|/ |/| |
| * | Add an internal API to get all asset locales.Narayan Kamath2014-07-141-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | This will allow us to not copy paste this code verbatim into bundled apps. bug: 10090157 Change-Id: I008dc683ecbef2ad8b7a26968cb3cbda7e5a8388
* | | Merge "Optimize Blend composites."Deepanshu Gupta2014-07-141-147/+136
|\ \ \
| * | | Optimize Blend composites.Deepanshu Gupta2014-07-071-147/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed redundant array allocations to improve performance for various blending modes. Change-Id: Iaba1d6ff3ad03eebdc859c599b610cc593370438
* | | | Merge "Add BlendComposite.java"Deepanshu Gupta2014-07-141-0/+772
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Add BlendComposite.javaDeepanshu Gupta2014-07-071-0/+772
| | | | | | | | | | | | | | | | | | | | | | | | The class is adapted from a demo tool for Blending Modes written by Romain Guy (romainguy@android.com). The tool is available at http://www.curious-creature.org/2006/09/20/new-blendings-modes-for-java2d/ Change-Id: I8f7c7ca08d3078106056764a4e2f1ce95d990137
* | | Merge "Allow 3 letter language codes in InputMethodUtils."Narayan Kamath2014-07-101-4/+25
|\ \ \
| * | | Allow 3 letter language codes in InputMethodUtils.Narayan Kamath2014-07-141-4/+25
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace locale.substring(0, 2) with a function that always returns the first component of the locale (assumed to be the language). bug: 10090157 (cherry picked from commit cefc79c6b18bb2e824c299e7b9e212071e5ebc43) Change-Id: I56b02dd0c6dc222daa3ceade841a30879449bb4a
* | | Merge "Logging in LocalTransport on as default"Christopher Tate2014-07-101-1/+1
|\ \ \
| * | | Logging in LocalTransport on as defaultHenrik Baard2014-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logging is LocalTransport.java is enabled by default. Change default to false to remove logs, as this class states that it is only for debug. Change-Id: Iae63c7b62edbd503c606f0aee671a9579e78843d
* | | | Merge "GpsLocationProvider: look for config file in ↵Colin Cross2014-07-101-28/+53
|\ \ \ \ | | | | | | | | | | | | | | | /etc/gps.<ro.hardware.gps>.conf"
| * | | | GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.confColin Cross2014-05-221-28/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The property ro.hardware.gps can be specifid to allow a single system image to work with differrent GPS chips. The HAL layer will use it to load /system/lib/hw/gps.<ro.hardware.gps>.so. Add support to GpsLocationProvider to use the same property to find /etc/gps.<ro.hardware.gps>.conf, falling back to /etc/gps.conf if the property is not set or the file is not present. Change-Id: Ib285c4d28b0d0be5e038a1e61822edd8bc6d97d9
* | | | | Merge "Update copyFrom(BaseObj[]) for large objects."Stephen Hines2014-07-091-5/+12
|\ \ \ \ \
| * | | | | Update copyFrom(BaseObj[]) for large objects.Tim Murray2014-07-091-5/+12
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
* | | | | Merge "Switch frameworks/base/libs/androidfw to the new icu."Elliott Hughes2014-07-091-1/+0
|\ \ \ \ \
| * | | | | Switch frameworks/base/libs/androidfw to the new icu.Elliott Hughes2014-07-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97
* | | | | | Merge "Switch frameworks/base/core/jni to the new icu."Elliott Hughes2014-07-091-2/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Switch frameworks/base/core/jni to the new icu.Elliott Hughes2014-07-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9
* | | | | | Merge "Make misc config directory during user creation"Robin Lee2014-07-022-0/+8
|\ \ \ \ \ \
| * | | | | | Make misc config directory during user creationRobin Lee2014-06-102-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directories will appear in /data/misc/user/XX, readable only by applications within that user. Change-Id: I0adb14deb1a035abdbe51714356bd0c94ccf04c5
* | | | | | | Merge "Make dex2oat heap size product configurable [frameworks/base]"Brian Carlstrom2014-07-082-202/+192
|\ \ \ \ \ \ \
| * | | | | | | Make dex2oat heap size product configurable [frameworks/base]Brian Carlstrom2014-07-082-202/+192
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15919420 Change-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006
* | | | | | | Merge "Adds support for multi-input kernels to Frameworks/Base/RS."Stephen Hines2014-07-078-10/+173
|\ \ \ \ \ \ \
| * | | | | | | Adds support for multi-input kernels to Frameworks/Base/RS.Chris Wailes2014-07-078-10/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added a new JNI call to pass arrays of Allocations to the RS runtime. * Added a new version of ForEach that takes an array of Allocations. * Added some casts to disambiguate existing calls to forEach. Change-Id: I46d2834c37075b2a2407fd8b010546818a4540d1
* | | | | | | | Merge "Add Telefonica/Movistar specific APN details for dun"Robert Greenwalt2014-07-071-0/+40
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add Telefonica/Movistar specific APN details for dunAlbert2014-07-081-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Movistar Spain needs to add a specific APN to offer tethering in their devices. Change-Id: I5554ff98a5ac4c5f33b9af0083e1fac8305c9e13 Signed-off-by: Albert <alberto.crespell@gmail.com>
* | | | | | | | Merge "[ActivityManager] Prevent potential deadlock from system error dialog ↵Craig Mautner2014-07-051-5/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | and InputMethodManager."
| * | | | | | | | [ActivityManager] Prevent potential deadlock from system error dialog and ↵riddle_hsu2014-07-081-5/+10
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputMethodManager. Sympton: When application crash in a special timing and system server's InputMethodManager is binding, deadlock may occur. Root Cause: Thread(1): When using InputMethodManager in system server, it will lock mH(handler) of InputMethodManager, and sometimes it will call to InputMethodManagerService::showCurrentInputLocked and will call bindService at some condition, then it will also lock ActivityManagerService. Thread(2): When an application crashed, it will lock ActivityManager when showing crash dialog, inside the dialog, it will call setEnabled of Button and lock mH of InputMethodManager.setEnable of TextView will lock IMM's handler. So the deadlock happened as the flow: (2) lock AMS -> (1)lock mH -> (2)wait mH -> (1) wait AMS Solution: Reduce nested lock of error dialog: post message to let (2) lock mH after release AMS lock. Change-Id: Id85c29406236db3b5fca9655fde1fcaf0afd1337
* | | | | | | | Merge "Remove"Brian Carlstrom2014-07-074-165/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | RemoveBrian Carlstrom2014-07-074-165/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9881203920c8445e9a4bdd9e4a90ba0014f34c5e) Change-Id: Ib40823b7c03af4c71da902b0e5c504e074cf0dd9
* | | | | | | | Merge "[ActivityManager] Avoid keeping restarting home when only home ↵Craig Mautner2014-07-021-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | activity exists."
| * | | | | | | | [ActivityManager] Avoid keeping restarting home when only home activity exists.riddle_hsu2014-07-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Root Cause: When there is only home activity existed, updating home apk will call forceStopPackageLocked to finish the activity. Then activity history becomes empty, then home will be launched, but its package is still target to close that results a loop. Solution: If home activity has been force-stopped, do not stop the same home activity again. Change-Id: Icff12028d407873c2e6f50a06bcad231b908ccbd
* | | | | | | | | Merge "[ActivityManager] Prevent kill a restarted process again."Craig Mautner2014-07-061-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ActivityManager] Prevent kill a restarted process again.riddle_hsu2014-07-041-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Root Cause: Use removeTask with flag ActivityManager.REMOVE_TASK_KILL_PROCESS will set waitingToKill = "remove task" to the target process when its setSchedGroup is not BG_NONINTERACTIVE. Later the target process may be killed when applying oom-adj due to setSchedGroup has changed to BG_NONINTERACTIVE. If the process is needed to restart, the process record will be resued. Then the restarted process may be killed again because its waitingToKill is not null. Solution: Clean waitingToKill when process is dead. Change-Id: I5ffb5388127f4221da4c700d3f1c224f7ca6e7b2
* | | | | | | | | Merge "[ActivityManager] Ensure alive process is not killedByAm."Craig Mautner2014-07-021-0/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | [ActivityManager] Ensure alive process is not killedByAm.riddle_hsu2014-07-041-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symptom: Unable to kill by Am again and will be skipped updating its oom adj. Root Cause: A restarted process will reuse original process record. The flag killedByAm will keep previous state. Solution: Reset the flag killedByAm to false when the process is started. Note: Found another similiar patch If95137d91939cc44882ad2813131bcde0edd0c1b Change-Id: I59a86648ca8d0aed4c489d92751af120aae5ef90
* | | | | | | | Merge "Fix issue when converting fil->tl."Narayan Kamath2014-07-041-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix issue when converting fil->tl.Narayan Kamath2014-07-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should call ResourceTable::getLocales directly, and not AssetManager::getLocales. The latter will convert "tl" to "fil" so we'll end up thinking we have resources for "fil" when we don't really have any. bug: 15873165 Change-Id: I9753e4608aaecede328a40ee1f3ee6b016d0dedc
* | | | | | | | | Merge "Typo in method name: Clone"Nick Kralevich2014-07-022-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Typo in method name: CloneYou Kim2013-08-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2aa8fc2797278216fbc23dd0d94feb1a9bf8a5d6
* | | | | | | | | | Merge "Fix typo in the exception message."Nick Kralevich2014-07-021-1/+1
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-14 14:21:56 +0000