Commit Graph

8924 Commits

Author SHA1 Message Date
Jason Sams
3687f1212b am ffacbc34: am fd2f6358: Merge change I771bebb9 into eclair
Merge commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f' into eclair-mr2-plus-aosp

* commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f':
  Add Java exceptions to catch RS calls with no context or no surface.
2009-12-07 13:04:51 -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
Daniel Sandler
78e362430b am 1b15acf7: Merge change I21eb4b87 into eclair-mr2
Merge commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57' into eclair-mr2-plus-aosp

* commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57':
  Allow room for descenders in am/pm text.
2009-12-07 12:51:01 -08:00
Dave Sparks
dfd5605944 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
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
46e60b2ef6 am 38f6bdc4: am 0a08029f: Fix issue 2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Merge commit '38f6bdc4187f27f86c7f77c88095c663e005dbf4' into eclair-mr2-plus-aosp

* commit '38f6bdc4187f27f86c7f77c88095c663e005dbf4':
  Fix issue  2306779: Runtime restart - Init failed at android.media.ToneGenerator.
2009-12-07 12:38:45 -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
Andreas Huber
4f02c24eaf 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
ccf394e7f0 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
04ffc6e100 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
bdaafe72a6 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
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
Andreas Huber
f9a1b38525 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
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
Leon Scroggins
5aa79f35eb am 9e3e2d3a: Show search icon for <input type="search"> fields.
Merge commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5' into eclair-mr2-plus-aosp

* commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5':
  Show search icon for <input type="search"> fields.
2009-12-07 07:39:06 -08:00
Maryam Garrett
35f8468742 am 7c427030: Merge change I9088d29b into eclair-mr2
Merge commit '7c42703082574638ecaa88ea18b0cc94bfabea2d' into eclair-mr2-plus-aosp

* commit '7c42703082574638ecaa88ea18b0cc94bfabea2d':
  Improves the touch-based text selection UI in text boxes.
2009-12-07 07:17:26 -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
21e7e5ef53 am 401f4220: am 0019215f: Revert "When using MDP, we needed to use a texture for diming."
Merge commit '401f422078581ae741b68d879609e57a4b227455' into eclair-mr2-plus-aosp

* commit '401f422078581ae741b68d879609e57a4b227455':
  Revert "When using MDP, we needed to use a texture for diming."
2009-12-07 01:40:02 -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
Bjorn Bringert
7fd5df71d0 am 05a22548: Rename SearchableInfo in preloaded-classes
Merge commit '05a22548dfbf697f9df7c53451c126999ed9a6f0' into eclair-mr2-plus-aosp

* commit '05a22548dfbf697f9df7c53451c126999ed9a6f0':
  Rename SearchableInfo in preloaded-classes
2009-12-05 14:00:07 -08:00
Bjorn Bringert
529bc7e89d am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '6dba0680cd3bc0bd987a3d01fc49421897528f20' into eclair-mr2-plus-aosp

* commit '6dba0680cd3bc0bd987a3d01fc49421897528f20':
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:26:04 -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
Romain Guy
c6e29e3673 am d1b3988a: Merge change I4039545e into eclair-mr2
Merge commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21' into eclair-mr2-plus-aosp

* commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21':
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-04 17:06:04 -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
Doug Zongker
e3e5656cb6 am f6683bb5: Merge change I5f1d2d24 into eclair-mr2
Merge commit 'f6683bb5592825a62e30760abb0734deaaf7bd93' into eclair-mr2-plus-aosp

* commit 'f6683bb5592825a62e30760abb0734deaaf7bd93':
  move event log tags used by ActivityManager into this package
2009-12-04 16:50:50 -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
Kenny Root
e9c957e356 am fc32a062: Merge change I88721afe into eclair-mr2
Merge commit 'fc32a062f833df35ea153bbd857046052e2ce238' into eclair-mr2-plus-aosp

* commit 'fc32a062f833df35ea153bbd857046052e2ce238':
  Fix bitmask in aapt's StringPool length construction
2009-12-04 16:03:44 -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
Jack Palevich
085c03ee4d am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2
Merge commit '30d905235074f343ebac6002408ab5c2b360ea14' into eclair-mr2-plus-aosp

* commit '30d905235074f343ebac6002408ab5c2b360ea14':
  Improve error message thrown when eglCreateContext fails.
  Improve error reporting by always returning the public
2009-12-04 15:59:10 -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
Romain Guy
9552892f74 am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'b6936607b61e3115b5924e41be29c0430dd05613' into eclair-mr2-plus-aosp

* commit 'b6936607b61e3115b5924e41be29c0430dd05613':
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:54:32 -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
Andy McFadden
0fc6db4beb am ebc910da: Merge change Iaad9c8d1 into eclair-mr2
Merge commit 'ebc910da96f4dbb036e16971c1041f8287342aa4' into eclair-mr2-plus-aosp

* commit 'ebc910da96f4dbb036e16971c1041f8287342aa4':
  Restore 7.xml.
2009-12-04 15:42: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
9ba362b4fa am ccbf4c28: am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d' into eclair-mr2-plus-aosp

* commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-04 15:04:35 -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
Andreas Huber
48c7c1ddc4 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
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
32dc040248 am ed6dd2e6: am d3bc1994: Merge change I397b6a93 into eclair
Merge commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a' into eclair-mr2-plus-aosp

* commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a':
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-04 12:56:40 -08:00