15023 Commits

Author SHA1 Message Date
Dan Egnor
0257fec32d am 82fa9c46: am b59573cf: Merge change I06fb08c4 into eclair-mr2
Merge commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9'

* commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9':
  Expand db_operation logging to prepare for widespread sample collection:
2009-11-23 19:20:15 -08:00
Dan Egnor
82fa9c46cf am b59573cf: Merge change I06fb08c4 into eclair-mr2
Merge commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983' into eclair-mr2-plus-aosp

* commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983':
  Expand db_operation logging to prepare for widespread sample collection:
2009-11-23 19:14:23 -08:00
Android (Google) Code Review
b59573cf53 Merge change I06fb08c4 into eclair-mr2
* changes:
  Expand db_operation logging to prepare for widespread sample collection: - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)
2009-11-23 19:10:17 -08:00
Dan Egnor
12311959c6 Expand db_operation logging to prepare for widespread sample collection:
- always enable the log, but subsample for queries faster than 100ms
- add information about whether it's blocking a main thread
- log the entire sql (have not yet added quoted-string-stripping)
2009-11-23 18:26:14 -08:00
Dave Sparks
719ab50b7b am 94481bd7: am f52ebbfc: am 9a219519: Merge change I2d32301b into eclair
Merge commit '94481bd75541b227eb4325a3db5ee871cdc2b2dc'

* commit '94481bd75541b227eb4325a3db5ee871cdc2b2dc':
  Add 4 new notification sounds.
2009-11-23 17:55:36 -08:00
Dave Sparks
94481bd755 am f52ebbfc: am 9a219519: Merge change I2d32301b into eclair
Merge commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb' into eclair-mr2-plus-aosp

* commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb':
  Add 4 new notification sounds.
2009-11-23 17:50:22 -08:00
Dave Sparks
f52ebbfc5d am 9a219519: Merge change I2d32301b into eclair
Merge commit '9a219519786ce6702c57ec1f1bffe2260fc663a9' into eclair-mr2

* commit '9a219519786ce6702c57ec1f1bffe2260fc663a9':
  Add 4 new notification sounds.
2009-11-23 17:45:57 -08:00
Android (Google) Code Review
9a21951978 Merge change I2d32301b into eclair
* changes:
  Add 4 new notification sounds.
2009-11-23 17:42:41 -08:00
Dave Sparks
2d32301be0 Add 4 new notification sounds. 2009-11-23 17:26:37 -08:00
Jason Sams
79e2646504 am 9f96a37a: am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair
Merge commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0'

* commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:29:46 -08:00
Dianne Hackborn
9e7cd27daf am 01d9fe1d: am cfe90ce4: am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '01d9fe1d064af2394c82648c0ec7ffa721353889'

* commit '01d9fe1d064af2394c82648c0ec7ffa721353889':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 16:29:11 -08:00
Jason Sams
9f96a37aab am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair
Merge commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7' into eclair-mr2-plus-aosp

* commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:24:17 -08:00
Jason Sams
6a2500a330 am 39dbb099: Merge change I36176536 into eclair
Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2

* commit '39dbb099974f2c8e1154f28123e53be14c47a76d':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:19:37 -08:00
Android (Google) Code Review
39dbb09997 Merge change I36176536 into eclair
* changes:
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:14:13 -08:00
Andreas Huber
f0de482c02 am 4bbdf934: am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '4bbdf934458253dbdb331d2b614a085256ba8d6c'

* commit '4bbdf934458253dbdb331d2b614a085256ba8d6c':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2009-11-23 16:07:26 -08:00
Andreas Huber
2fadaf5634 am 5884468b: am 1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5'

* commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 16:06:56 -08:00
Andreas Huber
19cbbb8b0f am d1f11997: am e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit 'd1f11997e5845938b50a58dd3aecbc966ee00373'

* commit 'd1f11997e5845938b50a58dd3aecbc966ee00373':
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 16:06:25 -08:00
Dirk Dougherty
5a25769584 am dd6a5895: am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979'

* commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 16:05:56 -08:00
Eric Olsen
111e602095 am f7a57218: am b2796da2: am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit 'f7a5721895ee95f4c7b58e8993fb03ec017dab85'

* commit 'f7a5721895ee95f4c7b58e8993fb03ec017dab85':
  Add logging of headset events to help debug issue.
2009-11-23 16:05:25 -08:00
Dianne Hackborn
01d9fe1d06 am cfe90ce4: am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84' into eclair-mr2-plus-aosp

* commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 16:03:16 -08:00
Dianne Hackborn
cfe90ce461 am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-mr2

