12789 Commits

Author SHA1 Message Date
Android (Google) Code Review
48153e7f7f Merge change I064698b3 into eclair-mr2
* changes:
  Add wifi "HANGED" driver state triggering reload.
2009-10-23 15:02:35 -04:00
Wei Huang
76c8da2211 am 2c726389: am 45db67f2: Merge change I808651dc into eclair-mr2
Merge commit '2c726389fb4a6d3b9b3ab67063527b341079f9c4'

* commit '2c726389fb4a6d3b9b3ab67063527b341079f9c4':
  bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
2009-10-23 11:49:20 -07:00
Wei Huang
2c726389fb am 45db67f2: Merge change I808651dc into eclair-mr2
Merge commit '45db67f2e89341412613ea6b162dd0ad36f091c6' into eclair-mr2-plus-aosp

* commit '45db67f2e89341412613ea6b162dd0ad36f091c6':
  bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
2009-10-23 11:38:25 -07:00
Android (Google) Code Review
45db67f2e8 Merge change I808651dc into eclair-mr2
* changes:
  bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
2009-10-23 14:31:49 -04:00
Robert Greenwalt
f75aa36fc8 Add wifi "HANGED" driver state triggering reload.
The driver can now report to us that they are hosed and we'll shut
down wifi and restart it - only to be used as a last resort.

Also fixing synch problem with updateWifiState.

bug: 2173119
2009-10-23 11:12:47 -07:00
Andreas Huber
d437ac6a7c am d919aa74: am 9069aa31: Merge change I57515f33 into eclair-mr2
Merge commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af'

* commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af':
  Moving the individual extractor headers files to the private include directory.
2009-10-23 10:37:24 -07:00
Andreas Huber
9a12baf929 New API to instantiate a MediaExtractor given a URI and optional MIME type.
Also DataSources now must provide a method initCheck()
and DataSource::reat_at has been renamed to readAt to conform to
standard API naming guidelines.
2009-10-23 10:35:08 -07:00
Andreas Huber
d919aa7492 am 9069aa31: Merge change I57515f33 into eclair-mr2
Merge commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56' into eclair-mr2-plus-aosp

* commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56':
  Moving the individual extractor headers files to the private include directory.
2009-10-23 10:26:18 -07:00
Android (Google) Code Review
9069aa31ac Merge change I57515f33 into eclair-mr2
* changes:
  Moving the individual extractor headers files to the private include directory.
2009-10-23 13:20:22 -04:00
Andreas Huber
57515f334b Moving the individual extractor headers files to the private include directory. 2009-10-23 09:55:10 -07:00
Leon Scroggins
a6d36d81af am 79b60972: am f0990646: Merge change I1d96ca06 into eclair-mr2
Merge commit '79b609722ef2121368b2f40a0e67ac9fecc23b7c'

* commit '79b609722ef2121368b2f40a0e67ac9fecc23b7c':
  Show the soft keyboard when pressing center key/trackball on input field
2009-10-23 09:55:07 -07:00
Andreas Huber
0220192211 am f57b07df: am ad285430: Make stagefright a little less verbose. Fix heap corruption for real.
Merge commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9'

* commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9':
  Make stagefright a little less verbose. Fix heap corruption for real.
2009-10-23 09:54:51 -07:00
Andreas Huber
4601d30804 am 871e4ee8: am e8472900: Merge change Ie13526ad into eclair-mr2
Merge commit '871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc'

* commit '871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc':
  Prefer software decoders over hardware for thumbnail extraction.
2009-10-23 09:54:35 -07:00
Leon Scroggins
79b609722e am f0990646: Merge change I1d96ca06 into eclair-mr2
Merge commit 'f0990646d505ec06d400debe5fd5c895fcb02f13' into eclair-mr2-plus-aosp

* commit 'f0990646d505ec06d400debe5fd5c895fcb02f13':
  Show the soft keyboard when pressing center key/trackball on input field
2009-10-23 09:44:11 -07:00
Andreas Huber
f57b07dfa8 am ad285430: Make stagefright a little less verbose. Fix heap corruption for real.
Merge commit 'ad28543022101d0b01845e3f53dcd57e524816ef' into eclair-mr2-plus-aosp

* commit 'ad28543022101d0b01845e3f53dcd57e524816ef':
  Make stagefright a little less verbose. Fix heap corruption for real.
2009-10-23 09:43:54 -07:00
Andreas Huber
0371a4d783 am 1f04c836: am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2
Merge commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c'

* commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c':
  Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
2009-10-23 09:27:58 -07:00
Eric Laurent
37c72552ea am bae0d0d4: am 470687e2: am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Merge commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476'

* commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476':
  Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
2009-10-23 09:27:40 -07:00
Leon Scroggins
c5e7f55072 am 6e6dbc3f: am 1d60c5c1: Do not hide the cursor ring when clicking on an input field.
Merge commit '6e6dbc3f4dadb844b472529f51e356fd1bdc1aaa'

