summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use libcorkscrew for stack unwinding.Jeff Brown2011-10-223-272/+63
| | | | Change-Id: Iee1ee5a2018ab8cfc1ce12ec2a124809245eaa02
* Merge "Add support for SMS-PP data download to USIM."Jake Hamby2011-10-2114-59/+1191
|\
| * Add support for SMS-PP data download to USIM.Jake Hamby2011-10-2114-59/+1191
| | | | | | | | | | | | | | | | | | Devices supporting IMS may receive SMS-PP data download messages which are normally handled in the radio baseband. Add support to framework for these messages, passing the data to the UICC and sending the response data as part of the SMS ACK. Change-Id: I1da76982c6f8c402f82a6f535591e614f4e0de18
* | am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection ↵Peter Ng2011-10-210-0/+0
|\ \ | | | | | | | | | | | | | | | | | | increased" into ics-mr0 * commit 'be25d5b05639c8475b7faf312959923db86efa5d': Do not merge - Recents background protection increased
| * \ Merge "Do not merge - Recents background protection increased" into ics-mr0Peter Ng2011-10-212-6/+6
| |\ \
| | * | Do not merge - Recents background protection increasedPeter Ng2011-10-212-6/+6
| | | | | | | | | | | | | | | | Change-Id: I45719b44102c088c82b619c717db3df31930c1b3
* | | | Merge "Fix rebuildWebTextView issues"John Reck2011-10-212-12/+18
|\ \ \ \
| * | | | Fix rebuildWebTextView issuesJohn Reck2011-10-212-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5488135 Cherry pick from MR0 Change-Id: I2df047b6de42dbe716008f69d720fa5fad3fe19d
* | | | | Merge "Fix software GL renderer."Xavier Ducrohet2011-10-211-1/+1
|\ \ \ \ \
| * | | | | Fix software GL renderer.Xavier Ducrohet2011-10-211-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: I07ab2709fa694e41aa3fcc5b9dfc809f55853ab4
* | | | | am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed ↵Mathias Agopian2011-10-212-2/+23
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | from a hwc thread" into ics-mr0 * commit 'aa938c8d9c0e71c9b556657cb33794210ce6ebf8': mDirtyRegion is single threaded, but could be accessed from a hwc thread
| * | | | Merge "mDirtyRegion is single threaded, but could be accessed from a hwc ↵Mathias Agopian2011-10-212-2/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | thread" into ics-mr0
| | * | | | mDirtyRegion is single threaded, but could be accessed from a hwc threadMathias Agopian2011-10-212-2/+23
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have mInvalidateRegion which holds the region to invalidate, it can be set from any thread as long as mInvalidateLock is held. We use fine-grained locking here because mInvalidateRegion can be set from anywhere, in particular frmo HWC callbacks. Bug: 5466774 Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
* | | | | am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '148d5bd855e4872bbe99870b0019462bcf73b72c': Import revised translations. DO NOT MERGE
| * | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-2143-310/+262
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2143-310/+262
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia333fa4ab1d72588e9c9ae4a9ef069eccdc9b485
* | | | | Merge "Recents background protection increased"Daniel Shiplacoff2011-10-212-6/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Recents background protection increasedPeter Ng2011-10-212-6/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I45719b44102c088c82b619c717db3df31930c1b3
* | | | | am 8bf89f30: (-s ours) Fix the buildJohn Reck2011-10-210-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78': Fix the build
| * | | | Fix the buildJohn Reck2011-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I822f75b3ed29e7817c7bd9ac5e2314b43831d2c1
* | | | | am e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS ↵Adam Cohen2011-10-211-39/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | improvement on Prime" into ics-mr0 * commit 'e3bb0ecb2b36964cb3b02bc0d575e9366818ee00': Removing fades on last item in StackView for major FPS improvement on Prime
| * | | | Merge "Removing fades on last item in StackView for major FPS improvement on ↵Adam Cohen2011-10-211-39/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Prime" into ics-mr0
| | * | | | Removing fades on last item in StackView for major FPS improvement on PrimeAdam Cohen2011-10-211-39/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I479eb129e80a6087ab55d1de7eed0222d6dacdf6
* | | | | | am 2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0John Reck2011-10-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '2dd2e5b4eb95280bb18717c1a31ca8db40a6413b': Fix rebuildWebTextView issues DO NOT MERGE Fixed spell check failing to change word.
| * | | | | Merge changes I2df047b6,I791eeb3c into ics-mr0John Reck2011-10-212-31/+52
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix rebuildWebTextView issues DO NOT MERGE Fixed spell check failing to change word.
| | * | | | | Fix rebuildWebTextView issuesJohn Reck2011-10-212-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5488135 Change-Id: I2df047b6de42dbe716008f69d720fa5fad3fe19d
| | * | | | | DO NOT MERGE Fixed spell check failing to change word.George Mount2011-10-211-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5387838 On WebView.rebuildWebTextView, setTextAndKeepSelection was being called, erasing the selections. Changed it so that when text is replaced with the exact same value, no replace is done. Also, on the Google search, when a spelling change was made, the final character was placed improperly. When a single character is added, the javascript events for the character are sent. When multiple characters are changed, the entire value is replaced with no javascript key events sent. Change-Id: I791eeb3c96354cfe3cbfda7e8d05c81fcdeb152f
* | | | | | | am 943da7b8: Merge "Fix issue #5342788: Setting wallpaper from gallery set ↵Dianne Hackborn2011-10-211-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default..." into ics-mr0 * commit '943da7b895b7cc69cdaed7979cff422a7dbaac19': Fix issue #5342788: Setting wallpaper from gallery set default...
| * | | | | | Merge "Fix issue #5342788: Setting wallpaper from gallery set default..." ↵Dianne Hackborn2011-10-211-3/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | into ics-mr0
| | * | | | | Fix issue #5342788: Setting wallpaper from gallery set default...Dianne Hackborn2011-10-211-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...wallpaper first time IRK81. We were monitoring for file creates when those are not needed, and receiving the initial file create was causing us to be confused. Change-Id: Iccd3b7492c82895dba87f25c4881c538f300d342
* | | | | | | am f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0Dirk Dougherty2011-10-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f1ed59bcebfd3042aead8d91ee47eca38af543c6': Doc change: fix typo in platform highlights.
| * | | | | | Merge "Doc change: fix typo in platform highlights." into ics-mr0Dirk Dougherty2011-10-211-1/+1
| |\ \ \ \ \ \
| | * | | | | | Doc change: fix typo in platform highlights.Dirk Dougherty2011-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6df4128c79705f97f029ba7ed13c0ae3d5807f18
* | | | | | | | am 53a1b82c: Merge "Last update for screenshot animations for MR0. (Bug: ↵Winson Chung2011-10-219-66/+99
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5333706)" into ics-mr0 * commit '53a1b82c9a2133c5c3184898335fce0826279691': Last update for screenshot animations for MR0. (Bug: 5333706)
| * | | | | | | Merge "Last update for screenshot animations for MR0. (Bug: 5333706)" into ↵Winson Chung2011-10-219-66/+99
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | ics-mr0
| | * | | | | | Last update for screenshot animations for MR0. (Bug: 5333706)Winson Chung2011-10-209-66/+99
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also adding proper border asset Change-Id: I423389d1a68498b2e470e6d483f5b7542a814c31
* | | | | | | am 4bbd71a6: Merge "Fix issue #5228934: IME shows up on boot, or when digits ↵Dianne Hackborn2011-10-211-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen is tapped" into ics-mr0 * commit '4bbd71a6b2f4957f4778da13861ec03d30afbee7': Fix issue #5228934: IME shows up on boot, or when digits screen is tapped
| * | | | | | Merge "Fix issue #5228934: IME shows up on boot, or when digits screen is ↵Dianne Hackborn2011-10-211-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | tapped" into ics-mr0
| | * | | | | | Fix issue #5228934: IME shows up on boot, or when digits screen is tappedDianne Hackborn2011-10-201-0/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activity aliases weren't propagating the softInputMode from the original activity. Change-Id: I47534e6c9a0f94bb6eb3fd2186ba9ffc8d583d08
* | | | | | | am 6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" ↵Mike Lockwood2011-10-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '6b6bfb187412e4845c89d866eff0b87b6d0a5541': PowerManagerService: Enable light sensor debug output
| * | | | | | Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0Mike Lockwood2011-10-211-1/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | PowerManagerService: Enable light sensor debug outputMike Lockwood2011-10-211-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5426212 Change-Id: I46ca01eee8d69f7bd6fc63e53506ba42c3fe537d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am 0499f90a: Merge "Bug 5428541: Check that span is still in text before ↵Gilles Debunne2011-10-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleting" into ics-mr0 * commit '0499f90a2d2774f28ca3d430dfe563391669c515': Bug 5428541: Check that span is still in text before deleting
| * | | | | Merge "Bug 5428541: Check that span is still in text before deleting" into ↵Gilles Debunne2011-10-211-6/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ics-mr0
| | * | | | | Bug 5428541: Check that span is still in text before deletingGilles Debunne2011-10-201-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick in MR0 of CL 141388 from master. Bug 5488537 In case the span has been removed from the text since the popup was showed, the delete action is a no-op. Change-Id: Iec2aeaf03becd82ad44715d5c08bfaa8f62aa3fe
* | | | | | | am 4e7ce935: (-s ours) Merge "Import revised translations." into ics-mr0Eric Fischer2011-10-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | * commit '4e7ce9352b9c3a832715ac4b8014b2434a447172': Import revised translations.
| * | | | | Merge "Import revised translations." into ics-mr0Eric Fischer2011-10-2145-581/+302
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Import revised translations.Eric Fischer2011-10-2045-581/+302
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35861d5a5797cfe400d6e831d245f93263ca3df2
* | | | | | Merge "Sharpening text edit assets"Peter Ng2011-10-2117-0/+0
|\ \ \ \ \ \
| * | | | | | Sharpening text edit assetsPeter Ng2011-10-2017-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I72db9a1c8981169f3bea50bd3e72fadcc682cfe7