Commit Graph

8810 Commits

Author SHA1 Message Date
Android (Google) Code Review
b098b6dfef Merge change Ib16e5543 into eclair-mr2
* changes:
  Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
2009-12-08 09:16:08 -08:00
Android (Google) Code Review
8888279fe8 Merge change I8f658214 into eclair-mr2
* changes:
  Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
2009-12-08 09:16:00 -08:00
Android (Google) Code Review
8115899cfb Merge change Ic532c956 into eclair-mr2
* changes:
  Note to self: Don't reverse the arguments to fseek(o)...
2009-12-08 09:15:46 -08:00
Android (Google) Code Review
ad1fa03e70 Merge change Ifea65fb9 into eclair-mr2
* changes:
  Move the emergency call button to the top-right when there's no SIM.
2009-12-08 07:59:34 -08:00
Trevor Johns
fee7c08d9f am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-mr2

* commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b':
  Updating list of standard Intents in android.content.Intent
2009-12-07 22:42:46 -08:00
Wu-cheng Li
6545804c4b am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-mr2

* commit '9c79938d47a3caa06e5fb956955374f30c55992b':
  Document that some parameters will not be null and fix getSupportedPictureFormats.
2009-12-07 19:38:01 -08:00
Dianne Hackborn
8c6cedc9bc Propagate background scheduling class across processes.
This is a very simply implementation: upon receiving an IPC, if the handling
thread is at a background priority (the driver will have taken care of
propagating this from the calling thread), then stick it in to the background
scheduling group.  Plus an API to turn this off for the process, which is
used by the system process.

This also pulls some of the code for managing scheduling classes out of
the Process JNI wrappers and in to some convenience methods in thread.h.
2009-12-07 19:11:14 -08:00
Mike Lockwood
d56352bddd am 7e90005f: Merge change I705b1d33 into eclair
Merge commit '7e90005fcb95d4c20c92e915f4418b94341dda36' into eclair-mr2

* commit '7e90005fcb95d4c20c92e915f4418b94341dda36':
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
2009-12-07 17:22:54 -08:00
Android (Google) Code Review
fe07788498 Merge change I705b1d33 into eclair
* changes:
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
2009-12-07 17:17:47 -08:00
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
88a86e8ae1 am b08170ad: am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'b08170ad7e4ca4908852b0e20759ea740b338a03' into eclair-mr2-plus-aosp

* commit 'b08170ad7e4ca4908852b0e20759ea740b338a03':
  Add API to get Active Sinks.
2009-12-07 15:57:28 -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
647b382a88 am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp

* commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:36:25 -08:00
Jaikumar Ganesh
32cf6dc48e am 47cc8112: am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp

* commit '47cc8112c3f77637ef408ef18e48d146e8250a27':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:36:19 -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
Kenny Root
92f5984d2c Optional use of UTF-8 strings in resource bundles
Allows the use of UTF-8 for packing resources instead of the
default of UTF-16 for Java. When strings are extracted from the
ResStringPool, they are converted to UTF-16 and the result is
cached for subsequent calls.

When using aapt to package, add in the "-8" switch to pack the
resources using UTF-8. This will result in the value, key, and
type strings as well as the compiled XML string values taking
significantly less space in the final application package in
most scenarios.

Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
2009-12-07 15:14:15 -08:00
Robert Greenwalt
1cde0c8403 am 096871e7: am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4' into eclair-mr2-plus-aosp

* commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4':
  Filter out minor Connectivity Notifications.
2009-12-07 15:13:51 -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
Vasu Nori
d8f7aaf35c am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp

* commit '6be01bf207077ffbdcd3879250171a26ec805835':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:58:04 -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
Evan Millar
f6b6e9ed95 am b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit 'b5eb3902ff92f895328928c6a8e05c90104e0c13' into eclair-mr2-plus-aosp

* commit 'b5eb3902ff92f895328928c6a8e05c90104e0c13':
  Add Sets#newSortedSet()
2009-12-07 14:45:43 -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
Andreas Huber
e4a21e2657 am 247003be: Merge change I250f2433 into eclair-mr2
Merge commit '247003be9ea69928e35ce2f1bd1fab652920a3f2' into eclair-mr2-plus-aosp

* commit '247003be9ea69928e35ce2f1bd1fab652920a3f2':
  Initial checkin of stagefright MP3 audio decoder based on PV source code.
2009-12-07 14:36:01 -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
Leon Scroggins
b387c8f848 am 6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '6761e85d41dedf4e783217922a5fedac2b7a654d' into eclair-mr2-plus-aosp

* commit '6761e85d41dedf4e783217922a5fedac2b7a654d':
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 13:40:59 -08:00
Grace Kloba
ed3165181e am ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit 'ddcea3d21645bb3037703c84807dae077aae62ce' into eclair-mr2-plus-aosp

* commit 'ddcea3d21645bb3037703c84807dae077aae62ce':
  Expose onReceivedSslError() so that the WebView client
2009-12-07 13:40:53 -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
Grace Kloba
f35250ffd7 am 14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit '14467eb2eea119b4d71dd7dd149479aa092e6de2' into eclair-mr2-plus-aosp

* commit '14467eb2eea119b4d71dd7dd149479aa092e6de2':
  Add "res" support for WebView.
2009-12-07 13:09:49 -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
Dave Sparks
6a37b5e89c am 62679112: Merge change I3c256cf3 into eclair-mr2
Merge commit '62679112a2ac98f6b73e9a5f6e92b3cb5728703c' into eclair-mr2-plus-aosp

* commit '62679112a2ac98f6b73e9a5f6e92b3cb5728703c':
  More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
2009-12-07 13:04:56 -08:00
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