Commit Graph

12247 Commits

Author SHA1 Message Date
John Wang
f83ef4ee4f am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '97fdd0aba93f7c609c1194edf636805ff70e4918'

* commit '97fdd0aba93f7c609c1194edf636805ff70e4918':
  Add Emergency Calls Only String.
2010-01-27 17:26:40 -08:00
Wei Huang
4ccc94b956 am 29bc7270: am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
Merge commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3'

* commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3':
  fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
2010-01-27 16:29:10 -08:00
Andreas Huber
2cb4f162c6 Merge "Fix http streaming for shoutcast servers that do not support http ranges." 2010-01-27 16:25:05 -08:00
Romain Guy
d514ebdf9b resolved conflicts for merge of 176a88ff to master 2010-01-27 16:20:49 -08:00
Romain Guy
b75dae4881 Merge "New View.dispatchDisplayHint() API. Bug #2399147" 2010-01-27 15:54:06 -08:00
Ying Wang
50674f0f3a am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair
Merge commit '6efe03b19e0734361b262f9a0be4d225088d7f9e'

* commit '6efe03b19e0734361b262f9a0be4d225088d7f9e':
  Find layout classes in all "layout-*" dirs.
2010-01-27 15:53:20 -08:00
Owen Lin
0fdc5c1816 Merge "Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functions in preference manager." 2010-01-27 15:48:26 -08:00
Suchi Amalapurapu
db877bcb17 Merge "Add asec permission to DefaultContainerService" 2010-01-27 15:46:32 -08:00
Neal Nguyen
3dc67ef8c7 Merge "Phase 2 of test file cleanup: relocating test files from FrameworkTest closer to their sources in core." 2010-01-27 15:33:31 -08:00
Dan Egnor
8b23c23221 Merge "Report tombstone (native crash) data to the dropbox." 2010-01-27 15:06:06 -08:00
Jason Sams
ae1ed5c445 Merge "Fix some minor bugs with GL state setup that were exposed by Droids driver." 2010-01-27 14:48:29 -08:00
Eric Laurent
2550f8557f Merge "Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V sync" 2010-01-27 14:21:20 -08:00
Neal Nguyen
fded92688e Merge "Moving framework core tests closer to their source files." 2010-01-27 14:03:34 -08:00
Grace Kloba
78e8c12a25 Merge "Add request header support for the Browser/WebView. QSB can use this instead of POST to send the location data. After QSB makes the switch, we should also remove the POST_DATA intent which is hidden." 2010-01-27 13:41:39 -08:00
Andreas Huber
3196ed26d4 Merge "Attempt to fix the build ... again." 2010-01-27 13:31:36 -08:00
Elliott Hughes
a2a7098578 Merge "Remove about-to-be-renamed class from preload list." 2010-01-27 13:23:45 -08:00
Andreas Huber
15c323793d Merge "Do not hold onto the master lock while reading data from the datasource. This would prevent consumers from reading cached data immediately if it is available." 2010-01-27 13:12:58 -08:00
Ken Shirriff
746457bc4a Merge "Fix ExtendedProperties EntityIterator." 2010-01-27 13:08:01 -08:00
Amith Yamasani
2fd64ca6e8 Merge "Move Search dialog out of system process into current activity." 2010-01-27 12:45:23 -08:00
Grace Kloba
642a0cb054 am 769ed21c: Fix http://b/issue?id=2400423.
Merge commit '769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp

* commit '769ed21c33c3629411eb3bbf924de45737a18067':
  Fix http://b/issue?id=2400423.
2010-01-27 12:30:19 -08:00
Vasu Nori
78019c13dc Merge "dont use sqlite_stmt_journals dir" 2010-01-27 12:10:56 -08:00
Suchi Amalapurapu
0fc1da5319 Merge "AppsOnSd feature - Add default container" 2010-01-27 10:40:26 -08:00
Yu Shan Emily Lau
6cec95ae6c Merge "Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different." 2010-01-27 10:28:51 -08:00
Doug Zongker
881e06e230 Merge "update javadoc for Settings.Secure.ANDROID_ID" 2010-01-27 09:40:23 -08:00
Evan Millar
a87bb7e4ee Merge "b/2383073 Add fine-grained status codes for failed downloads." 2010-01-27 09:26:24 -08:00
Andreas Huber
1940799f5d Merge "Better support for HTTP streaming media content, fixes to the way HTTPDataSource streams the data, prefetcher implementation." 2010-01-27 09:24:43 -08:00
Chih-Chung Chang
556a6fed12 Merge "Add support for setting camera display orientation." 2010-01-27 09:20:19 -08:00
Wei-Ta Chen
9d3ad2b296 Merge "Add a Java API that converts yuv data to a jpeg." 2010-01-26 20:23:22 -08:00
Dan Egnor
370eb18cde Merge changes Iea11654e,I2242da5a,I66c40e73
* 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.)
2010-01-26 20:05:20 -08:00
Eric Laurent
e9ed2721f4 Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V sync
Added getRenderPosition() API to IAudioFlinger to retreive number of audio frames
written by AudioFlinger to audio HAL and by DSP to DAC.