* commit '05799981d8d930e0b929cdb99f9407e3ee18c142':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 15:58:18 -08:00
Dianne Hackborn
05799981d8 Fix issue #2281046: Size and pressure don't change
Change-Id: Iadc1d438a494bb1495ee6d93d0dd3b4a491a378f
2009-11-23 15:49:15 -08:00
Andreas Huber
4bbdf93445 am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp

* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2009-11-23 15:39:26 -08:00
Fred Quintana
be62ddd4ee resolved conflicts for merge of eb393ce8 to master 2009-11-23 15:36:25 -08:00
Jason Sams
361765361a Fix ref counting bug that could cause memory leak in allApps. 2009-11-23 15:28:55 -08:00
Andreas Huber
44e15c44ad Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now. 2009-11-23 15:14:44 -08:00
Andreas Huber
5884468b44 am 1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp

* commit '1f52229453c3df8eaeda64133bd332b01589354f':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 14:42:30 -08:00
Android (Google) Code Review
1f52229453 Merge change I24b0a95d into eclair-mr2
* changes:
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 14:39:03 -08:00
Andreas Huber
d1f11997e5 am e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e' into eclair-mr2-plus-aosp

* commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e':
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 14:31:25 -08:00
Dirk Dougherty
dd6a5895f1 am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp

* commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 14:31:01 -08:00
Eric Olsen
f7a5721895 am b2796da2: am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f' into eclair-mr2-plus-aosp

* commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f':
  Add logging of headset events to help debug issue.
2009-11-23 14:30:35 -08:00
Android (Google) Code Review
e71a640886 Merge change I1bceff91 into eclair-mr2
* changes:
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 14:26:46 -08:00
Andreas Huber
1bceff916a Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks. 2009-11-23 14:06:42 -08:00
Andreas Huber
24b0a95de7 The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps). 2009-11-23 14:04:48 -08:00
Dirk Dougherty
e0030418fd am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-mr2

* commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 13:55:50 -08:00
Eric Olsen
b2796da2ed am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-mr2

* commit '0d631b9b58db54bee58da717b38b8020bc3d0437':
  Add logging of headset events to help debug issue.
2009-11-23 13:55:25 -08:00
Fred Quintana
eb393ce8ee am 4174016d: Merge change I53e3a20e into eclair-mr2
Merge commit '4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp

* commit '4174016dbd043eda493e9cd1925ed84549c7b3c0':
  move SubscribedFeeds to GSF
2009-11-23 13:47:00 -08:00
Android (Google) Code Review
4174016dbd Merge change I53e3a20e into eclair-mr2
* changes:
  move SubscribedFeeds to GSF
2009-11-23 13:42:24 -08:00
Dirk Dougherty
bca9f1bbb3 sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Bug: 2160782
Change-Id: Ia576dc9b2312d89bbe194d94640c3cc79216067b
2009-11-23 13:23:46 -08:00
Android (Google) Code Review
0d631b9b58 Merge change Ie7096ebb into eclair
* changes:
  Add logging of headset events to help debug issue.
2009-11-23 13:20:46 -08:00
Scott Main
74765f6eb2 am ea5c440b: am 98c11248: am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit 'ea5c440b4fba2f2f21aa0db898db3ad27b2c8be8'

* commit 'ea5c440b4fba2f2f21aa0db898db3ad27b2c8be8':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:18:47 -08:00
Mike Lockwood
4ddc2ed883 am fa351d38: am e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit 'fa351d388d0441432f4e616ef87a5c97a088dd04'

* commit 'fa351d388d0441432f4e616ef87a5c97a088dd04':
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 13:18:19 -08:00
Fred Quintana
53e3a20e41 move SubscribedFeeds to GSF 2009-11-23 13:18:07 -08:00
Scott Main
ea5c440b4f am 98c11248: am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '98c11248becafa61d29aea8a7e10adf418a6c197' into eclair-mr2-plus-aosp

* commit '98c11248becafa61d29aea8a7e10adf418a6c197':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:14:01 -08:00
Mike Lockwood
fa351d388d am e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp

* commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a':
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 13:13:39 -08:00
Scott Main
98c11248be am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e' into eclair-mr2

* commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:09:17 -08:00
Eric Olsen
e7096ebba1 Add logging of headset events to help debug issue.
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-23 13:06:07 -08:00
Scott Main
3fa1cb059e am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '5e7f1fbe161d7015dde6e893351238749f906c8a' into eclair

* commit '5e7f1fbe161d7015dde6e893351238749f906c8a':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:04:27 -08:00
Android (Google) Code Review
5e7f1fbe16 Merge change Id2ee762d into eclair-sdk
* changes:
  droiddoc change: add flag to offline docs build to signal that we're building offline docs so that we do not generate all of the web pages for the sample apps source code.
2009-11-23 12:56:19 -08:00
Android (Google) Code Review
e5683369d2 Merge change I60dfecdc into eclair-mr2
* changes:
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 12:20:04 -08:00