OSDN Git Service
James Dong [Fri, 6 Nov 2009 03:09:58 +0000 (19:09 -0800)]
am
1e495da1: Merge change I4b03c2cd into eclair
Merge commit '
1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-mr2
* commit '
1e495da19f3f0061de38821a4ac733dca833b3eb':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Android (Google) Code Review [Fri, 6 Nov 2009 00:15:56 +0000 (19:15 -0500)]
Merge change I4b03c2cd into eclair
* changes:
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Jean-Michel Trivi [Fri, 6 Nov 2009 00:10:32 +0000 (16:10 -0800)]
am
d94ed379: Merge change I1dc2ae28 into eclair
Merge commit '
d94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-mr2
* commit '
d94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug
2242585 to unhide the new audio recording sources.
Android (Google) Code Review [Fri, 6 Nov 2009 00:03:09 +0000 (19:03 -0500)]
Merge change I1dc2ae28 into eclair
* changes:
Fix bug
2242585 to unhide the new audio recording sources. Unhide CAMCORDER and VOICE_RECOGNITION in android.media.MediaRecorder
Jean-Michel Trivi [Thu, 5 Nov 2009 23:49:37 +0000 (15:49 -0800)]
Fix bug
2242585 to unhide the new audio recording sources.
Unhide CAMCORDER and VOICE_RECOGNITION in android.media.MediaRecorder
Romain Guy [Thu, 5 Nov 2009 23:47:43 +0000 (15:47 -0800)]
am
f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit '
f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2
* commit '
f20e9a88a36ced533e96b8873a3321b4d51585ca':
Prevent crash in Home when using widgets whose ids collide with Home's
Guang Zhu [Thu, 5 Nov 2009 23:47:32 +0000 (15:47 -0800)]
am
bfa68abc: layout test rebase, bug fix
Merge commit '
bfa68abc955ed1fe6cf6d98e42f344a8d623fab7' into eclair-mr2
* commit '
bfa68abc955ed1fe6cf6d98e42f344a8d623fab7':
layout test rebase, bug fix
Android (Google) Code Review [Thu, 5 Nov 2009 23:42:14 +0000 (18:42 -0500)]
Merge change Idf40f3b0 into eclair
* changes:
Prevent crash in Home when using widgets whose ids collide with Home's resources.
Romain Guy [Thu, 5 Nov 2009 21:36:15 +0000 (13:36 -0800)]
Prevent crash in Home when using widgets whose ids collide with Home's
resources.
Bug #
2228943.
Approved by mcleron, triaged by ryanpc.
Change-Id: Idf40f3b09502ae5d0d3b9a6a72c265a2de2ffca2
Jason Sams [Thu, 5 Nov 2009 23:39:51 +0000 (15:39 -0800)]
am
902051df: Merge change I0e27b5ca into eclair
Merge commit '
902051dfa7590f8b2c22eb0a46df80f1bf19a087' into eclair-mr2
* commit '
902051dfa7590f8b2c22eb0a46df80f1bf19a087':
Fix texture upload bug for narrow texture of less than 32bpp.
Jaikumar Ganesh [Thu, 5 Nov 2009 23:39:40 +0000 (15:39 -0800)]
am
8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit '
8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-mr2
* commit '
8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Guang Zhu [Thu, 5 Nov 2009 23:24:10 +0000 (15:24 -0800)]
layout test rebase, bug fix
* rebase layout test based on newly enabled http tests
* fix a bug in initializing parameters (should happen before super.onCreate)
Android (Google) Code Review [Thu, 5 Nov 2009 22:39:56 +0000 (17:39 -0500)]
Merge change I0e27b5ca into eclair
* changes:
Fix texture upload bug for narrow texture of less than 32bpp.
Android (Google) Code Review [Thu, 5 Nov 2009 22:15:51 +0000 (17:15 -0500)]
Merge change I21d0dca3 into eclair
* changes:
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Andreas Huber [Thu, 5 Nov 2009 21:59:20 +0000 (13:59 -0800)]
am
05eca1d4: (-s ours) Merge change Ie80e2381 into eclair
Merge commit '
05eca1d46a45723a57899dabad698537b7faef82' into eclair-mr2
* commit '
05eca1d46a45723a57899dabad698537b7faef82':
DO NOT MERGE: Squashed commit of the following:
Amith Yamasani [Thu, 5 Nov 2009 21:55:33 +0000 (13:55 -0800)]
am
4ab2c777: Merge change I14fb81af into eclair
Merge commit '
4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-mr2
* commit '
4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
Fix for
2221718: Hang in BatteryStatsService.noteBluetoothOn
Andreas Huber [Thu, 5 Nov 2009 21:55:19 +0000 (13:55 -0800)]
am
818a9cf8: Merge change Ia4eedace into eclair
Merge commit '
818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-mr2
* commit '
818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
Daniel Sandler [Thu, 5 Nov 2009 21:54:40 +0000 (13:54 -0800)]
am
eca41b31: Merge change Id1458b01 into eclair
Merge commit '
eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-mr2
* commit '
eca41b31fb9a5202f755bfd9dbc4849dbb486137':
New live wallpaper API to expose author and description strings.
Android (Google) Code Review [Thu, 5 Nov 2009 21:50:34 +0000 (16:50 -0500)]
Merge change Ie80e2381 into eclair
* changes:
DO NOT MERGE: Squashed commit of the following:
Android (Google) Code Review [Thu, 5 Nov 2009 21:08:40 +0000 (16:08 -0500)]
Merge change I14fb81af into eclair
* changes:
Fix for
2221718: Hang in BatteryStatsService.noteBluetoothOn
Andreas Huber [Thu, 5 Nov 2009 20:04:22 +0000 (12:04 -0800)]
DO NOT MERGE: Squashed commit of the following:
commit
08259dd3dc9026887f9bbfedaf45866eb56ea9bc
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 12:02:31 2009 -0800
DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback.
commit
991832fe4dc012e51d3d9ed8d647c7f09991858f
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:24:11 2009 -0800
DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though.
commit
cec45cf302d9218fe79956cbe8a462d7ca3a10bb
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 26 16:11:54 2009 -0700
DO NOT MERGE: When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
commit
34a1e885ef9113d68acbc26d36fcc47fdebbed84
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:10:49 2009 -0800
DO NOT MERGE: Fix heap corruptin in OMXNodeInstance.
commit
5a47f7439a1298b330541a7e4e647a8b44487388
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:08:19 2009 -0800
DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec.
commit
45bed64722501b9f411a2940aff5aff4cc4d2e98
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:02:23 2009 -0800
DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts.
commit
6738e306a50196f31a73d4fc7b7c45faff639903
Author: Andreas Huber <andih@google.com>
Date: Thu Oct 15 13:46:54 2009 -0700
DO NOT MERGE: Reimplement the OMX backend for stagefright.
Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.
Changed APIs to conform to the rest of the system.
Android (Google) Code Review [Thu, 5 Nov 2009 21:01:50 +0000 (16:01 -0500)]
Merge change Ia4eedace into eclair
* changes:
Now that UseBuffer on this component is fixed, let's use it.
Android (Google) Code Review [Thu, 5 Nov 2009 20:53:25 +0000 (15:53 -0500)]
Merge change Id1458b01 into eclair
* changes:
New live wallpaper API to expose author and description strings.
Jason Sams [Thu, 5 Nov 2009 20:44:58 +0000 (12:44 -0800)]
Fix texture upload bug for narrow texture of less than 32bpp.
Daniel Sandler [Thu, 5 Nov 2009 20:05:27 +0000 (15:05 -0500)]
New live wallpaper API to expose author and description strings.
First in a sequence of CLs to address
http://b/issue?id=
2235307 .
Change-Id: Id1458b01c8a7918f345823b45e5726e02285d8b5
Fred Quintana [Thu, 5 Nov 2009 19:46:11 +0000 (11:46 -0800)]
resolved conflicts for merge of
f476c480 to eclair-mr2
Amith Yamasani [Thu, 5 Nov 2009 19:41:58 +0000 (11:41 -0800)]
Fix for
2221718: Hang in BatteryStatsService.noteBluetoothOn
This should remove the deadlock. I'm not absolutely positive that
it fixes it, as it's not easy to reproduce.
Jaikumar Ganesh [Thu, 5 Nov 2009 19:27:28 +0000 (11:27 -0800)]
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
This may force some Motorola headsets to thow up the Pairing Request.
Bug:
2210365
Dr No: Eastham
Android (Google) Code Review [Thu, 5 Nov 2009 19:15:54 +0000 (14:15 -0500)]
Merge change I48cbd0bc into eclair
* changes:
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Andreas Huber [Thu, 5 Nov 2009 17:56:03 +0000 (09:56 -0800)]
Now that UseBuffer on this component is fixed, let's use it.
Android (Google) Code Review [Thu, 5 Nov 2009 17:53:34 +0000 (12:53 -0500)]
Merge change I272af007 into eclair-mr2
* changes:
a possible fix for the bug http://b/issue?id=
2200637
Android (Google) Code Review [Thu, 5 Nov 2009 09:49:46 +0000 (04:49 -0500)]
Merge change I7f9db307 into eclair-mr2
* changes:
Modify the behavior of createThumbnailForEXIF() to: returning SizedThumbnailBitmap, which contains the downsampled bitmap either from the thumbnail in EXIF or the full image.
Wei-Ta Chen [Thu, 29 Oct 2009 12:51:57 +0000 (20:51 +0800)]
Modify the behavior of createThumbnailForEXIF() to:
returning SizedThumbnailBitmap, which contains the downsampled
bitmap either from the thumbnail in EXIF or the full image.
Eric Laurent [Thu, 5 Nov 2009 08:01:33 +0000 (00:01 -0800)]
am
67b69292: Merge change I93f500a5 into eclair
Merge commit '
67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2
* commit '
67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue
2203561: Sholes: audio playing out of earpiece.
Android (Google) Code Review [Thu, 5 Nov 2009 07:55:26 +0000 (02:55 -0500)]
Merge change I93f500a5 into eclair
* changes:
Fix issue
2203561: Sholes: audio playing out of earpiece.
Eric Laurent [Wed, 4 Nov 2009 16:27:26 +0000 (08:27 -0800)]
Fix issue
2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.
Same modifications for AudioRecord.
Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
James Dong [Wed, 4 Nov 2009 02:02:30 +0000 (18:02 -0800)]
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Android (Google) Code Review [Thu, 5 Nov 2009 04:49:46 +0000 (23:49 -0500)]
Merge change I0d442f0d into eclair-mr2
* changes:
Add tests for Japanization part of vCard.
Daisuke Miyakawa [Thu, 5 Nov 2009 04:41:24 +0000 (13:41 +0900)]
Add tests for Japanization part of vCard.
Fix several bugs around name construction.
Internal issue number:
2195990
Romain Guy [Thu, 5 Nov 2009 02:40:38 +0000 (18:40 -0800)]
am
584bce31: Merge change I09282f5b into eclair
Merge commit '
584bce31b62cdf3efd8a9eb40442c4cc612ce1e6' into eclair-mr2
* commit '
584bce31b62cdf3efd8a9eb40442c4cc612ce1e6':
Fix the build (hopefully.)
Android (Google) Code Review [Thu, 5 Nov 2009 02:33:27 +0000 (21:33 -0500)]
Merge change I09282f5b into eclair
* changes:
Fix the build (hopefully.)
Romain Guy [Thu, 5 Nov 2009 02:32:48 +0000 (18:32 -0800)]
Fix the build (hopefully.)
Change-Id: I09282f5b4ff8b97f6beb1073223d8a943d3ecef4
Nick Pelly [Thu, 5 Nov 2009 01:37:07 +0000 (17:37 -0800)]
am
61b01632: Merge change I9490271c into eclair
Merge commit '
61b01632915181fcf725dc4933cad8c81e700115' into eclair-mr2
* commit '
61b01632915181fcf725dc4933cad8c81e700115':
Add BluetoothDevice to SDK AIDL list.
Eric Olsen [Thu, 5 Nov 2009 01:36:59 +0000 (17:36 -0800)]
am
62335430: Merge change I4499ad72 into eclair
Merge commit '
62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2
* commit '
62335430b05d92ad2255bf20b76b35e012b385c9':
Fix bad merge fixes build breakage.
Romain Guy [Thu, 5 Nov 2009 01:36:46 +0000 (17:36 -0800)]
am
131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '
131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-mr2
* commit '
131564d26ac5b7f963c60802089b9fe1472659f7':
Remove unused field and add new API to control the children drawing order.
Android (Google) Code Review [Thu, 5 Nov 2009 01:32:00 +0000 (20:32 -0500)]
Merge change I9490271c into eclair
* changes:
Add BluetoothDevice to SDK AIDL list.
Android (Google) Code Review [Thu, 5 Nov 2009 01:27:11 +0000 (20:27 -0500)]
Merge change I4499ad72 into eclair
* changes:
Fix bad merge fixes build breakage.
Nick Pelly [Thu, 5 Nov 2009 01:23:55 +0000 (17:23 -0800)]
Add BluetoothDevice to SDK AIDL list.
Bug:
2216702
Change-Id: I9490271ce4be465d5b3acc5e530feaf6e2fa3f57
Eric Olsen [Thu, 5 Nov 2009 01:11:53 +0000 (17:11 -0800)]
Fix bad merge fixes build breakage.
Signed-off-by: Eric Olsen <eolsen@android.com>
Android (Google) Code Review [Thu, 5 Nov 2009 00:58:00 +0000 (19:58 -0500)]
Merge change I3bbfb4f9 into eclair
* changes:
Remove unused field and add new API to control the children drawing order.
Romain Guy [Wed, 4 Nov 2009 21:59:48 +0000 (13:59 -0800)]
Remove unused field and add new API to control the children drawing order.
Approved by: xav, hackbod, mcleron.
Change-Id: I3bbfb4f96e3c9adedbb68d78703059a2df1e2013
Eric Olsen [Thu, 5 Nov 2009 00:49:31 +0000 (16:49 -0800)]
am
9053fdb3: Merge change I76127f6f into eclair
Merge commit '
9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-mr2
* commit '
9053fdb32b38d1240d856bd6efedf72eefba48d3':
Add support for colored LED on jogball backlight.
Android (Google) Code Review [Thu, 5 Nov 2009 00:45:14 +0000 (19:45 -0500)]
Merge change I76588b56 into eclair-mr2
* changes:
Make vCard importer handle "PAGER" phone number correctly.
Daisuke Miyakawa [Thu, 5 Nov 2009 00:43:19 +0000 (09:43 +0900)]
Make vCard importer handle "PAGER" phone number correctly.
Add tests for it.
Internal issue number:
2239492
Android (Google) Code Review [Thu, 5 Nov 2009 00:39:29 +0000 (19:39 -0500)]
Merge change I76127f6f into eclair
* changes:
Add support for colored LED on jogball backlight.
Ying Wang [Thu, 5 Nov 2009 00:35:15 +0000 (16:35 -0800)]
am
b5e380a7: (-s ours) am
e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit '
b5e380a799b1c22d51364a2b9b3abe02e2eb83cf' into eclair-mr2
* commit '
b5e380a799b1c22d51364a2b9b3abe02e2eb83cf':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Christopher Tate [Thu, 5 Nov 2009 00:35:06 +0000 (16:35 -0800)]
am
595596fe: Merge change I561011bc into eclair
Merge commit '
595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-mr2
* commit '
595596fe6b6fd52bf26d224f18b8724a4d151316':
Fix #
2176803 - restores from userdebug to user builds not working
Vasu Nori [Thu, 5 Nov 2009 00:26:55 +0000 (16:26 -0800)]
a possible fix for the bug b/issue?id=
2200637
Ying Wang [Thu, 5 Nov 2009 00:18:04 +0000 (16:18 -0800)]
am
e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit '
e33044eadfa9969e71e50d1aff165cbc436b13f3' into eclair
* commit '
e33044eadfa9969e71e50d1aff165cbc436b13f3':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Android (Google) Code Review [Thu, 5 Nov 2009 00:08:59 +0000 (19:08 -0500)]
Merge change Ib9cc041e into eclair-sdk
* changes:
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Ying Wang [Tue, 27 Oct 2009 18:00:30 +0000 (11:00 -0700)]
Explicitly specify that online-sdk depends on framework-res. (do not merge)
this is integrated from Eclair to fix the mac build breakages.
Android (Google) Code Review [Wed, 4 Nov 2009 23:52:27 +0000 (18:52 -0500)]
Merge change I561011bc into eclair
* changes:
Fix #
2176803 - restores from userdebug to user builds not working
Jason Parks [Wed, 4 Nov 2009 22:59:54 +0000 (14:59 -0800)]
am
ef16a545: Merge change I2867746d into eclair
Merge commit '
ef16a545dca8deacdcdd89cb493d556adf7a8be8' into eclair-mr2
* commit '
ef16a545dca8deacdcdd89cb493d556adf7a8be8':
When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
Mathias Agopian [Wed, 4 Nov 2009 22:59:44 +0000 (14:59 -0800)]
am
36fe3eea: part of fix [
2186418] switch passion to 24-bits framebuffer
Merge commit '
36fe3eeaa056ff13455c0df73b495b2bae8c1469' into eclair-mr2
* commit '
36fe3eeaa056ff13455c0df73b495b2bae8c1469':
part of fix [
2186418] switch passion to 24-bits framebuffer
Android (Google) Code Review [Wed, 4 Nov 2009 22:54:00 +0000 (17:54 -0500)]
Merge change I2867746d into eclair
* changes:
When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
Mathias Agopian [Wed, 4 Nov 2009 00:17:55 +0000 (16:17 -0800)]
part of fix [
2186418] switch passion to 24-bits framebuffer
add support for RGBX_8888 EGLConfigs in the software renderer
(since that's what we're using in the MDP case)
Leon Scroggins [Wed, 4 Nov 2009 22:02:03 +0000 (14:02 -0800)]
Do not update the progress if it is the same as the last given progress.
Eric Olsen [Thu, 29 Oct 2009 23:42:03 +0000 (16:42 -0700)]
Add support for colored LED on jogball backlight.
Signed-off-by: Eric Olsen <eolsen@android.com>
Jason Parks [Wed, 4 Nov 2009 22:25:26 +0000 (14:25 -0800)]
When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
Dirk Dougherty [Wed, 4 Nov 2009 22:21:20 +0000 (14:21 -0800)]
am
5fc71e67: am
00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '
5fc71e67498ed64ad2d41c23471b008f93cb580e' into eclair-mr2
* commit '
5fc71e67498ed64ad2d41c23471b008f93cb580e':
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Dirk Dougherty [Wed, 4 Nov 2009 22:12:29 +0000 (14:12 -0800)]
am
00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '
00e44ef21777f32b67a8d51ee375cd290a3fb2d4' into eclair
* commit '
00e44ef21777f32b67a8d51ee375cd290a3fb2d4':
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Android (Google) Code Review [Wed, 4 Nov 2009 22:04:41 +0000 (17:04 -0500)]
Merge change I54545dfd into eclair-sdk
* changes:
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Christopher Tate [Wed, 4 Nov 2009 19:49:08 +0000 (11:49 -0800)]
Fix #
2176803 - restores from userdebug to user builds not working
The underlying issue is that ordinarily, the restore mechanism checks the
signature block of the package which uploaded the restore data against the
signature of the package on-device that will be handling the restore. This is
to ensure that the restore goes to the "same" application as the one that
uploaded it.
However, applications bundled on the system partition as part of the device
build are signed not with a permanent, app-identifying signature, but rather
with the device's signature block, which is different for each kind of device
and potentially between kinds of build for the same device. That renders the
stored backup data unusable when changing devices / builds / etc.
This change works around the problem by explicitly privileging applications that
reside on the system partition: they have been built into the device, and so
are trusted to be able to handle data that is marked as coming from its package
name.
Change-Id: I561011bce2b54cff3e695e82e7544b126b6ac31e
Mathias Agopian [Wed, 4 Nov 2009 21:14:59 +0000 (13:14 -0800)]
am
9a54d7dd: Merge change Ibbf945f3 into eclair
Merge commit '
9a54d7dddcbc982d644c627693dc39fb2cb5c0fb' into eclair-mr2
* commit '
9a54d7dddcbc982d644c627693dc39fb2cb5c0fb':
fix [
2236832] software OpenGL ES driver doesn't work on sholes
Android (Google) Code Review [Wed, 4 Nov 2009 20:45:39 +0000 (15:45 -0500)]
Merge change Ibbf945f3 into eclair
* changes:
fix [
2236832] software OpenGL ES driver doesn't work on sholes
Brett Chabot [Wed, 4 Nov 2009 20:05:45 +0000 (12:05 -0800)]
am
c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '
c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-mr2
* commit '
c20fc77c5a2bb8483f2e6e8b4064853804502365':
Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Jean-Michel Trivi [Wed, 4 Nov 2009 20:05:34 +0000 (12:05 -0800)]
am
7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '
7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-mr2
* commit '
7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
Add new audio sources to support the A1026 recording configurations.
Android (Google) Code Review [Wed, 4 Nov 2009 19:56:14 +0000 (14:56 -0500)]
Merge change Iefd4a388 into eclair
* changes:
Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Android (Google) Code Review [Wed, 4 Nov 2009 18:33:27 +0000 (13:33 -0500)]
Merge change I6bce6d87 into eclair-mr2
* changes:
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
Android (Google) Code Review [Wed, 4 Nov 2009 18:33:13 +0000 (13:33 -0500)]
Merge change I313953dc into eclair-mr2
* changes:
Support raw audio sources in MediaPlayerImpl.
Android (Google) Code Review [Wed, 4 Nov 2009 18:33:02 +0000 (13:33 -0500)]
Merge change I6f6bf3d8 into eclair-mr2
* changes:
Support raw audio sources in stagefright commandline tool.
Android (Google) Code Review [Wed, 4 Nov 2009 18:32:46 +0000 (13:32 -0500)]
Merge change I5126e183 into eclair-mr2
* changes:
Fix MP3Extractor duration overflows...
Android (Google) Code Review [Wed, 4 Nov 2009 16:49:25 +0000 (11:49 -0500)]
Merge change I6869df3a into eclair
* changes:
Add new audio sources to support the A1026 recording configurations.
Mike Lockwood [Wed, 4 Nov 2009 14:10:37 +0000 (06:10 -0800)]
am
27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '
27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116' into eclair-mr2
* commit '
27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116':
PowerManagerService: Fix manual brightness mode.
Romain Guy [Wed, 4 Nov 2009 14:10:26 +0000 (06:10 -0800)]
am
e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit '
e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356' into eclair-mr2
* commit '
e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356':
Make sure we relayout the TextView when the text changes and marquee is enabled.
Mike Lockwood [Wed, 4 Nov 2009 13:57:07 +0000 (08:57 -0500)]
PowerManagerService: Fix manual brightness mode.
Change-Id: I10aec64e3f7ae2715475b9797565747295c19a00
Signed-off-by: Mike Lockwood <lockwood@android.com>
Daisuke Miyakawa [Wed, 4 Nov 2009 02:41:50 +0000 (11:41 +0900)]
Make test compontent support multiple vCard input.
Internal issue number:
2195990
Mathias Agopian [Wed, 4 Nov 2009 04:38:08 +0000 (20:38 -0800)]
fix [
2236832] software OpenGL ES driver doesn't work on sholes
make sure to not pass our fake handles to the real gralloc
Jean-Michel Trivi [Wed, 4 Nov 2009 03:43:21 +0000 (19:43 -0800)]
Add new audio sources to support the A1026 recording configurations.
Romain Guy [Wed, 4 Nov 2009 01:21:04 +0000 (17:21 -0800)]
Make sure we relayout the TextView when the text changes and marquee is enabled.
Bug #
2192881.
Change-Id: Iffc2d15947a11974d9dc175740e3a5489cd43d21
Android (Google) Code Review [Wed, 4 Nov 2009 00:13:07 +0000 (19:13 -0500)]
Merge change I202c3106 into eclair-mr2
* changes:
Make ContentValuesBuilder a separate file.
Daisuke Miyakawa [Wed, 4 Nov 2009 00:09:10 +0000 (09:09 +0900)]
Make ContentValuesBuilder a separate file.
Internal issue number:
2195990
Android (Google) Code Review [Wed, 4 Nov 2009 00:03:17 +0000 (19:03 -0500)]
Merge change I33909a6a into eclair-mr2
* changes:
Do not scroll the title bar off screen until the page finishes loading.
Jason Sams [Wed, 4 Nov 2009 00:02:21 +0000 (16:02 -0800)]
am
decc139b: Merge change I7a824efc into eclair
Merge commit '
decc139b232721ea1b0521d144521c8082636f0c' into eclair-mr2
* commit '
decc139b232721ea1b0521d144521c8082636f0c':
Support applications changing the surface attached to the RS.
Leon Scroggins [Mon, 2 Nov 2009 22:50:54 +0000 (14:50 -0800)]
Do not scroll the title bar off screen until the page finishes loading.
Fix http://b/issue?id=
2139418
Andreas Huber [Wed, 4 Nov 2009 00:00:58 +0000 (16:00 -0800)]
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
Andreas Huber [Wed, 4 Nov 2009 00:00:22 +0000 (16:00 -0800)]
Support raw audio sources in MediaPlayerImpl.
Andreas Huber [Tue, 3 Nov 2009 23:59:13 +0000 (15:59 -0800)]
Support raw audio sources in stagefright commandline tool.
Andreas Huber [Tue, 3 Nov 2009 23:58:35 +0000 (15:58 -0800)]
Fix MP3Extractor duration overflows...
Android (Google) Code Review [Tue, 3 Nov 2009 23:56:03 +0000 (18:56 -0500)]
Merge change I7a824efc into eclair
* changes:
Support applications changing the surface attached to the RS.
OSDN Git Service