Added getRenderPosition() API to AudioHardwareInterface to retreive number of audio frames
written by DSP to DAC.

Exposed AudioTrack::getPosition() to AudioSink() to make it available to media player.

Removed excessive log in AudioHardwareGeneric.
2010-01-26 18:40:39 -08:00
Dirk Dougherty
a1cfe958c6 am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Merge commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp

* commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef':
  doc change only: Update announcement and mwc redirect to point to microsite.
2010-01-26 18:05:23 -08:00
Dirk Dougherty
ddacb39772 Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 2010-01-26 18:00:29 -08:00
Elliott Hughes
eaec4f1010 Merge "Track removal of a class." 2010-01-26 17:46:16 -08:00
San Mehat
8e25c08f8c Merge "MountService: Don't update the storage status when we're unmounted" 2010-01-26 16:52:49 -08:00
Eugene Koh
0d6b48ead5 Merge "Modify the interface of HanziToPinyin class to make it generic and add test class" 2010-01-26 16:48:52 -08:00
Scott Main
26ae5b2f66 Merge "remove @deprecated from dropDownHeight and dropDownWidth" 2010-01-26 15:42:15 -08:00
Scott Main
24b709a8e8 Merge "remove @deprecated tag from "fill_parent" because it bubbles up and declares the entire attribute as deprecated." 2010-01-26 15:32:02 -08:00
San Mehat
bf53a28433 Merge "MountService: Explicitly query volume state on startup" 2010-01-26 14:18:47 -08:00
Jim Miller
b4716b81a2 am 9985867a: Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7' into eclair-plus-aosp

* commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7':
  Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
2010-01-26 13:55:16 -08:00
San Mehat
5c6ce3ec9e Merge "NativeDaemonConnector: fix doListCommand() to return *all* list elements" 2010-01-26 13:38:41 -08:00
Chris Tate
e9a0419738 Merge "Move towards a formal public API for backup and restore" 2010-01-26 12:29:13 -08:00
Mike Reed
73f85e42f2 Merge "add API to change default config on image decoders." 2010-01-26 12:20:43 -08:00
Mike Lockwood
f79bdd8298 Merge "Unhide the secure setting for LocationProviderEnabled" 2010-01-26 11:36:41 -08:00
Jason Sams
8a15a77b31 Merge "Turn the debugging back on." 2010-01-26 11:34:48 -08:00
David Turner
1b61770f37 Merge "Make PackageManager unpack gdbserver binaries at installation time." 2010-01-26 11:24:47 -08:00
Chih-Chung Chang
f091e833d3 Add support for setting camera display orientation. 2010-01-26 11:07:07 -08:00
Nicolas Roard
a02c8afed9 Merge "Fix memory leak with layers. This fix bug http://b/2394813 This is a two-parts CL (needs C++ modifs)" 2010-01-26 10:38:42 -08:00
Nick Pelly
882b90fd23 Merge "Revert "Fix failure to open AVRCP input device due to EPERM."" 2010-01-26 10:36:44 -08:00
Nick Pelly
1b5cf329ea Revert "Fix failure to open AVRCP input device due to EPERM."
This reverts commit e6b1bbd8acca3f6e174c24cf4eb23a66db2d08a2.
2010-01-26 10:28:52 -08:00
Patrick Scott
98a61ef592 am 5b7ea014: (-s ours) am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit '5b7ea0146dcfd5564d894d4cf0104919775feb36'

* commit '5b7ea0146dcfd5564d894d4cf0104919775feb36':
  DO NOT MERGE
2010-01-26 10:27:12 -08:00