summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "dont use sqlite_stmt_journals dir"Vasu Nori2010-01-270-0/+0
|\
* \ Merge "AppsOnSd feature - Add default container"Suchi Amalapurapu2010-01-270-0/+0
|\ \
* \ \ Merge "Add the new golden thumbnail image as the PV and stagefright ↵Yu Shan Emily Lau2010-01-270-0/+0
|\ \ \ | |/ / |/| | | | | implementations in capturing thumbnail is different."
* | | Merge "update javadoc for Settings.Secure.ANDROID_ID"Doug Zongker2010-01-270-0/+0
|\ \ \
* \ \ \ Merge "b/2383073 Add fine-grained status codes for failed downloads."Evan Millar2010-01-270-0/+0
|\ \ \ \
* \ \ \ \ Merge "Better support for HTTP streaming media content, fixes to the way ↵Andreas Huber2010-01-270-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | HTTPDataSource streams the data, prefetcher implementation."
* \ \ \ \ \ Merge "Add support for setting camera display orientation."Chih-Chung Chang2010-01-274-38/+25
|\ \ \ \ \ \
| * | | | | | Add support for setting camera display orientation.Chih-Chung Chang2010-01-264-38/+25
| | | | | | |
* | | | | | | Merge "Add a Java API that converts yuv data to a jpeg."Wei-Ta Chen2010-01-260-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge changes Iea11654e,I2242da5a,I66c40e73Dan Egnor2010-01-260-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * changes: Use six dashes instead of five. Include more verbose device information with kernel dumps (hardware, bootloader, etc.), and separate the device info headers from the actual dump with a blank line. Add package information to dropbox reports for ANR, crash, etc. (Notably including package version codes, to help when we're shipping out-of-cycle unbundled app updates.)
* | | | | | | Merge "Track removal of a class."Elliott Hughes2010-01-260-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "MountService: Don't update the storage status when we're unmounted"San Mehat2010-01-260-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Modify the interface of HanziToPinyin class to make it generic and ↵Eugene Koh2010-01-260-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | add test class"
* \ \ \ \ \ \ \ \ Merge "remove @deprecated from dropDownHeight and dropDownWidth"Scott Main2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge "remove @deprecated tag from "fill_parent" because it bubbles up and ↵Scott Main2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | declares the entire attribute as deprecated."
* | | | | | | | Merge "MountService: Explicitly query volume state on startup"San Mehat2010-01-260-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "NativeDaemonConnector: fix doListCommand() to return *all* list elements"San Mehat2010-01-260-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
* | | | | | | | Merge "Move towards a formal public API for backup and restore"Chris Tate2010-01-260-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "add API to change default config on image decoders."Mike Reed2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge "Unhide the secure setting for LocationProviderEnabled"Mike Lockwood2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Turn the debugging back on."Jason Sams2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "Make PackageManager unpack gdbserver binaries at installation time."David Turner2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Fix memory leak with layers. This fix bug http://b/2394813 This is a ↵Nicolas Roard2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two-parts CL (needs C++ modifs)"
* \ \ \ \ \ \ \ \ \ \ \ \ Merge "Revert "Fix failure to open AVRCP input device due to EPERM.""Nick Pelly2010-01-261-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Revert "Fix failure to open AVRCP input device due to EPERM."Nick Pelly2010-01-261-7/+1
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e6b1bbd8acca3f6e174c24cf4eb23a66db2d08a2.
* | | | | | | | | | | | am 5b7ea014: (-s ours) am e7b2845d: Merge "DO NOT MERGE return an error when ↵Patrick Scott2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Surface::lock() is called while the surface is already locked." into eclair-mr2 Merge commit '5b7ea0146dcfd5564d894d4cf0104919775feb36' * commit '5b7ea0146dcfd5564d894d4cf0104919775feb36': DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is ↵Patrick Scott2010-01-261-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called while the surface is already locked." into eclair-mr2 Merge commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4' into eclair-mr2-plus-aosp * commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4': DO NOT MERGE
| | * \ \ \ \ \ \ \ \ \ \ \ Merge "DO NOT MERGE return an error when Surface::lock() is called while the ↵Patrick Scott2010-01-261-3/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surface is already locked." into eclair-mr2
| | | * | | | | | | | | | | | DO NOT MERGEMathias Agopian2010-01-251-3/+11
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return an error when Surface::lock() is called while the surface is already locked.
* | | | | | | | | | | | | | am c811cd91: am caf0ce3c: Delay resetting mPreventDrag flags so that the ↵Grace Kloba2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up) Merge commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db' * commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db': Delay resetting mPreventDrag flags so that the Plugin
| * | | | | | | | | | | | | am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have ↵Grace Kloba2010-01-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up) Merge commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62' into eclair-mr2-plus-aosp * commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62': Delay resetting mPreventDrag flags so that the Plugin
* | | | | | | | | | | | | | am cf0957ce: am 77dc179b: As embedded and full screen shares the same view, ↵Grace Kloba2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout. Merge commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542' * commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542': As embedded and full screen shares the same view,
| * | | | | | | | | | | | am 77dc179b: As embedded and full screen shares the same view, we have to ↵Grace Kloba2010-01-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout. Merge commit '77dc179baa7b8fb405633fd46324e336285d10e2' into eclair-mr2-plus-aosp * commit '77dc179baa7b8fb405633fd46324e336285d10e2': As embedded and full screen shares the same view,
* | | | | | | | | | | | | resolved conflicts for merge of 1f2f23bd to masterRobert Greenwalt2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | am 9fdf82e0: Merge "Try to switch to another default net on connection ↵Robert Greenwalt2010-01-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure." into eclair Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp * commit '9fdf82e080ea20086378e751ace245a4a1b022dc': Try to switch to another default net on connection failure.
| | * \ \ \ \ \ \ \ \ \ \ \ Merge "Try to switch to another default net on connection failure." into eclairRobert Greenwalt2010-01-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge "NetworkManagementService: Start service when SystemServer starts up"San Mehat2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Set a flag that indicates a response is pending."Patrick Scott2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "MountService: Add support for renaming secure containers"San Mehat2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | resolved conflicts for merge of d0514347 to masterIrfan Sheriff2010-01-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am dcc14d6a: Merge "Use MCC value to always override channel count setting" ↵Irfan Sheriff2010-01-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair Merge commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2' into eclair-plus-aosp * commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2': Use MCC value to always override channel count setting
| | * | | | | | | | | | | | Merge "Use MCC value to always override channel count setting" into eclairIrfan Sheriff2010-01-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ am e5b9beae: (-s ours) am f6aed0e0: Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e5b9beae260b451cb3d60583c800b0d223ae256f' * commit 'e5b9beae260b451cb3d60583c800b0d223ae256f': DO NOT MERGE
| * | | | | | | | | | | | | | am f6aed0e0: Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f6aed0e0a7c96094b66f5426baad78032b794497' into eclair-plus-aosp * commit 'f6aed0e0a7c96094b66f5426baad78032b794497': DO NOT MERGE
| | * | | | | | | | | | | | | Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ am 5b745762: am d5ada83c: ScaleGestureDetector needs to query the ↵Grace Kloba2010-01-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displaymetrics for the width/height on each touch down as orientation can change. Merge commit '5b74576218055f1c9d31d9559255e8cf504cd662' * commit '5b74576218055f1c9d31d9559255e8cf504cd662': ScaleGestureDetector needs to query the displaymetrics
| * | | | | | | | | | | | | | | am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the ↵Grace Kloba2010-01-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | width/height on each touch down as orientation can change. Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp * commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b': ScaleGestureDetector needs to query the displaymetrics
* | | | | | | | | | | | | | | | am 425324e9: am e834722f: Merge "Fix failure to open AVRCP input device due ↵Nick Pelly2010-01-251-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to EPERM." into eclair Merge commit '425324e97bba75cd69bb6c81de6248529540e6fe' * commit '425324e97bba75cd69bb6c81de6248529540e6fe': Fix failure to open AVRCP input device due to EPERM.
| * | | | | | | | | | | | | | | am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." ↵Nick Pelly2010-01-201-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair Merge commit 'e834722f547d13eaa453464502456892c6225e42' into eclair-plus-aosp * commit 'e834722f547d13eaa453464502456892c6225e42': Fix failure to open AVRCP input device due to EPERM.
| | * | | | | | | | | | | | | | Merge "Fix failure to open AVRCP input device due to EPERM." into eclairNick Pelly2010-01-201-2/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
generated by cgit v1.1 at 2025-04-01 15:34:44 +0000