Commit Graph

597 Commits

Author SHA1 Message Date
Doug Kwan
b1bb6cfe91 Add back missing shared libraries used in executables in link commands. These
executables have calls to some shared libraries without explicitly linking
them.  Currently it works as linker links these libraries via dependencies of
other libraries.  This is fragile and not the right thing to do.
2009-10-04 19:27:57 -07:00
Dianne Hackborn
df197471cc am 943c8e7d: am 29e4a3c5: Update from API review.
Merge commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae'

* commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae':
  Update from API review.
2009-10-01 13:53:46 -07:00
Ray Chen
6a1262e210 am a6715ca6: am f09edd60: Merge change Id60fa26a into eclair
Merge commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa'

* commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa':
  Fix issue 2152541	thumbnail images stretched.
2009-10-01 13:51:07 -07:00
Eric Laurent
554d35ccbd am 46c5fdf6: am 3f56d21b: Merge change I89e74ba1 into eclair
Merge commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15'

* commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15':
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
2009-10-01 13:43:31 -07:00
Jianhong Jiang
0cdb0e7637 am 722eba00: am 37b0f279: Merge change I999f1aeb into eclair
Merge commit '722eba008c20d545ff8f17584cda282ab2800e29'

* commit '722eba008c20d545ff8f17584cda282ab2800e29':
  Remove audio latency fudge factor 96 msec.
2009-10-01 11:51:54 -07:00
Yu Shan Emily Lau
f2496dc8b9 am f1fa1eac: am edd942c2: Merge change I55a6ac8c into eclair
Merge commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11'

* commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11':
  Fixed the long recorder time and reduce the number of loops.
2009-10-01 11:49:46 -07:00
Chih-Chung Chang
1c628eba63 am 41293323: am 8bbba0e3: Merge change If5722b3f into eclair
Merge commit '412933234ad114c0fbb237f068b07821afb6e484'

* commit '412933234ad114c0fbb237f068b07821afb6e484':
  Dont NPE if the thumbnail file cannot be opened.
2009-10-01 11:42:27 -07:00
Eric Laurent
f4a764bf08 am efc42d3a: am 7d987180: Merge change I19f2928b into eclair
Merge commit 'efc42d3a5bff6b58b3439b50f318f43c7c1ea1ad'

* commit 'efc42d3a5bff6b58b3439b50f318f43c7c1ea1ad':
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-10-01 11:39:08 -07:00
James Dong
e8b93da7f7 am b8bf70ac: am 4c232c5b: Merge change Idd16976f into eclair
Merge commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2'

* commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2':
  Fix some metadata retriever issues:
2009-10-01 11:35:55 -07:00
Ray Chen
6dd52bbf2d am 06e5b766: am 0167263b: Merge change Ide90d0cc into eclair
Merge commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477'

* commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477':
  Unify Java NIO to read/write MiniThumbFile.
2009-10-01 11:35:35 -07:00
Dianne Hackborn
943c8e7de6 am 29e4a3c5: Update from API review.
Merge commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba' into eclair-plus-aosp

* commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba':
  Update from API review.
2009-09-30 23:27:41 -07:00
Dianne Hackborn
29e4a3c566 Update from API review.
Change-Id: I16b1c566f91167aac9615ac59dd297a154c828ea
2009-09-30 23:21:02 -07:00
Ray Chen
a6715ca6f9 am f09edd60: Merge change Id60fa26a into eclair
Merge commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c' into eclair-plus-aosp

* commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c':
  Fix issue 2152541	thumbnail images stretched.
2009-09-30 22:18:41 -07:00
Android (Google) Code Review
f09edd6037 Merge change Id60fa26a into eclair
* changes:
  Fix issue 2152541	thumbnail images stretched.
2009-10-01 01:12:35 -04:00
Ray Chen
ef093cd6c4 Fix issue 2152541 thumbnail images stretched. 2009-09-30 22:05:33 -07:00
Eric Laurent
46c5fdf60b am 3f56d21b: Merge change I89e74ba1 into eclair
Merge commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e' into eclair-plus-aosp

* commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e':
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
2009-09-30 21:16:47 -07:00
Eric Laurent
89e74ba141 Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
The problem comes from the fact that the AudioSystem callback indicating that the media server is active again is ignored if it is received before the delayed message indicating media server death. This happens if another application or service running in the system server process makes a request to the AudioSystem in the interval between the death of the media server and the reception of the corresponding delayed message.

The fix consists in resetting mMediaServerOk flags immediately when the death callback is received and not when the delayed message is received.
2009-09-30 18:26:36 -07:00
Jianhong Jiang
722eba008c am 37b0f279: Merge change I999f1aeb into eclair
Merge commit '37b0f279a6a237ae366c4861cde3f774f5ab811c' into eclair-plus-aosp

* commit '37b0f279a6a237ae366c4861cde3f774f5ab811c':
  Remove audio latency fudge factor 96 msec.
2009-09-29 23:23:08 -07:00
Android (Google) Code Review
37b0f279a6 Merge change I999f1aeb into eclair
* changes:
  Remove audio latency fudge factor 96 msec.
2009-09-30 02:18:15 -04:00
Jianhong Jiang
999f1aebf7 Remove audio latency fudge factor 96 msec. 2009-09-29 23:12:39 -07:00
Yu Shan Emily Lau
f1fa1eacaa am edd942c2: Merge change I55a6ac8c into eclair
Merge commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69' into eclair-plus-aosp

* commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69':
  Fixed the long recorder time and reduce the number of loops.
2009-09-29 22:13:57 -07:00
Android (Google) Code Review
edd942c2de Merge change I55a6ac8c into eclair
* changes:
  Fixed the long recorder time and reduce the number of loops.
2009-09-30 01:10:54 -04:00
Yu Shan Emily Lau
55a6ac8c54 Fixed the long recorder time and reduce the number of loops. 2009-09-29 21:38:39 -07:00
Chih-Chung Chang
412933234a am 8bbba0e3: Merge change If5722b3f into eclair
Merge commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0' into eclair-plus-aosp

* commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0':
  Dont NPE if the thumbnail file cannot be opened.
2009-09-29 17:00:24 -07:00
Android (Google) Code Review
8bbba0e35b Merge change If5722b3f into eclair
* changes:
  Dont NPE if the thumbnail file cannot be opened.
2009-09-29 19:52:23 -04:00
Chih-Chung Chang
f5722b3f22 Dont NPE if the thumbnail file cannot be opened. 2009-09-29 16:31:16 -07:00
Eric Laurent
efc42d3a5b am 7d987180: Merge change I19f2928b into eclair
Merge commit '7d9871805beef4ea5e319f1a11ab32f610031845' into eclair-plus-aosp

* commit '7d9871805beef4ea5e319f1a11ab32f610031845':
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-09-29 15:18:10 -07:00
Android (Google) Code Review
7d9871805b Merge change I19f2928b into eclair
* changes:
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-09-29 18:12:54 -04:00
Eric Laurent
a2ef57dba9 Fix issue 2141503: Keyclick sound doesn't honor volume settings.
Use music stream volume minus 3 dB for sound effects if volume is not explicitly requested by application.
2009-09-29 15:00:40 -07:00
James Dong
b8bf70acee am 4c232c5b: Merge change Idd16976f into eclair
Merge commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068' into eclair-plus-aosp

* commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068':
  Fix some metadata retriever issues:
2009-09-29 13:32:28 -07:00
Ray Chen
06e5b76667 am 0167263b: Merge change Ide90d0cc into eclair
Merge commit '0167263bf457164a17f612ec551313f1b9e42972' into eclair-plus-aosp

* commit '0167263bf457164a17f612ec551313f1b9e42972':
  Unify Java NIO to read/write MiniThumbFile.
2009-09-29 13:32:14 -07:00
Android (Google) Code Review
4c232c5b3f Merge change Idd16976f into eclair
* changes:
  Fix some metadata retriever issues: 1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource 2. cached the mode so that setMode can still be called before setDataSource.    mRetriever won't be initialized until data source is set; thus we have to do this
