summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* API Extension: Support for optionally specifying a map of extra request ↵Andreas Huber2010-01-281-1/+1
| | | | | | | | headers when specifying the uri of media data to be played. related-to-bug: 2393577 Original change by Andrei Popescu <andreip@google.com>
* Merge "First pass at the url rendering service."Patrick Scott2010-01-280-0/+0
|\
* \ Merge "Add streaming method profiling support."Andy McFadden2010-01-280-0/+0
|\ \
* \ \ Merge "Remove destroy asec command when mounting secure container"San Mehat2010-01-280-0/+0
|\ \ \ | |_|/ |/| |
* | | Merge "timestamp field in ApplicationErrorReport was not getting ↵Jacek Surazski2010-01-280-0/+0
|\ \ \ | | | | | | | | | | | | intitialized on ANRs"
* \ \ \ Merge "Added OverScroller and overscroll effects for ScrollView and ↵Romain Guy2010-01-270-0/+0
|\ \ \ \ | |_|/ / |/| | | | | | | HorizontalScrollView."
* | | | am 6f3e1e27: am 9a400fa4: Merge "initialize sync adapters that get installed ↵Fred Quintana2010-01-270-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while the system is running bug http://b/issue?id=2360782" into eclair Merge commit '6f3e1e27a697d3e64bf73792c1007135319ff0d5' * commit '6f3e1e27a697d3e64bf73792c1007135319ff0d5': initialize sync adapters that get installed while the system is running
| * \ \ \ am 9a400fa4: Merge "initialize sync adapters that get installed while the ↵Fred Quintana2010-01-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system is running bug http://b/issue?id=2360782" into eclair Merge commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp * commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1': initialize sync adapters that get installed while the system is running
| | * \ \ \ Merge "initialize sync adapters that get installed while the system is ↵Fred Quintana2010-01-210-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | running bug http://b/issue?id=2360782" into eclair
* | | \ \ \ \ am 3c2d3667: am 036e2108: Fix NPE when importing from USIM.jsh2010-01-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d' * commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d': Fix NPE when importing from USIM.
| * | | | | | am 036e2108: Fix NPE when importing from USIM.jsh2010-01-210-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp * commit '036e21083d9936425687d7de29e95b2c458a7e4a': Fix NPE when importing from USIM.
* | | | | | | am 47f1d4d5: am b1780474: Merge "Instead of caputre the memory footprint ↵Yu Shan Emily Lau2010-01-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair Merge commit '47f1d4d509b271ddb2f158c761e572413f39f1a8' * commit '47f1d4d509b271ddb2f158c761e572413f39f1a8': Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
| * | | | | | am b1780474: Merge "Instead of caputre the memory footprint before and after ↵Yu Shan Emily Lau2010-01-210-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair Merge commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp * commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f': Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
| | * | | | | Merge "Instead of caputre the memory footprint before and after the test. We ↵Yu Shan Emily Lau2010-01-210-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair
* | | \ \ \ \ \ am ad0e5363: am 50adb167: Pull in "emergency calls only" translations.Eric Fischer2010-01-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ad0e53635571066e7928e30a4a669067fff6a382' * commit 'ad0e53635571066e7928e30a4a669067fff6a382': Pull in "emergency calls only" translations.
| * | | | | | | am 50adb167: Pull in "emergency calls only" translations.Eric Fischer2010-01-210-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '50adb167534889421dc0d7cfc7d3bf663c03f01c' into eclair-plus-aosp * commit '50adb167534889421dc0d7cfc7d3bf663c03f01c': Pull in "emergency calls only" translations.
* | | | | | | | am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclairJohn Wang2010-01-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '97fdd0aba93f7c609c1194edf636805ff70e4918' * commit '97fdd0aba93f7c609c1194edf636805ff70e4918': Add Emergency Calls Only String.
| * | | | | | | am 7f70998d: Merge "Add Emergency Calls Only String." into eclairJohn Wang2010-01-210-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp * commit '7f70998dec6d7db850373b7e75677ecf72904878': Add Emergency Calls Only String.
| | * | | | | | Merge "Add Emergency Calls Only String." into eclairJohn Wang2010-01-210-0/+0
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ am 29bc7270: am 495bae67: Merge "fix bug 2264186: clean up the outstanding ↵Wei Huang2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | async queries in ContactHeaderWidget." into eclair Merge commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3' * commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3': fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
| * | | | | | | | am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries ↵Wei Huang2010-01-210-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in ContactHeaderWidget." into eclair Merge commit '495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp * commit '495bae67ff7df4a11325a4cc1d8af288f82128fe': fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
| | * | | | | | | Merge "fix bug 2264186: clean up the outstanding async queries in ↵Wei Huang2010-01-210-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | ContactHeaderWidget." into eclair
* | | | | | | | | Merge "Fix http streaming for shoutcast servers that do not support http ↵Andreas Huber2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ranges."
* \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 176a88ff to masterRomain Guy2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | merge from open-source masterThe Android Open Source Project2010-01-210-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge "New View.dispatchDisplayHint() API. Bug #2399147"Romain Guy2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" ↵Ying Wang2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dirs." into eclair Merge commit '6efe03b19e0734361b262f9a0be4d225088d7f9e' * commit '6efe03b19e0734361b262f9a0be4d225088d7f9e': Find layout classes in all "layout-*" dirs.
| * | | | | | | | | | am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclairYing Wang2010-01-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp * commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be': Find layout classes in all "layout-*" dirs.
| | * | | | | | | | | Merge "Find layout classes in all "layout-*" dirs." into eclairYing Wang2010-01-210-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge "Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two ↵Owen Lin2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions in preference manager."
* \ \ \ \ \ \ \ \ \ \ \ Merge "Add asec permission to DefaultContainerService"Suchi Amalapurapu2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge "Phase 2 of test file cleanup: relocating test files from ↵Neal Nguyen2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | FrameworkTest closer to their sources in core."
* | | | | | | | | | | | | Merge "Report tombstone (native crash) data to the dropbox."Dan Egnor2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fix some minor bugs with GL state setup that were exposed by Droids ↵Jason Sams2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | driver."
* | | | | | | | | | | | | Merge "Fix issue 2285561: New AudioFlinger and audio driver API needed for ↵Eric Laurent2010-01-2710-9/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | A/V sync"
| * | | | | | | | | | | | Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V syncEric Laurent2010-01-2610-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | Merge "Moving framework core tests closer to their source files."Neal Nguyen2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add request header support for the Browser/WebView. QSB can use this ↵Grace Kloba2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | instead of POST to send the location data. After QSB makes the switch, we should also remove the POST_DATA intent which is hidden."
* | | | | | | | | | | | | | Merge "Attempt to fix the build ... again."Andreas Huber2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Remove about-to-be-renamed class from preload list."Elliott Hughes2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Do not hold onto the master lock while reading data from the ↵Andreas Huber2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | datasource. This would prevent consumers from reading cached data immediately if it is available."
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix ExtendedProperties EntityIterator."Ken Shirriff2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Move Search dialog out of system process into current activity."Amith Yamasani2010-01-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | / / / / / / / / / / | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
generated by cgit v1.1 at 2025-03-15 14:31:21 +0000