summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 5525a43a: am 639b25ea: Merge "docs: add NOTICE to action bar icon pack ↵Roman Nurik2012-01-273-3/+37
|\ | | | | | | | | | | | | and sprinkle download links" into ics-mr1 * commit '5525a43a9c814faba22adfafc6517fb64259966f': docs: add NOTICE to action bar icon pack and sprinkle download links
| * am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle ↵Roman Nurik2012-01-263-3/+37
| |\ | | | | | | | | | | | | | | | | | | download links" into ics-mr1 * commit '639b25ea289481da6cfd4229649b51ffc6ce3406': docs: add NOTICE to action bar icon pack and sprinkle download links
| | * Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" ↵Roman Nurik2012-01-263-3/+37
| | |\ | | | | | | | | | | | | into ics-mr1
| | | * docs: add NOTICE to action bar icon pack and sprinkle download linksRoman Nurik2012-01-263-3/+37
| | | | | | | | | | | | | | | | Change-Id: I1437ce64908c28621e86fff54767ddbd2b1fcb3a
* | | | am 9d9c7189: am 00b3ceb4: Merge "docs: Update designing-navigation training ↵Roman Nurik2012-01-275-9/+56
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | class to link to Android Design" into ics-mr1 * commit '9d9c718925e8ec189ba4615f93c2fe8e7d0ab23d': docs: Update designing-navigation training class to link to Android Design
| * | | am 00b3ceb4: Merge "docs: Update designing-navigation training class to link ↵Roman Nurik2012-01-265-9/+56
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | to Android Design" into ics-mr1 * commit '00b3ceb48b5e23daa8101db6080bee46d6518f43': docs: Update designing-navigation training class to link to Android Design
| | * | Merge "docs: Update designing-navigation training class to link to Android ↵Roman Nurik2012-01-265-9/+56
| | |\ \ | | | |/ | | |/| | | | | Design" into ics-mr1
| | | * docs: Update designing-navigation training class to link to Android DesignRoman Nurik2012-01-265-9/+56
| | | | | | | | | | | | | | | | Change-Id: I1cdda032f31798f9a32b7bec583dcfaa6eafb8c2
* | | | Fix 5906830: Don't crash on lock screens that lack a clock.Jim Miller2012-01-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash seen in SIM unlock screen where the layout doesn't have a clock to update. Change-Id: Ic1473b60f6d32f3feae9e7aa4510f6e435fa9a73
* | | | Merge "Fix 5906830: Update the clock earlier when lock screen comes back ↵Jim Miller2012-01-272-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | from suspend."
| * | | | Fix 5906830: Update the clock earlier when lock screen comes back from suspend.Jim Miller2012-01-272-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attempts to fix an issue where sometimes the time shown on lock screen was really old. The code now sets the time immediately when the screen turns on. Change-Id: Ic4649ea342499aea82f997ba488bc2cb45987739
* | | | | Merge "Improve watchdog monitor for InputReader and InputDispatcher."Jeff Brown2012-01-274-3/+16
|\ \ \ \ \
| * | | | | Improve watchdog monitor for InputReader and InputDispatcher.Jeff Brown2012-01-274-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try harder to test for liveness. There are situations where the lock might not be held but the input system is stuck in a callback into the window manager policy that has hung. Bug: 5094994 Change-Id: Iff88655512a5dc8bbb4615be65f4115e975c020b
* | | | | | Merge "Implement a cancelation mechanism for queries."Jeff Brown2012-01-2730-202/+1156
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Implement a cancelation mechanism for queries.Jeff Brown2012-01-2730-202/+1156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new API to enable cancelation of SQLite and content provider queries by means of a CancelationSignal object. The application creates a CancelationSignal object and passes it as an argument to the query. The cancelation signal can then be used to cancel the query while it is executing. If the cancelation signal is raised before the query is executed, then it is immediately terminated. Change-Id: If2c76e9a7e56ea5e98768b6d4f225f0a1ca61c61
* | | | | | Use final on new member variablesGlenn Kasten2012-01-2713-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use final for member fields initialized to a new and that are never modified. Change-Id: I042352c7bc21879613e7a50b1205b6923f8083cf
* | | | | | Merge "Bug 5567648 Request and abandon audio focus in calls"Jean-Michel Trivi2012-01-271-10/+29
|\ \ \ \ \ \
| * | | | | | Bug 5567648 Request and abandon audio focus in callsJean-Michel Trivi2012-01-271-10/+29
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to now, audio focus was implicitly requested and abandoned when changing the audio mode. This is no longer the case so the behavior with regards to audio focus can be indepently set by the CallManager. The logic implemented here is the same as the one previously used in AudioService: - only request audio focus when the ring volume index is > 0 when ringing, - request focus before setting the audio mode to a mode other than normal - abandon audio focus after setting the audio mode to normal Change-Id: Ia543dc779563dbff09414771fee60e589dfaab9d
* | | | | | Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"Fabrice Di Meglio2012-01-276-206/+174
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHEFabrice Di Meglio2012-01-276-206/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - also clean some destructors (was not quite compulsory because they are related to some Singletons) Change-Id: I3091cac7b38628cda593d72570ba7a5d7ea2a15c
* | | | | | Merge "Bug 5567648 disassociate audio mode and audio focus"Jean-Michel Trivi2012-01-272-40/+40
|\ \ \ \ \ \
| * | | | | | Bug 5567648 disassociate audio mode and audio focusJean-Michel Trivi2012-01-272-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't automatically change the audio focus when the audio mode changes. This is best handled by the applications that change the audio mode so they can address their usecases as they please (for instance to define the behavior when switching calls). Replaced the implicit "mode to focus" behavior with two methods to request and abandon audio focus. These methods are only to be used by the framework, and maintain the logic in AudioService to prevent other apps to request audio focus during a call. A susequent change will update com.android.internal.telephony.CallManager to take advantage of these two methods. Change-Id: If84ebd508e985083e8cac82ece44940c72b5c669
* | | | | | | Merge "Remove optional LVMX service"Glenn Kasten2012-01-272-6/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove optional LVMX serviceGlenn Kasten2012-01-272-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64121d320b756e46869b82b79e49aebacbac3a48
* | | | | | | | Merge "Fix for IOOB when suggestions have disappeared"Gilles Debunne2012-01-271-6/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix for IOOB when suggestions have disappearedGilles Debunne2012-01-251-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new test is required since the suggestion popup is now triggered by a Runnable. We have to make sure there is still at least one SuggestionSpan at that position. Change-Id: I5c84ba0ca412f51a0201bee5c2e63b5bd3717338
* | | | | | | | | Merge "Handle tap and move cursor before showing suggestions"Gilles Debunne2012-01-271-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle tap and move cursor before showing suggestionsGilles Debunne2012-01-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the suggestions do not correspond to the tapped location. Change-Id: Id0bd87931e73513ca7e50c6212a17b0fc7d6179d
* | | | | | | | | | Merge "Revert "Hack to workaround the fact that the EGL context can be""Teng-Hui Zhu2012-01-271-16/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Hack to workaround the fact that the EGL context can be"Teng-Hui Zhu2012-01-251-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2bc0b01ffe481af877de312f3a87fa769642d2f4. A hack no longer needed. Change-Id: Ia5162535e6683919c368f93428bac0fb258af506
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I853c3fd2a3ada0c78e461550dc6c61bb5e09404a
* | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-2749-925/+1347
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16defb344c5a4a253bc34b414f6395a785bd7003
* | | | | | | | | | | Merge "Mark locale-neutral configuration strings translatable="false""Eric Fischer2012-01-271-15/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mark locale-neutral configuration strings translatable="false"Eric Fischer2012-01-271-15/+15
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I344b871553339b9d98b7bfed74be02dc85b4e195
* | | | | | | | | | | Merge "Fix doc bug."Nick Pelly2012-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix doc bug.Nick Pelly2012-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib7361abb0461d4295e889c505dd45e3a40193451
* | | | | | | | | | | | Merge "Fix build: update current.txt"Nick Pelly2012-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix build: update current.txtNick Pelly2012-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic28314e98784ebe513bd2191d3fa6c9bd5674422
* | | | | | | | | | | | Merge "Don't wait forever if there are no commands to execute."Stephen Hines2012-01-271-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't wait forever if there are no commands to execute.Stephen Hines2012-01-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=5614887 This fixes a timing issue where we could calculate a delay of 0 (indicating wait forever) when we have no pending commands to actually execute. In such cases, we should just break out of the playback loop. This also fixes a small issue with returning whether or not to redraw. Change-Id: Id1e481679341773256b7287062c68925e2bc8f9e
* | | | | | | | | | | | | Merge "Add NdefMessage.getByteLength(), and more minor fixes:"Nick Pelly2012-01-277-50/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Add NdefMessage.getByteLength(), and more minor fixes:Nick Pelly2012-01-267-50/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove NdefMessage from dispatch(). It's already in the Tag. /*package*/ cleanup Fix sitemap after removal of NFCDemo Change-Id: Ie1f6d9ea98144aa97f56bb709a33f5d0ef916e8b
* | | | | | | | | | | | | Merge "SurfaceTexture: use fence sync on omap4 & s5pc110"Jamie Gennis2012-01-271-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SurfaceTexture: use fence sync on omap4 & s5pc110Daniel Lam2012-01-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables the use of the EGL_KHR_fence_sync extension in SurfaceTexture on omap4 and s5pc110 platforms. Change-Id: Icad5245bab445413ffb8a7c823c296b678bf3250
* | | | | | | | | | | | | | Merge "Use audio_source_t consistently"Glenn Kasten2012-01-2712-24/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Use audio_source_t consistentlyGlenn Kasten2012-01-2612-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was a mix of audio_source_t, uint8_t, and int. Related fixes: - fix comments in MediaRecorder.java - AudioPolicyService server side was not checking source parameter at all, so if the client wrapper was bypassed, invalid values could be passed into audio HAL - JNI android_media_AudioRecord_setup was checking source for positive values, but not negative values. This test is redundant, since already checked at Java and now checked by AudioPolicyService also, but might as well make it correct. Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
* | | | | | | | | | | | | | Merge "AudioStreamIn and AudioStreamOut"Glenn Kasten2012-01-272-9/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | AudioStreamIn and AudioStreamOutGlenn Kasten2012-01-262-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are immutable, so make the fields const. getOutput() and getInput() methods are now const. Change-Id: I128246ebd56ea50b3e542be43f2aa1bcb55f1373
* | | | | | | | | | | | | | | Merge "Declare methods in binder opcode order"Glenn Kasten2012-01-272-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-14 08:08:52 +0000