* commit '6e6dbc3f4dadb844b472529f51e356fd1bdc1aaa':
  Do not hide the cursor ring when clicking on an input field.
2009-10-23 09:27:17 -07:00
Android (Google) Code Review
f0990646d5 Merge change I1d96ca06 into eclair-mr2
* changes:
  Show the soft keyboard when pressing center key/trackball on input field
2009-10-23 12:21:26 -04:00
Andreas Huber
871e4ee81d am e8472900: Merge change Ie13526ad into eclair-mr2
Merge commit 'e84729002102622b40bd6efddffb76909615c12a' into eclair-mr2-plus-aosp

* commit 'e84729002102622b40bd6efddffb76909615c12a':
  Prefer software decoders over hardware for thumbnail extraction.
2009-10-23 08:51:19 -07:00
Leon Scroggins
1d96ca06d8 Show the soft keyboard when pressing center key/trackball on input field
Fixes http://b/issue?id=2210234

Consolidate center key/trackball presses on input fields, and show
soft keyboard if the field is not readonly.  Also rename the method
for a center press, and pass a click rather than a touch.  Requires
a change in external/webkit.
2009-10-23 11:49:03 -04:00
Andreas Huber
ad28543022 Make stagefright a little less verbose. Fix heap corruption for real. 2009-10-23 08:48:12 -07:00
Andreas Huber
1f04c83684 am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2
Merge commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead' into eclair-mr2-plus-aosp

* commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead':
  Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
2009-10-23 08:43:55 -07:00
Eric Laurent
bae0d0d4c7 am 470687e2: am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Merge commit '470687e251ecb298bda17f3e3978ffeaf05622a9' into eclair-mr2-plus-aosp

* commit '470687e251ecb298bda17f3e3978ffeaf05622a9':
  Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
2009-10-23 08:43:39 -07:00
Leon Scroggins
6e6dbc3f4d am 1d60c5c1: Do not hide the cursor ring when clicking on an input field.
Merge commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f' into eclair-mr2-plus-aosp

* commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f':
  Do not hide the cursor ring when clicking on an input field.
2009-10-23 08:43:18 -07:00
Android (Google) Code Review
e847290021 Merge change Ie13526ad into eclair-mr2
* changes:
  Prefer software decoders over hardware for thumbnail extraction.
2009-10-23 11:42:41 -04:00
Andreas Huber
e13526ad92 Prefer software decoders over hardware for thumbnail extraction.
While our hardware decoders clearly outperform the software decoders in terms
of raw throughput, their startup latency makes them less suitable for thumbnail
extraction.
2009-10-23 08:39:00 -07:00
Android (Google) Code Review
1f64ffe2e4 Merge change Icb64cd2c into eclair-mr2
* changes:
  Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
2009-10-23 11:34:38 -04:00
Eric Laurent
470687e251 am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Merge commit 'dd28d56368441537ec5eb42150516416fdbf10ad' into eclair-mr2

* commit 'dd28d56368441537ec5eb42150516416fdbf10ad':
  Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
2009-10-23 08:27:11 -07:00
Leon Scroggins
1d60c5c16b Do not hide the cursor ring when clicking on an input field.
When pressing the trackball on a text input field, do not call
setFollowedLink, which results in the cursor ring disappearing and
the WebTextView being torn down.  Fixes http://b/issue?id=2210127
2009-10-23 11:22:36 -04:00
Andrei Popescu
102ca28b1d am 5c73c3bc: am 46a83b4e: Make the VideoView go away automatically at the end of playback.
Merge commit '5c73c3bce410aa84bc0c57eee5b394c044035e33'

* commit '5c73c3bce410aa84bc0c57eee5b394c044035e33':
  Make the VideoView go away automatically at the end of playback.
2009-10-23 07:41:58 -07:00
Android (Google) Code Review
4ab5748720 Merge change Ibfd6d481
* changes:
  Add a reference table dump call.
2009-10-23 10:34:48 -04:00
Andrei Popescu
5c73c3bce4 am 46a83b4e: Make the VideoView go away automatically at the end of playback.
Merge commit '46a83b4ead517b9fc13b4bee4c59c3eaf4d3fdd9' into eclair-mr2-plus-aosp

* commit '46a83b4ead517b9fc13b4bee4c59c3eaf4d3fdd9':
  Make the VideoView go away automatically at the end of playback.
