summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix 3GPP SMS send failure for 7-bit national language tables.Jake Hamby2011-11-143-11/+52
| | | | | | | | | | | Fix a NullPointerException when sending a single-part SMS containing characters in one of the enabled national language tables. Also added a few log messages for several error cases to help with debugging any future problems in the SMS dispatcher. Bug: 5553544 Change-Id: I61c1cbe297b2e222027f0db7c833df6a03c2974a
* fix for build breakage.Tsu Chiang Chuang2011-11-141-2/+2
| | | | Change-Id: Ie324e46a79923813edd2e5e0c34ede79e6ee3eea
* Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0Danielle Millett2011-11-141-15/+14
|\
| * DO NOT MERGE cherry picking from MR0 cl 148223Danielle Millett2011-11-141-15/+14
| | | | | | | | | | | | | | | | | | | | Showing a congratulations screen after choosing face unlock backup lock Once a backup lock has been chosen, it sends an intent to show a congratulations screen. The moveTempGallery function has been moved inside this new activity so it is no longer needed in LockPatternUtils. Change-Id: I66868e6e3391b8b740f618fe633047ce388f55ca
* | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-11-147-22/+22
|\ \
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-147-22/+22
| | | | | | | | | | | | Change-Id: I287b6b70df6795513fc1fc98d2fddaf310042e98
* | | Merge "Adding mobile microbenchmark tests." into ics-mr0Tsu Chiang Chuang2011-11-142-19/+117
|\ \ \ | |_|/ |/| |
| * | Adding mobile microbenchmark tests.Tsu Chiang Chuang2011-11-102-19/+117
| | | | | | | | | | | | Change-Id: Ifcd67b0265045778965aeff8e213c3929da02c3d
* | | Merge "Docs: update state list drawable with state_activated and revise ↵Scott Main2011-11-111-6/+16
|\ \ \ | | | | | | | | | | | | selected/focused" into ics-mr0
| * | | Docs: update state list drawable with state_activated and revise ↵Scott Main2011-11-111-6/+16
| | |/ | |/| | | | | | | | | | | | | selected/focused Change-Id: I6bd919fc71a74fc8135ed333c93d187e0d9e9d80
* | | Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were not passing the length of the UTF-16 string to String16::setTo. As a result, it was copying the contents of the text up to the first null it found. First problem, these strings are not typically null terminated! Second problem, if the string contained a null character, then we might truncate it. However, we only truncated the string when the copy constructor was invoked (say, when we called get() on the cache) but not in internalTextCopy() (before adding the key to the cache). As a result of the second problem, we would first search the cache for a key that matched a partially copied truncated string (potentially reading uninitialized memory that followed it). Finding none, we would add the entry to the cache using the correct key. If the cache already had a value associated with the correct key, then the put would fail, returning false. Charging ever onwards, we would add the size of the entry to the cache size. Proceeding in this manner, it was possible for the cache to believe it had less remaining space than it really did. At that point, it was possible for the cache to evict all entries and yet still not think it had room to add a new one, so it would continue trying to make space indefinitely. Bug: 5576812 Change-Id: I05251594f6b2da0a5dc09f7200f04fe9100ec766
* | | Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to ↵Adam Powell2011-11-112-2/+7
|\ \ \ | | | | | | | | | | | | open an overflow menu under invalid circumstances." into ics-mr0
| * | | DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open anAdam Powell2011-11-112-2/+7
| |/ / | | | | | | | | | | | | | | | overflow menu under invalid circumstances. Change-Id: Ifb847b914b880ffb21dd5fc6efa833f46466f224
* | | docs: fix typoRobert Ly2011-11-111-1/+1
| | | | | | | | | | | | Change-Id: I86ebd8bced2ca133fc6faff43c2e69205f0c9862
* | | Merge "docs: ndk r7 rel notes" into ics-mr0Robert Ly2011-11-112-10/+316
|\ \ \ | |/ / |/| |
| * | docs: ndk r7 rel notesRobert Ly2011-11-032-10/+316
| | | | | | | | | | | | Change-Id: Ifbbaa6d1105281db7b1dbab720b19882e3295583
* | | Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0Svetoslav Ganov2011-11-111-1/+2
|\ \ \
| * | | PopupWindow dismiss() can get into a recursive loop.Svetoslav Ganov2011-11-101-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The dismiss method in a PopupWindow is first removing the popup View from the WindowManager and then if the content View differs from the popup View the former is removed from the latter. Then dismiss() clears the dismissed flag so a subsequent call to dismiss() is a NOP. However, removing a View both from the WindowManager and from its parent ViewGroup triggers stuff wich may lead to a subsequent call to dismiss(). This leads to a stack overflow exception. bug:5598944 Change-Id: I2aeeda591be3e9aa98fec1ee17ea8f0e746e6992
* | | DO NOT MERGE. Fix leak in LayoutTransitionChet Haase2011-11-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutTransition was making an incorrect assumption that there could only be one transition animation on a child of a transitioning container. But if multiple children are added/removed to/from that container, there would be multiple calls to set up changing animations for each existing child of that container. This meant that the child would have multiple, new OnLayoutChangeListeners added to it as part of the setup process. Meanwhile, we would cache only the latest listener in a hashmap that used the child as a key for the listener. Then when we cleaned up the hashmap later, we would remove only the latest listener from the child, leaving the rest there for eternity. The fix is to skip the setup entirely for children that already have listeners set on them; they must, if that's the case, already have been set up and are already listening for layout changes. Setting up the animation is redundant, and adding another listener is a leak. issue #5588509: memory leak in systemui Change-Id: Ie2192593d84702be7243c18760dfdb3a027b761c
* | | Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0Jamie Gennis2011-11-101-4/+9
|\ \ \
| * | | SystemUI: Disable HW acceleration for status barJamie Gennis2011-11-091-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change switches the status bar rendering to use CPU rendering to an RGB_565 window. Change-Id: I45c03989efc9cc9ea71ff169fafedf048de9d612
* | | | Doc change: new Calendar content provider docKatie McCormick2011-11-105-2/+3233
| |/ / |/| | | | | | | | Change-Id: I9493b6b0cd17ddf8fda07c32aed9b4fa2b8c1489
* | | Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0Wink Saville2011-11-101-3/+9
|\ \ \
| * | | [maguro] Update COMPREHENSION-TLV parser in CATWink Saville2011-11-091-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix the ClassCastException while handling spec out 'Setup menu' -Ghana MTN simcard and JDI simcard sends abnormal 'setup menu'cmd. -Those 'setup menu' is spec out. -At the end of the proactive cmd,extra bytes '0x00 0x00 0x00 0x00' is followed. - That cause ClassCastException and phone crash. Bug: 5574160 Change-Id: Ieafb6c4efd94bb4e2a39a04612a6761c958654bb Signed-off-by: dujin.cha <dujin.cha@samsung.com>
* | | | Merge "Actually 59 fps DO NOT MERGE" into ics-mr0Dave Burke2011-11-091-1/+1
|\ \ \ \
| * | | | Actually 59 fps DO NOT MERGEDave Burke2011-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic70dbba81c054eaaf21f71b10e329ebf1424d4a2
* | | | | Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0Wink Saville2011-11-091-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.Wink Saville2011-11-091-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially set to 3 minutes this raised the standby current by 12.5% so changing to 6 minutes. Bug: 5534004 Change-Id: I602f5fe4de35d0db2dbacf0c615c300c57dd2d0d
* | | | Set the WM refresh rate to 60 Hz for tuna devices only DOMathias Agopian2011-11-093-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE This approach is TEMPORARY until we can do this properly. Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f
* | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-11-095-33/+33
|\ \ \ \
| * | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-085-33/+33
| | | | | | | | | | | | | | | | | | | | Change-Id: I46ccb7f02a64e3e6c7597b0dc295450b4f5625e6
* | | | | Merge "docs: update samples toc for rs sample" into ics-mr0Robert Ly2011-11-091-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | docs: update samples toc for rs sampleRobert Ly2011-11-021-1/+1
| | |_|/ | |/| | | | | | | | | | Change-Id: I88216069bc8d6123d031098fad8bf4ed99686bb9
* | | | Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" ↵David Brown2011-11-082-49/+244
|\ \ \ \ | | | | | | | | | | | | | | | into ics-mr0
| * | | | Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()David Brown2011-11-082-49/+244
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phone app needs a way to distinguish between (a) numbers that are definitely emergency numbers, and (b) numbers that *might* result in an emergency call being dialed, but aren't specifically emergency numbers themselves. (The phone app needs this distinction in order to enforce the restriction that 3rd party apps should not be allowed to make emergency calls using the ACTION_CALL intent, while still making sure that the in-call UI only displays the "emergency call" state for numbers that are *definitely* emergency numbers. See bug 5493790 for the full details;) So this change adds a full set of "isPotentialEmergencyNumber()" methods to go along with the "isEmergencyNumber()" methods we've had all along. The "potential" variants behave identically to the original methods, *except* that they ultimately use number.startsWith() rather than number.equals() when comparing against the list of emergency numbers. TESTED: - Unit test 'PhoneNumberUtilsTest#testIsEmergencyNumber' passes. (The PhoneNumberUtilsTest class doesn't pass in its entirety, but it was broken before this change also.) - Also see the commit description of change Ib949fea3c0ce6b341a90e617a03ba3f22c69018b for the exact tests I ran against the phone app. This change should be submitted along with Change-Id: Ib949fea3c0ce6b341a90e617a03ba3f22c69018b in apps/Phone (but this change must go in first to avoid breaking the build.) Bug: 5493790 Change-Id: Ic528cfcc555734cdaf4ca8a18a50199771ba49b1
* | | | Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0Glenn Kasten2011-11-081-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Bug 5478024 drop after decode if can't drop beforeGlenn Kasten2011-11-041-1/+1
| | | | | | | | | | | | | | | | Change-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371
* | | | Merge "Fix exception when sending multi-page SMS with Turkish characters." ↵Jake Hamby2011-11-083-11/+137
|\ \ \ \ | | | | | | | | | | | | | | | into ics-mr0
| * | | | Fix exception when sending multi-page SMS with Turkish characters.bi4004.lee2011-11-073-11/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Precondition: config_sms_enabled_single_shift_tables is configured as 1 (Turkish) in frameworks/base/core/res/res/values/config.xml - Cause: There is no consideration for National Language Shift Tables in SmsMessage::fragmentText function. - Solution: The header length is calculated properly according to National Language Shift Table - modified to add test cases and fix calculation bug (jhamby@google.com) Bug: 5553544 Change-Id: I9eaefbbd6b3d75f8c41cbf9d0cb03a701cfa1cb3
* | | | | Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0Brian Colonna2011-11-081-27/+27
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix 5514230: preventing null window token from occurringBrian Colonna2011-11-071-27/+27
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the lockscreen view is recreated even though it has already been created (and therefore Face Unlock is already running). One example of this is when the lockscreen momentarily displays in landscape mode and then corrects itself into portrait mode. When lockscreen recreates itself, it removes the view and then later re-adds the view. During that time the window token is null and may be passed to Face Unlock when it tries to restart. The reason this doesn't happen *every* time the view is recreated is because the onServiceConnected() callback starts Face Unlock, and usually it runs after the view is re-added, but sometimes it runs before the view is re-added, resulting in this bug. An earlier fix put null-token checking inside of the Face Unlock service, which prevented crashing but Face Unlock was still unable to run. This fix makes the null token case not happen so Face Unlock can run every time. It accomplishes this by simply not restarting Face Unlock until the view has been re-added. This fix also replaces checking two flags everywhere to see if Face Unlock is being used and instead uses a single function call. Change-Id: Ib46f25f2a58ab2e70470337861c25ee81a858873
* | | | Make upstream tether list threadsafeRobert Greenwalt2011-11-071-131/+172
| |/ / |/| | | | | | | | | | | | | | | | | | | | Outsiders asking for this list may cause the list to change on another thread. Fixing general synchronization issues. bug:5531630 Change-Id: I7a3ee0bba3db40f45bcb0159491942fa4cf38c37
* | | Merge "Print out memory info when we get into a low memory situation." into ↵Dianne Hackborn2011-11-051-9/+69
|\ \ \ | | | | | | | | | | | | ics-mr0
| * | | Print out memory info when we get into a low memory situation.Dianne Hackborn2011-11-041-9/+69
| |/ / | | | | | | | | | Change-Id: I2c8b8847a0f38135d8bf9ff9b7198517c3b0262e
* | | Fix a leak in Parcel::writeBlob.Jeff Brown2011-11-042-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was mistakenly assuming that Parcel::writeFileDescriptor took ownership of the fd that was passed in. It does not! Added some comments and a default parameter to allow the caller to specify whether it wishes the Parcel to take ownership. Bug: 5563374 Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
* | | Merge "Start using IP tool for advanced routing." into ics-mr0Robert Greenwalt2011-11-044-52/+120
|\ \ \
| * | | Start using IP tool for advanced routing.Robert Greenwalt2011-11-044-52/+120
| | | | | | | | | | | | | | | | | | | | | | | | bug:5495862 bug:5396842 Change-Id: I5e31b352b14a4dc746cacce4d61cf8d9ad7382a0
* | | | Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ↵Dianne Hackborn2011-11-043-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | ics-mr0
| * | | | DO NOT MERGE. Integrate: Include showmap output in bug report.Dianne Hackborn2011-11-043-0/+14
| | |/ / | |/| | | | | | | | | | Change-Id: I51265eb248b7eba360f0758fa9eb8a01821f108a
* | | | Frame rate to 48 fpsDave Burke2011-11-041-1/+6
|/ / / | | | | | | | | | Change-Id: I95645b3921db22dfeca97ad2743299ccda5de83b