Commit Graph

38903 Commits

Author SHA1 Message Date
Andreas Huber
dcaa220ff5 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.
2009-11-05 13:06:17 -08:00
Android (Google) Code Review
818a9cf827 Merge change Ia4eedace into eclair
* changes:
  Now that UseBuffer on this component is fixed, let's use it.
2009-11-05 16:01:50 -05:00
Daniel Sandler
c10300235a am eca41b31: Merge change Id1458b01 into eclair
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-plus-aosp

* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
  New live wallpaper API to expose author and description strings.
2009-11-05 13:00:39 -08:00
Android (Google) Code Review
eca41b31fb Merge change Id1458b01 into eclair
* changes:
  New live wallpaper API to expose author and description strings.
2009-11-05 15:53:25 -05:00
Jason Sams
0e27b5cadb Fix texture upload bug for narrow texture of less than 32bpp. 2009-11-05 12:44:58 -08:00
Xavier Ducrohet
91bb62f0dc New API 4 with new CDMA constants. 2009-11-05 12:41:10 -08:00
Daniel Sandler
18a509d8fa 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
2009-11-05 15:05:27 -05:00
Fred Quintana
3266c5f125 resolved conflicts for merge of f476c480 to eclair-mr2 2009-11-05 11:46:11 -08:00
Amith Yamasani
14fb81af28 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.
2009-11-05 11:41:58 -08:00
Android Code Review
1933504616 Merge change I9ff67a5f
* changes:
  LocationManagerService: Fix race when removing LocationListener
2009-11-05 11:36:48 -08:00
Jaikumar Ganesh
21d0dca33e 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
2009-11-05 11:30:18 -08:00
Fred Quintana
c4e0a22a5f am f476c480: Merge change I48cbd0bc into eclair
Merge commit 'f476c480cdf41be9989c3cfbc3b92038d11e7569' into eclair-plus-aosp

* commit 'f476c480cdf41be9989c3cfbc3b92038d11e7569':
  remove the SubscribedFeedsProvider since it has been moved to vendor/google
2009-11-05 11:24:29 -08:00
Android (Google) Code Review
f476c480cd Merge change I48cbd0bc into eclair
* changes:
  remove the SubscribedFeedsProvider since it has been moved to vendor/google
2009-11-05 14:15:54 -05:00
Vasu Nori
9e50993c84 am 99017975: am 195a507f: Merge change I272af007 into eclair-mr2
Merge commit '990179755525d01a7e005182d8ec04722c7fd396'

* commit '990179755525d01a7e005182d8ec04722c7fd396':
  a possible fix for the bug http://b/issue?id=2200637
2009-11-05 10:11:03 -08:00
Vasu Nori
9901797555 am 195a507f: Merge change I272af007 into eclair-mr2
Merge commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa' into eclair-mr2-plus-aosp

* commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa':
  a possible fix for the bug http://b/issue?id=2200637
2009-11-05 10:01:09 -08:00
Andreas Huber
a4eedace99 Now that UseBuffer on this component is fixed, let's use it. 2009-11-05 09:56:03 -08:00
Android (Google) Code Review
195a507fc3 Merge change I272af007 into eclair-mr2
* changes:
  a possible fix for the bug http://b/issue?id=2200637
2009-11-05 12:53:34 -05:00
Ravi K Yenduri
7b35fd7dd4 Capture failure of copybit->stretch() 2009-11-05 10:42:21 -06:00
The Android Automerger
dace6e60a1 Merge branch 'eclair' into eclair-release 2009-11-05 08:41:51 -08:00
Olivier Goutet
83387a484c Correction of an error in the setRotate method of the ColorMatrix class.
The matrix rotation params around the 2nd axis was not set correctly:

Initial matrix for axis 2 (green):
 cos 0 sin 0 0
  0  1  0  0 0
-sin 0  0  0 0
  0  0 cos 1 0

After correction:
 cos 0 -sin 0 0
  0  1   0  0 0
 sin 0  cos 0 0
  0  0   0  1 0
2009-11-05 14:48:03 +01:00
Wei-Ta Chen
c8990cb9bb am 940bc05b: am 97f96ef9: Merge change I7f9db307 into eclair-mr2
Merge commit '940bc05b38f5295b31fb80e820a98e32200e492f'

* commit '940bc05b38f5295b31fb80e820a98e32200e492f':
  Modify the behavior of createThumbnailForEXIF() to:
2009-11-05 02:01:40 -08:00
Eric Laurent
e7c6644778 am 653d5d41: am fcae6c71: am 67b69292: Merge change I93f500a5 into eclair
Merge commit '653d5d415c3447a4250120548bf32d1ee63fe36f'

* commit '653d5d415c3447a4250120548bf32d1ee63fe36f':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:01:30 -08:00
Wei-Ta Chen
940bc05b38 am 97f96ef9: Merge change I7f9db307 into eclair-mr2
Merge commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c' into eclair-mr2-plus-aosp

* commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c':
  Modify the behavior of createThumbnailForEXIF() to:
2009-11-05 01:55:59 -08:00
Eric Laurent
653d5d415c am fcae6c71: am 67b69292: Merge change I93f500a5 into eclair
Merge commit 'fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp

* commit 'fcae6c71794696a074cabf20beeb02fd87853e30':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 01:55:51 -08:00
Android (Google) Code Review
97f96ef9f7 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.
2009-11-05 04:49:46 -05:00
Wei-Ta Chen
6706caf937 Modify the behavior of createThumbnailForEXIF() to:
returning SizedThumbnailBitmap, which contains the downsampled
bitmap either from the thumbnail in EXIF or the full image.
2009-11-05 16:53:27 +08:00
Eric Laurent
d889f189b5 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:50 -08:00
Eric Laurent
fcae6c7179 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:33 -08:00
Android (Google) Code Review
67b692920c Merge change I93f500a5 into eclair
* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:55:26 -05:00
Eric Laurent
bda7469d9b 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.
2009-11-04 23:47:21 -08:00
James Dong
b1c85ec47a Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java 2009-11-04 23:00:09 -08:00
Daisuke Miyakawa
f53b829132 am 931203d4: am dc0f9efd: Merge change I0d442f0d into eclair-mr2
Merge commit '931203d4052ad9e02cc0a49b5d6b68c44e4d4072'

* commit '931203d4052ad9e02cc0a49b5d6b68c44e4d4072':
  Add tests for Japanization part of vCard.
2009-11-04 21:06:54 -08:00
Romain Guy
bbf3c24df9 am 4deb52f3: am 20777fae: am 584bce31: Merge change I09282f5b into eclair
Merge commit '4deb52f3c1a645ae2daa8dd31e72460ead2cd372'

* commit '4deb52f3c1a645ae2daa8dd31e72460ead2cd372':
  Fix the build (hopefully.)
2009-11-04 21:06:42 -08:00
Daisuke Miyakawa
931203d405 am dc0f9efd: Merge change I0d442f0d into eclair-mr2
Merge commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3' into eclair-mr2-plus-aosp

* commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3':
  Add tests for Japanization part of vCard.
2009-11-04 20:57:35 -08:00
Romain Guy
4deb52f3c1 am 20777fae: am 584bce31: Merge change I09282f5b into eclair
Merge commit '20777fae8757036d7d526cf74673d30993b77ac5' into eclair-mr2-plus-aosp

* commit '20777fae8757036d7d526cf74673d30993b77ac5':
  Fix the build (hopefully.)
2009-11-04 20:57:27 -08:00
Android (Google) Code Review
dc0f9efd35 Merge change I0d442f0d into eclair-mr2
* changes:
  Add tests for Japanization part of vCard.
2009-11-04 23:49:46 -05:00
Daisuke Miyakawa
4fe2c57c3c Add tests for Japanization part of vCard.
Fix several bugs around name construction.

Internal issue number: 2195990
2009-11-05 13:47:48 +09:00
Romain Guy
20777fae87 am 584bce31: Merge change I09282f5b into eclair
Merge commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6' into eclair-mr2

* commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6':
  Fix the build (hopefully.)
2009-11-04 18:40:38 -08:00
Romain Guy
3d68d43d20 am 584bce31: Merge change I09282f5b into eclair
Merge commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6' into eclair-plus-aosp

* commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6':
  Fix the build (hopefully.)
2009-11-04 18:40:13 -08:00
Android (Google) Code Review
584bce31b6 Merge change I09282f5b into eclair
* changes:
  Fix the build (hopefully.)
2009-11-04 21:33:27 -05:00
Romain Guy
cca9e279f8 Fix the build (hopefully.)
Change-Id: I09282f5b4ff8b97f6beb1073223d8a943d3ecef4
2009-11-04 18:32:48 -08:00
Nick Pelly
18512723cf am 2806a8f5: am 8cf6a2ea: am 61b01632: Merge change I9490271c into eclair
Merge commit '2806a8f57bfc0a311ddaa9e31a21662ca54ff5e2'

* commit '2806a8f57bfc0a311ddaa9e31a21662ca54ff5e2':
  Add BluetoothDevice to SDK AIDL list.
2009-11-04 17:57:02 -08:00
Eric Olsen
2132200dc5 am d6210cde: am e772eb7a: am 62335430: Merge change I4499ad72 into eclair
Merge commit 'd6210cdeb72bee9de12a9f69da9f2cd8011f37e0'

* commit 'd6210cdeb72bee9de12a9f69da9f2cd8011f37e0':
  Fix bad merge fixes build breakage.
2009-11-04 17:56:52 -08:00
Romain Guy
9ad1a218d7 am 77e68484: am 05abe8d0: am 131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '77e68484f5592e06ca1a881745070f7931641246'

* commit '77e68484f5592e06ca1a881745070f7931641246':
  Remove unused field and add new API to control the children drawing order.
2009-11-04 17:56:38 -08:00
Nick Pelly
2806a8f57b am 8cf6a2ea: am 61b01632: Merge change I9490271c into eclair
Merge commit '8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d' into eclair-mr2-plus-aosp

* commit '8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d':
  Add BluetoothDevice to SDK AIDL list.
2009-11-04 17:46:43 -08:00
Eric Olsen
d6210cdeb7 am e772eb7a: am 62335430: Merge change I4499ad72 into eclair
Merge commit 'e772eb7af049b55c89241fae799569030c1f5570' into eclair-mr2-plus-aosp

* commit 'e772eb7af049b55c89241fae799569030c1f5570':
  Fix bad merge fixes build breakage.
2009-11-04 17:46:35 -08:00
Romain Guy
77e68484f5 am 05abe8d0: am 131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71' into eclair-mr2-plus-aosp

* commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71':
  Remove unused field and add new API to control the children drawing order.
2009-11-04 17:46:24 -08:00
Nick Pelly
8cf6a2eacf am 61b01632: Merge change I9490271c into eclair
Merge commit '61b01632915181fcf725dc4933cad8c81e700115' into eclair-mr2

* commit '61b01632915181fcf725dc4933cad8c81e700115':
  Add BluetoothDevice to SDK AIDL list.
2009-11-04 17:37:07 -08:00
Eric Olsen
e772eb7af0 am 62335430: Merge change I4499ad72 into eclair
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2

* commit '62335430b05d92ad2255bf20b76b35e012b385c9':
  Fix bad merge fixes build breakage.
2009-11-04 17:36:59 -08:00
Romain Guy
05abe8d01d 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.
2009-11-04 17:36:46 -08:00