2009-10-23 07:29:27 -07:00
Eric Laurent
dd28d56368 Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Unlock mLock mutex when exiting upon wait stop timeout condition.
Increase timeout delays to avoid timing out when A2DP exits standby.
2009-10-23 06:54:33 -07:00
Andrei Popescu
46a83b4ead Make the VideoView go away automatically at the end of playback.
Fixes http://b/issue?id=2210018
2009-10-23 13:53:14 +01:00
Wei Huang
fd7b4f1d12 bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
- when comparing two numbers whose dialable char length is less than the MIN_MATCH (7), treat them as equal if the dialable portion of the numbers match.
- update unit test.
2009-10-23 01:17:17 -07:00
Andrew Harp
94927dffce Patching in hidden API to allow app managed preview frame buffers.
Commit-Id: If3c30fc932697afa966cc97b17749e9996de92ee
2009-10-23 01:44:47 -04:00
Dianne Hackborn
68ce35ec9a am 8368e510: am c6bead14: am 7580493b: Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '8368e510a90ab30a9f850144f5adabb0455d26f9'

* commit '8368e510a90ab30a9f850144f5adabb0455d26f9':
  Implement feature #2117336: Create event communication APIs for live wallpaper
2009-10-22 20:42:10 -07:00
Dianne Hackborn
8368e510a9 am c6bead14: am 7580493b: Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce' into eclair-mr2-plus-aosp

* commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce':
  Implement feature #2117336: Create event communication APIs for live wallpaper
2009-10-22 20:32:09 -07:00
Dianne Hackborn
c6bead14fe am 7580493b: Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-mr2

* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
  Implement feature #2117336: Create event communication APIs for live wallpaper
2009-10-22 20:21:07 -07:00
Dianne Hackborn
7580493b01 Implement feature #2117336: Create event communication APIs for live wallpaper
Note: currently only implements an async version (no result), and not yet
actually tested.

Change-Id: Id47ed045a4b0eb309ea8c58daf41a0e03eff1d3a
2009-10-22 20:10:53 -07:00
Dirk Dougherty
73d64fa200 am 3bf0210d: am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
Merge commit '3bf0210dca67e534bf8d344575abf32e653c8407'

* commit '3bf0210dca67e534bf8d344575abf32e653c8407':
  doc change: incorporate comments on SDK docs and structure.
2009-10-22 19:07:17 -07:00
Fred Quintana
5a5772c2ad am 44dd4732: am f3971747: am 0bf653b5: am f4520f3e: Merge change I9161f53d into eclair-sdk
Merge commit '44dd4732184ce01b5fa0c7ed09347d27de60595b'

* commit '44dd4732184ce01b5fa0c7ed09347d27de60595b':
  update account manager javadoc
2009-10-22 19:07:04 -07:00
Eric Fischer
d2685bda49 am 52ab52f3: am fa48000a: am 94f2c524: Merge change I63c2d9ed into eclair
Merge commit '52ab52f35b9b6be78b818f377608c18d97f137ce'

* commit '52ab52f35b9b6be78b818f377608c18d97f137ce':
  Update the names of the widgets when the locale changes.
2009-10-22 19:05:49 -07:00
Tom Taylor
65d15c8e86 am bee4b10a: am 171ad634: am 6c618c68: Merge change Ie7105dae into eclair
Merge commit 'bee4b10af2e772b2e5c7289b26286a5a33a300ae'

* commit 'bee4b10af2e772b2e5c7289b26286a5a33a300ae':
  Handle bad SIM message
2009-10-22 19:05:35 -07:00
Andreas Huber
4d5d6c0f3f am 7453da3f: am e981c334: Extract video thumbnails from the largest sync sample among the first 20.
Merge commit '7453da3f420b74f5bb135d5895b82dca9c015bb3'

* commit '7453da3f420b74f5bb135d5895b82dca9c015bb3':
  Extract video thumbnails from the largest sync sample among the first 20.
2009-10-22 19:04:51 -07:00
Mike Lockwood
3e318e1702 am 36cf8123: am d278ffc0: am 96e0c315: Merge change Ia3f7ef64 into eclair
Merge commit '36cf8123d8cf9047c64633a963706f40cecc0bb1'

* commit '36cf8123d8cf9047c64633a963706f40cecc0bb1':
  PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
2009-10-22 19:03:50 -07:00
Dirk Dougherty
8eef2dd945 Merge commit '9b7fb57c' into manualmerge
Conflicts:
	docs/html/sdk/android-1.5.jd
2009-10-22 18:44:32 -07:00
Dirk Dougherty
3bf0210dca am f0d9c000: am 86dc4d31: am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
Merge commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5' into eclair-mr2-plus-aosp

* commit 'f0d9c0000858f3e48bcd1efec75f2dff1cbc6ed5':
  doc change: incorporate comments on SDK docs and structure.
2009-10-22 18:39:56 -07:00
Fred Quintana
44dd473218 am f3971747: am 0bf653b5: am f4520f3e: Merge change I9161f53d into eclair-sdk
Merge commit 'f3971747506ca9055e7b5c42a809ac12f8c26ad3' into eclair-mr2-plus-aosp

* commit 'f3971747506ca9055e7b5c42a809ac12f8c26ad3':
  update account manager javadoc
2009-10-22 18:39:44 -07:00