Commit Graph

6202 Commits

Author SHA1 Message Date
Fred Quintana
eb23b2c678 am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment
2009-12-07 17:04:40 -08:00
Android (Google) Code Review
b7e2059005 Merge change Ia5ef9acd into eclair
* changes:
  remove an old STOPSHIP comment
2009-12-07 16:59:46 -08:00
Jaikumar Ganesh
59746fefec am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-mr2

* commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
  Add API to get Active Sinks.
2009-12-07 15:53:02 -08:00
Android (Google) Code Review
d958f3c7bb Merge change I38227501 into eclair
* changes:
  Add API to get Active Sinks.
2009-12-07 15:49:50 -08:00
Robert Greenwalt
dd77d38bf2 am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2

* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:31:50 -08:00
Jaikumar Ganesh
297951f5ab am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2

* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:31:43 -08:00
Android (Google) Code Review
6c0dae34e2 Merge change Ib097fbbf into eclair
* changes:
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:27:19 -08:00
Android (Google) Code Review
ec68a21530 Merge change I204e4787 into eclair
* changes:
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:27:02 -08:00
Robert Greenwalt
451a101c7c am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2

* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
  Filter out minor Connectivity Notifications.
2009-12-07 15:09:46 -08:00
Android (Google) Code Review
ac16968db1 Merge change I53e91db7 into eclair
* changes:
  Filter out minor Connectivity Notifications.
2009-12-07 15:04:52 -08:00
Android (Google) Code Review
bd3b011489 Merge change Ifa1fae13 into eclair-mr2
* changes:
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:54:36 -08:00
Android (Google) Code Review
262e9cde09 Merge change Ie70845ca into eclair-mr2
* changes:
  Add Sets#newSortedSet()
2009-12-07 14:41:49 -08:00
Android (Google) Code Review
9cc07068bd Merge change I250f2433 into eclair-mr2
* changes:
  Initial checkin of stagefright MP3 audio decoder based on PV source code.
2009-12-07 14:31:46 -08:00
Android (Google) Code Review
78a0ab24ad Merge change Idff5eb2a into eclair-mr2
* changes:
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 13:39:22 -08:00
Android (Google) Code Review
997a5e52d7 Merge change I234162b0 into eclair-mr2
* changes:
  Add "res" support for WebView.
2009-12-07 13:05:46 -08:00
Android (Google) Code Review
ef5fcdff5e Merge change I3c256cf3 into eclair-mr2
* changes:
  More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
2009-12-07 13:02:56 -08:00
Jason Sams
3a6381ce0a am fd2f6358: Merge change I771bebb9 into eclair
Merge commit 'fd2f6358321e95d661f24ba4e08327268035aa59' into eclair-mr2

* commit 'fd2f6358321e95d661f24ba4e08327268035aa59':
  Add Java exceptions to catch RS calls with no context or no surface.
2009-12-07 13:00:25 -08:00
Android (Google) Code Review
587385b096 Merge change I771bebb9 into eclair
* changes:
  Add Java exceptions to catch RS calls with no context or no surface.
2009-12-07 12:55:38 -08:00
Android (Google) Code Review
ba906977cf Merge change I21eb4b87 into eclair-mr2
* changes:
  Allow room for descenders in am/pm text.
2009-12-07 12:46:56 -08:00
Android (Google) Code Review
9072d008ef Merge change Ic0e3ddf8 into eclair-mr2
* changes:
  Remove unused Java object reference in native SoundPool code.
2009-12-07 12:40:17 -08:00
Eric Laurent
7749a90e1e am 0a08029f: Fix issue 2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Merge commit '0a08029fc9a370c6ef2a2a6fd1d800d9159b61f8' into eclair-mr2

* commit '0a08029fc9a370c6ef2a2a6fd1d800d9159b61f8':
  Fix issue  2306779: Runtime restart - Init failed at android.media.ToneGenerator.
2009-12-07 12:36:30 -08:00
Eric Laurent
fed9382a6a Fix issue 2306779: Runtime restart - Init failed at android.media.ToneGenerator.
The ToneGenerator failed to initialize because no more tracks were available in AudioFlinger mixer.

All tracks were used because the duplicating output was failing to free the tracks on audio hardware output mixer when exiting due to a misplaced test on output activity: output tracks where only freed if the duplicating output was active when exiting.

The fix consists in freeing the output tracks when the duplicating thread is destroyed without condition.
2009-12-07 12:30:22 -08:00
Android (Google) Code Review
5ddf521e81 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
8aaf9a21bc 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
Android (Google) Code Review
0aa2563bb7 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
6412cf7ae0 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
Android (Google) Code Review
f5009537a4 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
Android (Google) Code Review
3f693eb932 Merge change I91eb0354 into eclair-mr2
* changes:
  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:57:12 -08:00
Android (Google) Code Review
b3150e8599 Merge change I9088d29b into eclair-mr2
* changes:
  Improves the touch-based text selection UI in text boxes.
2009-12-07 07:14:41 -08:00
Eric Laurent
5291095089 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
Dima Zavin
0fe8a9bc4b am 0019215f: Revert "When using MDP, we needed to use a texture for diming."
Merge commit '0019215fc395ef12c191049b1903eeabf70859cf' into eclair-mr2

* commit '0019215fc395ef12c191049b1903eeabf70859cf':
  Revert "When using MDP, we needed to use a texture for diming."
2009-12-07 01:36:26 -08:00
Dima Zavin
a9ec9be195 Revert "When using MDP, we needed to use a texture for diming."
This reverts commit bf0c320afbf6bf2441916755ecb443b64afbe73f.
2009-12-07 00:17:06 -08:00
Android (Google) Code Review
65deb8dbec Merge change I9589f9c2 into eclair-mr2
* changes:
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:21:01 -08:00
Android (Google) Code Review
0053961c4c Merge change I4039545e into eclair-mr2
* changes:
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-04 17:01:54 -08:00
Android (Google) Code Review
a342a772b4 Merge change I5f1d2d24 into eclair-mr2
* changes:
  move event log tags used by ActivityManager into this package
2009-12-04 16:46:28 -08:00
Android (Google) Code Review
4bb1dca1d2 Merge change I88721afe into eclair-mr2
* changes:
  Fix bitmask in aapt's StringPool length construction
2009-12-04 15:59:59 -08:00
Android (Google) Code Review
3a74b53875 Merge changes Id682ab72,I9bb4dbae into eclair-mr2
* changes:
  Improve error message thrown when eglCreateContext fails.
  Improve error reporting by always returning the public EGL10.EGL_NO_XXX objects for displays, surfaces, and contexts.
2009-12-04 15:55:47 -08:00
Android (Google) Code Review
78b31fdc28 Merge change If3c7d429 into eclair-mr2
* changes:
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:50:43 -08:00
Android (Google) Code Review
dc4a713595 Merge change Iaad9c8d1 into eclair-mr2
* changes:
  Restore 7.xml.
2009-12-04 15:39:59 -08:00
Suchi Amalapurapu
4beb266b71 am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-mr2

* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-04 15:01:49 -08:00
Android (Google) Code Review
d313000d3a Merge change Ibe1c422a into eclair
* changes:
  If the usage stats file doesn't exist in the first place there is no need to backup and short return.
2009-12-04 14:59:43 -08:00
Android (Google) Code Review
04de25cee8 Merge change Ifef6435a into eclair-mr2
* changes:
  Enable proper cleanup of OMX nodes managed through stagefright.
2009-12-04 13:36:57 -08:00
Christopher Tate
dbababeb86 am d3bc1994: Merge change I397b6a93 into eclair
Merge commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda' into eclair-mr2

* commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda':
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-04 12:54:36 -08:00
Android (Google) Code Review
bc8764ae77 Merge change I397b6a93 into eclair
* changes:
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-04 12:51:44 -08:00
Android (Google) Code Review
888b9c96ea Merge change Iab5c49c7 into eclair-mr2
* changes:
  move event log tags used by system server into this package
2009-12-04 12:00:13 -08:00
Ray Chen
ac28190e34 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
Android (Google) Code Review
9eeee88759 Merge change If32b488b into eclair-mr2
* changes:
  Add new unit test for RadioGroup/RadioButton.
2009-12-04 11:51:05 -08:00
Android (Google) Code Review
9b02d3f8b3 Merge change Ie46db339 into eclair-mr2
* changes:
  Remove "unused" opcodes from API.
2009-12-04 11:20:54 -08:00
Android (Google) Code Review
bea276fa7f Merge change I4261c58d into eclair-mr2
* changes:
  Check if another Activity wants to intercept an xml mime type.
2009-12-04 11:08:28 -08:00
Romain Guy
fa97a2297a am 48a65d99: Merge change I8c5f2fc3 into eclair
Merge commit '48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2

* commit '48a65d99cba33db3af2e05982a6825b883be2030':
  Fix invalidate code path (#2273209).
2009-12-04 10:37:59 -08:00