1159 Commits

Author SHA1 Message Date
Dave Sparks
3c256cf321 More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback. 2009-12-07 13:01:01 -08:00
Dave Sparks
5ac5cd7300 am 9d5b7aca: Merge change Ic0e3ddf8 into eclair-mr2
Merge commit '9d5b7aca742f44e4b16db66a4a372eb71325470f' into eclair-mr2-plus-aosp

* commit '9d5b7aca742f44e4b16db66a4a372eb71325470f':
  Remove unused Java object reference in native SoundPool code.
2009-12-07 12:50:55 -08:00
Dave Sparks
c0e3ddf8f2 Remove unused Java object reference in native SoundPool code. 2009-12-07 12:36:20 -08:00
Andreas Huber
2109e68011 am 8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Merge commit '8c7ab034692eea550b97bebd7746e1a82735bbbd' into eclair-mr2-plus-aosp

* commit '8c7ab034692eea550b97bebd7746e1a82735bbbd':
  Fixing the build, only instantiate the software aac decoder in full stagefright builds.
2009-12-07 11:30:48 -08:00
Andreas Huber
8c7ab03469 Fixing the build, only instantiate the software aac decoder in full stagefright builds. 2009-12-07 11:23:44 -08:00
Andreas Huber
81a005d070 am 73abc2ea: Merge change I9c6e1f90 into eclair-mr2
Merge commit '73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a' into eclair-mr2-plus-aosp

* commit '73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a':
  Initial check in of stagefright software AAC decoder based on PV source code.
2009-12-07 11:06:20 -08:00
Eric Laurent
e30bae7f8e am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1' into eclair-mr2-plus-aosp

* commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:06:15 -08:00
Yu Shan Emily Lau
a3d15d3b01 am 8e6d79e2: am 8445f367: Merge change Ibb9b1de1 into eclair
Merge commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477' into eclair-mr2-plus-aosp

* commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477':
  1) Capture the start memory before the test started
2009-12-07 11:06:09 -08:00
Eric Laurent
a4dde1da5f am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-plus-aosp

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:42 -08:00
Android (Google) Code Review
73abc2ea4c Merge change I9c6e1f90 into eclair-mr2
* changes:
  Initial check in of stagefright software AAC decoder based on PV source code.
2009-12-07 11:03:28 -08:00
Eric Laurent
b8341cf7c8 am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:17 -08:00
Andreas Huber
dacaa73ae5 Initial check in of stagefright software AAC decoder based on PV source code. 2009-12-07 11:02:28 -08:00
Android (Google) Code Review
6d42d80653 Merge change I9cc489a2 into eclair
* changes:
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:00:54 -08:00
Yu Shan Emily Lau
8e6d79e2b5 am 8445f367: Merge change Ibb9b1de1 into eclair
Merge commit '8445f367070514dce3154be73827107b8a93f234' into eclair-mr2

* commit '8445f367070514dce3154be73827107b8a93f234':
  1) Capture the start memory before the test started
2009-12-07 10:54:38 -08:00
Yu Shan Emily Lau
6d58cf0d3d am 8445f367: Merge change Ibb9b1de1 into eclair
Merge commit '8445f367070514dce3154be73827107b8a93f234' into eclair-plus-aosp

* commit '8445f367070514dce3154be73827107b8a93f234':
  1) Capture the start memory before the test started
2009-12-07 10:54:02 -08:00
Android (Google) Code Review
8445f36707 Merge change Ibb9b1de1 into eclair
* changes:
  1) Capture the start memory before the test started 2) Report the mem diff to zero if it is negative.
2009-12-07 10:51:16 -08:00
Andreas Huber
f553a58425 am 5921fb51: Merge change I91eb0354 into eclair-mr2
Merge commit '5921fb51e0219ddd7cad439a73495f320c57d50e' into eclair-mr2-plus-aosp

* commit '5921fb51e0219ddd7cad439a73495f320c57d50e':
  Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
2009-12-07 10:01:06 -08:00
Andreas Huber
91eb035404 Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway. 2009-12-07 09:43:00 -08:00
Eric Laurent
9cc489a219 Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Fixed AudioFlinger::openInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to openOutput().
Modified RecordThread start procedure so that a failure occuring during the first read from audio input stream is detected and causes
the record start to fail.
Modified RecordThread stop procedure to make sure that audio input stream fd is closed before we exit the stop function.

Fixed AudioRecord JAVA and JNI implementation to take status of native AudioRecord::start() into account
and not change mRecordingState to RECORDSTATE_RECORDING if start fails.
2009-12-07 05:37:47 -08:00
Yu Shan Emily Lau
30daf09cb6 1) Capture the start memory before the test started
2) Report the mem diff to zero if it is negative.
2009-12-04 14:15:59 -08:00
Andreas Huber
5d676ad5d9 am 52f410e2: Merge change Ifef6435a into eclair-mr2
Merge commit '52f410e2ebba103220cffce05b895f0c38a56665' into eclair-mr2-plus-aosp

* commit '52f410e2ebba103220cffce05b895f0c38a56665':
  Enable proper cleanup of OMX nodes managed through stagefright.
2009-12-04 13:41:15 -08:00
Android (Google) Code Review
52f410e2eb Merge change Ifef6435a into eclair-mr2
* changes:
  Enable proper cleanup of OMX nodes managed through stagefright.
2009-12-04 13:36:57 -08:00
Andreas Huber
fef6435a06 Enable proper cleanup of OMX nodes managed through stagefright. 2009-12-04 12:52:40 -08:00
Ray Chen
840459e843 am da324195: am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe'

* commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 12:08:00 -08:00
Ray Chen
da32419584 am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp

* commit '8a576620cdc7257fc026026c77f7c946bfb760d1':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 12:02:04 -08:00
Ray Chen
d9fae01d5a am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-plus-aosp

* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 11:57:34 -08:00
Ray Chen
8a576620cd am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2

* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
  Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 11:57:10 -08:00
Ray Chen
052d9c8b41 Images.Media.DATE_TAKEN should be in milliseconds.
http://b/2297371
2009-12-04 11:51:25 -08:00
Naveen Kalla
7570576e7d am f345a094: am 104d3f75: Merge change I6c84d731 into eclair-mr2
Merge commit 'f345a094e90be664f7390d12d505a052ac4b064f'

* commit 'f345a094e90be664f7390d12d505a052ac4b064f':
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
2009-12-04 04:32:33 -08:00
Andreas Huber
8f8e652715 am f4eb754b: am 2a428fd4: Merge change I85e5d39e into eclair-mr2
Merge commit 'f4eb754b1810a60e640401396c1f9a10be65dffa'

* commit 'f4eb754b1810a60e640401396c1f9a10be65dffa':
  Two more uses of strlcpy that break the sim build. Now fixed.
2009-12-04 04:30:40 -08:00
Scott Main
6eacdea7af am 06ef1d21: am 9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2
Merge commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17'

* commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17':
  Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
2009-12-04 04:30:21 -08:00
Andreas Huber
d1a8532c84 am b8fb6c0b: am 8d670d34: Merge change I1f1c7bad into eclair-mr2
Merge commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4'

* commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4':
  I accidentally broke this code while refactoring MediaScanner. This is the fix.
2009-12-04 04:28:22 -08:00
Andreas Huber
a3e509c2b7 am 9ee55cc1: am 2d6d609c: Merge change I74bf38a0 into eclair-mr2
Merge commit '9ee55cc1bc6878b243134a558d583786d9215958'

* commit '9ee55cc1bc6878b243134a558d583786d9215958':
  Squashed commit of the following:
2009-12-04 04:27:37 -08:00
Andreas Huber
54be356f74 am 874c508c: am bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit '874c508c5352936c0640317ef44b81c9b632dfd6'

* commit '874c508c5352936c0640317ef44b81c9b632dfd6':
  Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
2009-12-04 04:27:25 -08:00
Dave Sparks
87256a28fd am b06ecc40: am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2
Merge commit 'b06ecc401160c5906fd1f4c85f61163bc2875200'

* commit 'b06ecc401160c5906fd1f4c85f61163bc2875200':
  Remove old hack A/V sync hack that is no longer needed.
2009-12-04 04:26:18 -08:00
Ray Chen
ba343d6427 am 29d503c6: am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit '29d503c6cc9df7882859c689d23609a543b24d8a'

* commit '29d503c6cc9df7882859c689d23609a543b24d8a':
  Fix timezone issue to comply with EXIF standard.
2009-12-04 04:25:49 -08:00
Naveen Kalla
f345a094e9 am 104d3f75: Merge change I6c84d731 into eclair-mr2
Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp

* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
2009-12-03 20:11:07 -08:00
Android (Google) Code Review
104d3f755e Merge change I6c84d731 into eclair-mr2
* changes:
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
2009-12-03 20:03:59 -08:00
Andreas Huber
f4eb754b18 am 2a428fd4: Merge change I85e5d39e into eclair-mr2
Merge commit '2a428fd463431e2b3d3680faf2e9640989ca7791' into eclair-mr2-plus-aosp

* commit '2a428fd463431e2b3d3680faf2e9640989ca7791':
  Two more uses of strlcpy that break the sim build. Now fixed.
2009-12-03 16:53:27 -08:00
Scott Main
06ef1d2104 am 9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2
Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp

* commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e':
  Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
2009-12-03 16:51:20 -08:00
Andreas Huber
b8fb6c0bd8 am 8d670d34: Merge change I1f1c7bad into eclair-mr2
Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp

* commit '8d670d345893fb9b9566f6b8c20202b77d4d211a':
  I accidentally broke this code while refactoring MediaScanner. This is the fix.
2009-12-03 16:44:26 -08:00
Andreas Huber
9ee55cc1bc am 2d6d609c: Merge change I74bf38a0 into eclair-mr2
Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp

* commit '2d6d609c9ede7ed8924001df00af9c13effab8ad':
  Squashed commit of the following:
2009-12-03 16:40:04 -08:00
Andreas Huber
874c508c53 am bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a' into eclair-mr2-plus-aosp

* commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a':
  Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
2009-12-03 16:39:27 -08:00
Dave Sparks
b06ecc4011 am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2
Merge commit '7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp

* commit '7c09a0ff365d6df96e880422a7b389ddf63401da':
  Remove old hack A/V sync hack that is no longer needed.
2009-12-03 16:34:07 -08:00
Ray Chen
29d503c6cc am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497' into eclair-mr2-plus-aosp

* commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497':
  Fix timezone issue to comply with EXIF standard.
2009-12-03 16:31:56 -08:00
Andreas Huber
85e5d39e60 Two more uses of strlcpy that break the sim build. Now fixed. 2009-12-03 16:22:52 -08:00
Andreas Huber
805cc709b7 Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build. 2009-12-03 16:07:05 -08:00
Andreas Huber
1f1c7bad42 I accidentally broke this code while refactoring MediaScanner. This is the fix. 2009-12-03 15:45:53 -08:00
Android (Google) Code Review
2d6d609c9e Merge change I74bf38a0 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-12-03 13:27:08 -08:00
Andreas Huber
bfb9fb143b Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore. 2009-12-03 13:21:54 -08:00