summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Maybe fix #3076572: phone process crashes in SipService, trying to ↵Dianne Hackborn2010-10-080-0/+0
|\ | | | | | | get wifi lock" into gingerbread
* \ Merge "Update DownloadManager API to support bulk actions." into gingerbreadSteve Howard2010-10-080-0/+0
|\ \ | |/
* | Merge "TextView cursor and selection improvements." into gingerbreadGilles Debunne2010-10-080-0/+0
|\ \ | |/ |/|
* | Merge "Fix issue #3074745: Crash in system process" into gingerbreadDianne Hackborn2010-10-080-0/+0
|\ \ | |/ |/|
* | Merge "DropBoxManager.Entry implements Closeable" into gingerbreadBrad Fitzpatrick2010-10-080-0/+0
|\ \ | |/ |/|
* | Merge "Refactor some more h.264 utility code out into avc_utils. Work around ↵Andreas Huber2010-10-080-0/+0
|\ \ | | | | | | | | | a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread
* \ \ Merge "Clarify some comments on individual key codes." into gingerbreadJeff Brown2010-10-080-0/+0
|\ \ \
* \ \ \ Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbreadMike Lockwood2010-10-080-0/+0
|\ \ \ \ | |_|/ / |/| | |
* | | | Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very ↵Andreas Huber2010-10-080-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
* \ \ \ \ Merge "Respect the cropping rectangle when extracting the video dimensions ↵Andreas Huber2010-10-080-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | from the sequence parameter set of H.264 streams." into gingerbread
* | | | | Merge "Name the writer threads" into gingerbreadJames Dong2010-10-080-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge "Disable the access unit timeout temporarily while a seek operation is ↵Andreas Huber2010-10-080-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | in progress." into gingerbread
* | | | | Merge "Long press with trackball selects word under cursor." into gingerbreadGilles Debunne2010-10-080-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
* | | | | Merge "Added getter for session Id to AudioSink" into gingerbreadEric Laurent2010-10-080-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
* | | | | Merge "Increase scratch buffers sizes in mp3 software decoder, this ↵Andreas Huber2010-10-080-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | integrates a PV master/opensource patch." into gingerbread
* \ \ \ \ \ Merge "SipService: add permission check for using API" into gingerbreadChung-yih Wang2010-10-070-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
* | | | | | am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.Marco Nelissen2010-10-070-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f' into gingerbread * commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f': Do not merge.
* \ \ \ \ \ \ Merge "Symlink application lib directory when on SD card" into gingerbreadKenny Root2010-10-070-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge "Use explicit intent for installing credentials." into gingerbreadHung-ying Tyan2010-10-070-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "TextView refactoring to ease future merges in HC." into gingerbreadGilles Debunne2010-10-070-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into ↵Jaikumar Ganesh2010-10-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | gingerbread
* | | | | | | | Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into ↵Mindy Pereira2010-10-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
* | | | | | | | Merge "Minor fix for InputReader support for non-touchscreen devices." into ↵Jeff Brown2010-10-071-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | gingerbread
| * | | | | | | Minor fix for InputReader support for non-touchscreen devices.Jeff Brown2010-10-071-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Change-Id: I2256e37dd1c6f3836f82786aae14ee5d0c98f4c6
* | | | | | | Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into ↵Mindy Pereira2010-10-070-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
* \ \ \ \ \ \ \ Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbreadXia Wang2010-10-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge "Removing 'last' of red cross asset." into gingerbreadGilles Debunne2010-10-070-0/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge "Switch Looper back to using poll() instead of epoll()." into gingerbreadJeff Brown2010-10-073-48/+313
|\ \ \ \ \ \ \ \
| * | | | | | | | Switch Looper back to using poll() instead of epoll().Jeff Brown2010-10-073-48/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a couple of micro-optimizations to avoid calling wake() unnecessarily and reduce JNI overhead slightly. Fixed a minor issue where we were not clearing the "next" field of Messages returned by the MessageQueue so the Message would hold on to its successor and potentially prevent the GC from collecting it if the message were leaked somehow. Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
* | | | | | | | | Merge "Work to support switching transport streams mid-stream and signalling ↵Andreas Huber2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | discontinuities to the decoder." into gingerbread
* | | | | | | | Merge "Fixed popup assets (background)" into gingerbreadJustin Ho2010-10-070-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "Fix bug 3071869 - text anchors are now treated as application ↵Adam Powell2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-panels." into gingerbread
* \ \ \ \ \ \ \ \ \ Merge "Quiet unnecessary debug logging." into gingerbreadBrad Fitzpatrick2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "On this particular device the hardware video decoder spits out ↵Andreas Huber2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
* \ \ \ \ \ \ \ \ \ Merge "Eliminate MCS_GIVE_UP state" into gingerbreadKenny Root2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Removed unused and broken screen_progress" into gingerbreadGilles Debunne2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "DropBox.Entry javadoc syntax fix" into gingerbreadBrad Fitzpatrick2010-10-070-0/+0
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Add flag to skip restoring network seletion." into gingerbreadJohn Wang2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into ↵Eric Rowe2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | gingerbread
* | | | | | | | | Merge "Changed handling of onQueryCompelete to not use mimeType." into ↵Wink Saville2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | gingerbread
* | | | | | | | | Merge "Add javadoc for display orientation." into gingerbreadWu-cheng Li2010-10-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Make SipService broadcast SIP_SERVICE_UP when it's up." into gingerbreadHung-ying Tyan2010-10-060-0/+0
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-10-060-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "Parser is optional in obtainStyledAttributes." into gingerbreadXavier Ducrohet2010-10-060-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "SIP: Fix busy authentication loop." into gingerbreadHung-ying Tyan2010-10-060-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge "Make Activity.removeDialog() less strict." into gingerbreadDianne Hackborn2010-10-060-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Add MountService tests and fix a bug it found" into gingerbreadKenny Root2010-10-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Work on issue #3062691: GPS enable bypass via ↵Dianne Hackborn2010-10-060-0/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
* | | | | | | | | Merge "Make USB mass storage hide keyguard when shown." into gingerbreadDianne Hackborn2010-10-060-0/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge "Misc fixes for sim-eng build." into gingerbreadChung-yih Wang2010-10-060-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |