summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Revert "libstagefright: Fix MPEG4 timestamp"Pawit Pornkitprasan2012-06-251-21/+18
| | | | | | | | | | | | | | | A lot of applications (e.g. QuickTime, mkvmerge) apparently does not like the 64-bit timestamp and will fail to open the file. This reverts commit 893586d4b7a0dbea070404323837ef4f0a7c9b79
* | | Merge "framework: customizable kill app via back key timeout" into icsDaniel Hillenbrand2012-06-242-1/+8
|\ \ \
| * | | framework: customizable kill app via back key timeoutDaniel Bateman2012-06-232-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows the time it takes for the back key to kill an app to be customized via overlay. Change-Id: Iaa43f81ee448ae7a7663254a830011a0bca5e60f
* | | | Smdk4210Ril: fix bad file formatcodeworkx2012-06-241-649/+648
|/ / / | | | | | | | | | Change-Id: I26a48a1422060a19c76fbc83af95ae7649442bf0
* | | Merge "Fixes to ensure keyboard backlight is lit when the keyboard is ↵Steve Kondik2012-06-241-9/+9
|\ \ \ | | | | | | | | | | | | visible." into ics
| * | | Fixes to ensure keyboard backlight is lit when the keyboard is visible.Mike Kasick2012-06-211-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Ignore mKeyboardVisible in PowerManagerService::applyKeyboardState if KEYBOARD_BRIGHT_BIT is already set in mPowerState. Previously, if the keyboard were to hide after setting mPowerState, but before running applyKeyboardState, then the keyboard backlight would remain off at the next slide event since mPowerState is unchanged. - Always set mLightSensorKeyboardBrightness in PowerManagerService::lightSensorChangedLocked to a sensor-based value, instead of 0 when the keyboard is hidden. This ensures mLightSensorKeyboardBrightness is sensible on slide events since it may not be recomputed timely.
* | | | Merge "frameworks/base: Updated Turkish translations" into icsSteve Kondik2012-06-241-2/+4
|\ \ \ \
| * | | | frameworks/base: Updated Turkish translationsAndroid Meda2012-06-211-2/+4
| |/ / / | | | | | | | | | | | | Change-Id: Ib8390a8815a97ffdbacd2c11af9c70c59180ea61
* | | | Merge "Update Russian Translation-CM9" into icsSteve Kondik2012-06-241-0/+6
|\ \ \ \
| * | | | Update Russian Translation-CM9pvolkov2012-06-181-0/+6
| | |_|/ | |/| |
* | | | Merge "frameworks_base - Updated Italian translation" into icsSteve Kondik2012-06-241-0/+2
|\ \ \ \
| * | | | frameworks_base - Updated Italian translationFrancesco2012-06-171-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4c19918a1f5f7e793d402aae23694b181f5766a5
* | | | | Merge "frameworks_base - Updated Italian translation" into icsSteve Kondik2012-06-241-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | frameworks_base - Updated Italian translationFrancesco2012-06-171-0/+5
| |/ / / | | | | | | | | | | | | Change-Id: I579c0bf3a43d5e348c08cae96f13a4683f41d7ab
* | | | Merge "SearchWidget: passing APP_DATA to voice intent" into icsSteve Kondik2012-06-241-0/+3
|\ \ \ \
| * | | | SearchWidget: passing APP_DATA to voice intentJorge Ruesga2012-06-171-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SearchView uses SearchManager.APP_DATA to pass data between the origin activity and the search activity. This works for text searches (keyboard), but it's not implemented by voice recognition searches. The method createVoiceAppSearchIntent initializes a empty bundle that is filled with the QUERY parameter. This patch adds the SearchManager.APP_DATA parameter if is present, let the search activity access to the data passed by the origin activity Change-Id: Ie88d32578d0a9dd01c464098a636a61397e89926
* | | | Merge "Add multiple UUID tags to profile (1/2 Frameworks)" into icsSteve Kondik2012-06-242-2/+81
|\ \ \ \
| * | | | Add multiple UUID tags to profile (1/2 Frameworks)Felix Bechstein2012-06-132-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding multiple UUID tags to a profile allows us to share a single NFC tag across multiple devices. NFC tag writing works as before. NFC tag reading is expanded to check the UUID and the UUID tags of a profile. When reading unknown profiles, the user is asked to attach the tag to an exising profile. The NFC tag itself stays untouched. Patch Set 1: * initial commit Patch Set 2: * rebase * remove getProfileByTag() and use getProfile() * rename tag to secondary uuid Patch Set 3: * rename "tag" leftovers Change-Id: I284f8a823ced48d3b88ce3b3a1e83152cb145d2d
* | | | | telephony: allow to specify on and off values for setting additional audioparamscodeworkx2012-06-222-6/+19
| | | | | | | | | | | | | | | | | | | | Change-Id: I574c0315f0cadc65b064aa621e0f35160a369b2d
* | | | | LGEQualcommUiccRIL: Fix signalstrength on pre-ICS radio librariesRicardo Cerqueira2012-06-221-1/+15
| |_|/ / |/| | | | | | | | | | | | | | | And datacall parameters, too Change-Id: Ifc6f959044622bab2e7198ad15ce6f56dde370f7
* | | | Merge "Long-press back kill app cleanup" into icsDaniel Hillenbrand2012-06-192-7/+7
|\ \ \ \
| * | | | Long-press back kill app cleanupnebkat2012-06-142-7/+7
| | |/ / | |/| | | | | | | | | | Change-Id: Ida791dca1fbfdc2beccf6ff727b67df56f1956a4
* | | | Change background selection for lockscreen to be moreisimobile2012-06-141-4/+26
|/ / / | | | | | | | | | | | | | | | consistant on Tablets (2/2) Change-Id: Ia1a703ce213fa7698a2fb8e1679eefccd521962b
* | | Merge "Status Bar Brightness Control Padding" into icsSteve Kondik2012-06-141-1/+12
|\ \ \
| * | | Status Bar Brightness Control Paddingnebkat2012-06-131-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a padding to the brightness control on both sides to make it easier to reach the min/max brightness. Change-Id: Ia42444321f82aaac97c0c442796dec551b1bcd65
* | | | Merge "LockscreenTarget : Switch to dp from px for insets" into icsSteve Kondik2012-06-143-14/+5
|\ \ \ \
| * | | | LockscreenTarget : Switch to dp from px for insetsDanesh Mondegarian2012-06-123-14/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | Related to : http://review.cyanogenmod.com/#/c/17561/1 Change-Id: Iace302f95cc73fa18bb6348d7739123f5529a41e
* | | | Merge "Fix long click intent for Wimax notification pulldown / power widget" ↵Steve Kondik2012-06-141-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | into ics
| * | | | Fix long click intent for Wimax notification pulldown / power widgetRobert Burns2012-06-101-1/+2
| |/ / / | | | | | | | | | | | | Change-Id: Ibc2ea21b136aa390a371fa997c07c7dae7d83676
* | | | Merge "PT-BR: Added missing translations" into icsSteve Kondik2012-06-142-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | PT-BR: Added missing translationsGustavo2012-06-102-1/+6
| |/ / | | | | | | | | | Change-Id: Id9fb3dff7c3353d88013508e9dd573d17cf3e9fb
* | | Merge "telephony: Smdk4210RIL: clean up processUnsolicited" into icsDaniel Hillenbrand2012-06-131-364/+21
|\ \ \
| * | | telephony: Smdk4210RIL: clean up processUnsolicitedEthan Chen2012-05-311-364/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove full overload of processUnsolicited and have it work with the requests unknown by the RIL superclass. Pass everything else upwards, unmodified. Change-Id: I129120995c17b45c17dd50b77f281de352c20ae2
* | | | finnish: weather translations and some other fixescodeworkx2012-06-131-2/+52
| | | | | | | | | | | | | | | | Change-Id: I02f8e5e4a80b5fad999140cd65ae9e745e13c028
* | | | Merge "bootanimation: performance enhancements" into icsSteve Kondik2012-06-132-4/+54
|\ \ \ \
| * | | | bootanimation: performance enhancementsEmilio López2012-06-132-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements two simple performance enhancements, which might benefit devices. They are completely opt-in by setting the following variables. * TARGET_BOOTANIMATION_PRELOAD: will preload the bootanimation zip to memory; this is handy on devices where the storage might be slow. By preloading it, we get quick access to the zip file, and the animation doesn't stutter. * TARGET_BOOTANIMATION_TEXTURE_CACHE: allows maintainers to force texture cache on/off. Also fixes the sign warnings related to int / size_t comparison Change-Id: Ie92d1b0aa90b43ba39c368a2a33657a60c3a64b5
* | | | | Update Spanish translationAlfredo2012-06-121-0/+2
|/ / / / | | | | | | | | | | | | Change-Id: Icf47a486a800f22c0fa837603f718d2893539e97
* | | | Merge "Update Russian Translation-Some fixes-CM9" into icsDanny Baumann2012-06-121-1/+1
|\ \ \ \
| * | | | Update Russian Translation-Some fixes-CM9pvolkov2012-06-101-1/+1
| | |/ / | |/| |
* | | | Merge "Missing hungarian translation (Lock screen Weather - error messages)" ↵Danny Baumann2012-06-121-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | into ics
| * | | | Missing hungarian translation (Lock screen Weather - error messages)syman2012-06-101-0/+3
| |/ / / | | | | | | | | | | | | Change-Id: I7b6b3b93f66285f45db2752c7bde1385d87ec416
* | | | Previous fix was incorrect.Cuong2012-06-101-1/+11
|/ / / | | | | | | | | | | | | | | | | | | Timestamp doesn't contain date info, therefore we need to construct it and adjust it if daylight savings applies. Change-Id: I931ff0f2ba93ab8172f2cbc69926aba1eab2778a
* | | Merge "telephony: support for setting add. audioparams for incall audio" ↵codeworkx2012-06-102-0/+18
|\ \ \ | | | | | | | | | | | | into ics
| * | | telephony: support for setting add. audioparams for incall audiocodeworkx2012-06-092-0/+18
| | | | | | | | | | | | | | | | Change-Id: Ic6f72fba542e1421631826d9bcd86340064c942b
* | | | Merge "ipconfig.txt: fix a possible error in parsing" into icsSteve Kondik2012-06-101-0/+4
|\ \ \ \
| * | | | ipconfig.txt: fix a possible error in parsingTanguy Pruvot2012-06-091-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The format of /data/misc/wifi/ipconfig.txt is this one <version> <netA_key1><netA_value1><netA_key2><netA_value2>...<EOS> <netB_key1><netB_value1><netB_key2><netB_value2>...<EOS> On the defy, i had an error on boot regarding a missing "id" in NetworkStats, so i compared on another device... It appears that defy one format was : <version><EOS> <netA_key1><netA_value1><netA_key2><netA_value2>...<EOS> I dont know exactly what caused this format error, maybe because the quota and usage stats are enabled on it. Change-Id: I4cf70fe88688341b8eea007a08910acb6f4fcff7
* | | | Merge "Update Russian Translation-Weather-No data-CM9" into icsSteve Kondik2012-06-101-0/+2
|\ \ \ \
| * | | | Update Russian Translation-Weather-No data-CM9pvolkov2012-06-091-0/+2
| | | | |
* | | | | Merge "Input: Fix some Applications ANR issue in monkey test" into icsSteve Kondik2012-06-101-16/+23
|\ \ \ \ \
| * | | | | Input: Fix some Applications ANR issue in monkey testZhenghua Wang2012-06-031-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue Description: When do monkey test on some applications, there is big probability get ANR issue. one example is as following: adb shell monkey -p com.google.android.street -v 500000 Root Cause: situation 1. InputDispatcher Thread calls findTouchedWindowTargetsLocked routine, there is a AMOTION_EVENT_ACTION_DOWN event and it can find a splittable touched window for this event , then mTouchState.split set to true. situation 2. WMS Thread calls setInputWindows routine and all TouchedWindows associated with mTouchState are removed , mTouchState.split status still keep true. situation 3. InputDispatcher Thread calls findTouchedWindowTargetsLocked routine, there is a AMOTION_EVENT_ACTION_POINTER_DOWN event and it can find found touched window, exit window loop in following code : if (windowInfo->visible) { if (! (flags & InputWindowInfo::FLAG_NOT_TOUCHABLE)) { isTouchModal = (flags & (InputWindowInfo::FLAG_NOT_FOCUSABLE | InputWindowInfo::FLAG_NOT_TOUCH_MODAL)) == 0; if (isTouchModal || windowInfo->touchableRegionContainsPoint(x, y)) { if (! screenWasOff || (flags & InputWindowInfo::FLAG_TOUCHABLE_WHEN_WAKING)) { newTouchedWindowHandle = windowHandle; } break; // found touched window, exit window loop } } situation 4. The following code will have problem after situation 3 in below conditions: newTouchedWindowHandle doesn't support split , isSplit is true ( last time touched window is splittable ) mTempTouchState.getFirstForegroundWindowHandle will always return NULL due to situation 2 // Figure out whether splitting will be allowed for this window. if (newTouchedWindowHandle != NULL && newTouchedWindowHandle->getInfo()->supportsSplitTouch()) { // New window supports splitting. isSplit = true; } else if (isSplit) { // New window does not support splitting but we have already split events. // Assign the pointer to the first foreground window we find. // (May be NULL which is why we put this code block before the next check.) newTouchedWindowHandle = mTempTouchState.getFirstForegroundWindowHandle(); } The window says it does not want to support splitting, so the touches should go to one of the previously split windows except that there are none, which result to "goto Unresponsive" in findtouchedWindowTargetsLocked routine. This is not the correct behavior because the user did actually touch something. situation 5. InputDispatcher Thread will call dispatchOnce repeated to try to dispatch this AMOTION_EVENT_ACTION_POINTER_DOWN event, then ANR timeout ( 5000ms ) will be exceeded after several times "goto Unresponsive"in findtouchedWindowTargetsLocked routine. Solution: In situation 4 we should drop the touch. If the newly touched window was splittable then we wouldn't drop the touch. It's only when the newly touched window was not splittable where we will drop the touch. Change-Id: Iab2c06ce0597ac77eb886ccd9d84646c86723bdb Author: Jeffrey Brown <jeffbrown@android.com> Author: Erjun Ding <erjunx.ding@intel.com> Author: Zhenghua Wang <zhenghua.wang@intel.com> Author: Jack Ren <jack.ren@intel.com> Author: Bruce Beare <bruce.j.beare@intel.com> Conflicts: services/input/InputDispatcher.cpp