2009-09-29 16:27:27 -04:00
Ray Chen
ecc97cc949 Unify Java NIO to read/write MiniThumbFile. 2009-09-29 13:11:20 -07:00
James Dong
67fc234a2f Fix some metadata retriever issues:
1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource
2. cached the mode so that setMode can still be called before setDataSource.
   mRetriever won't be initialized until data source is set; thus we have to do this
2009-09-29 12:43:12 -07:00
James Dong
d4a9711057 am 9365c8fa: am 99638e74: Merge change 27466 into eclair
Merge commit '9365c8fa7c66c62de98b859f08c881ea2ad65980'

* commit '9365c8fa7c66c62de98b859f08c881ea2ad65980':
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:53:55 -07:00
James Dong
9365c8fa7c am 99638e74: Merge change 27466 into eclair
Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp

* commit '99638e747251929191f7773d2a81bbea223f1e09':
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:49:22 -07:00
Android (Google) Code Review
99638e7472 Merge change 27466 into eclair
* changes:
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 14:40:34 -04:00
James Dong
525ad18663 Turn on thubmnail capture unit test for media metadata retriever 2009-09-28 10:57:17 -07:00
Marco Nelissen
3089841a4d am 14e8e988: am 7d973514: Merge change 27449 into eclair
Merge commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660'

* commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660':
  Always consider m4a files as audio, even when they contain a video track.
2009-09-28 10:07:30 -07:00
Marco Nelissen
7425821ff0 am aa507136: am dba93b68: Merge change 27318 into eclair
Merge commit 'aa507136493b24a899b270367b08a7158085c9b8'

* commit 'aa507136493b24a899b270367b08a7158085c9b8':
  Check that playlist entries refer to a row in the audio table.
2009-09-28 10:04:50 -07:00
Marco Nelissen
14e8e988cf am 7d973514: Merge change 27449 into eclair
Merge commit '7d9735142f75c3bf30b420fdd006dc356f32fede' into eclair-plus-aosp

* commit '7d9735142f75c3bf30b420fdd006dc356f32fede':
  Always consider m4a files as audio, even when they contain a video track.
2009-09-28 09:27:10 -07:00
Android (Google) Code Review
7d9735142f Merge change 27449 into eclair
* changes:
  Always consider m4a files as audio, even when they contain a video track.
2009-09-28 12:24:08 -04:00
Marco Nelissen
1851db6804 Always consider m4a files as audio, even when they contain a video track. 2009-09-28 09:03:33 -07:00
Ray Chen
df6276ad40 am 1055e0d8: am cc96652c: Remove fflush when storing thumbanil to sdcard.
Merge commit '1055e0d830f9e594721ee8e64fa3f2c29dd163dd'

* commit '1055e0d830f9e594721ee8e64fa3f2c29dd163dd':
  Remove fflush when storing thumbanil to sdcard.
2009-09-28 01:13:29 -07:00
Marco Nelissen
32eb22c03a am c46f886b: am 0faa5c6c: Merge change 27271 into eclair
Merge commit 'c46f886b63772be33c6e6864475140606a79e126'

* commit 'c46f886b63772be33c6e6864475140606a79e126':
  Only scan windows media files when those codecs are enabled.
2009-09-28 01:11:59 -07:00
Marco Nelissen
aa50713649 am dba93b68: Merge change 27318 into eclair
Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp

* commit 'dba93b68326f139f669aefa6770d50daff032746':
  Check that playlist entries refer to a row in the audio table.
2009-09-27 19:50:49 -07:00
Android (Google) Code Review
dba93b6832 Merge change 27318 into eclair
* changes:
  Check that playlist entries refer to a row in the audio table.
2009-09-27 22:43:05 -04:00
Yu Shan Emily Lau
0a63934d97 am 20f8fcd9: am 7756cbee: Merge change 27073 into eclair
Merge commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63'

* commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63':
  Removed the device type checking
2009-09-27 15:42:30 -07:00
Marco Nelissen
d4f3586c93 Check that playlist entries refer to a row in the audio table. 2009-09-27 15:06:03 -07:00
Ray Chen
1055e0d830 am cc96652c: Remove fflush when storing thumbanil to sdcard.
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp

* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
  Remove fflush when storing thumbanil to sdcard.
2009-09-27 14:03:32 -07:00