15960 Commits

Author SHA1 Message Date
Jaikumar Ganesh
b16c4f7dd9 Add API to get Active Sinks.
Allow incoming connections only when there are no active sinks.

Dr No: Eastham
Bug: 2133530
2009-12-07 15:20:31 -08:00
Jaikumar Ganesh
084c665421 Fix updating Bluetooth icon on status bar and for Wifi.
Status bar uses the SINK_STATE_CHANGE intent to determine the icon.
This intent also has the device. Thus, we can get this intent for any
device and we update the icon wrongly. The same problem is with Wifi.

This was not commonly observed till now, but with the car dock changes
its easy to reproduce as we can get an incoming connection from the
car's bluetooth system. For Wifi, this will cause coexistance issues
especially with desk docks.

Dr No: Eastham
Bug: 2133530
2009-12-07 15:16:22 -08:00
Kenny Root
19138468ca 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
47a2573e54 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
096871e7e1 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
90d1b745ec Merge change I53e91db7 into eclair
* changes:
  Filter out minor Connectivity Notifications.
2009-12-07 15:04:52 -08:00
Bjorn Bringert
c5303c3a55 am 8d962613: am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '8d962613464b206f4c0b2323607c5e248543ad24'

* commit '8d962613464b206f4c0b2323607c5e248543ad24':
  Move android.server.search.SearchableInfo to android.app
2009-12-07 14:58:38 -08:00
Vasu Nori
976ed43786 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
Romain Guy
cd9d0242fd am 16c82c34: am d1b3988a: Merge change I4039545e into eclair-mr2
Merge commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f'

* commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f':
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-07 14:56:53 -08:00
Doug Zongker
97d7f79aef am 0f91f870: am f6683bb5: Merge change I5f1d2d24 into eclair-mr2
Merge commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61'

* commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61':
  move event log tags used by ActivityManager into this package
2009-12-07 14:56:30 -08:00
Kenny Root
b6eed9bd5c am b145ad1d: am fc32a062: Merge change I88721afe into eclair-mr2
Merge commit 'b145ad1d32943745c1e712c2f4ecd01802d1f5dc'

* commit 'b145ad1d32943745c1e712c2f4ecd01802d1f5dc':
  Fix bitmask in aapt's StringPool length construction
2009-12-07 14:55:55 -08:00
Jack Palevich
c373edbf1c am 9196034b: am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2
Merge commit '9196034b84c48844799a2904ef3ce31f18ee748e'

* commit '9196034b84c48844799a2904ef3ce31f18ee748e':
  Improve error message thrown when eglCreateContext fails.
  Improve error reporting by always returning the public
2009-12-07 14:55:39 -08:00
Romain Guy
e8a43b2367 am e300deaf: am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8'

* commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8':
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-07 14:55:23 -08:00
Andy McFadden
13169d855c am 19e0db20: am ebc910da: Merge change Iaad9c8d1 into eclair-mr2
Merge commit '19e0db20100753dd347ec5203cd0226f55f09e2a'

* commit '19e0db20100753dd347ec5203cd0226f55f09e2a':
  Restore 7.xml.
2009-12-07 14:55:04 -08:00
Android (Google) Code Review
6be01bf207 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
Suchi Amalapurapu
d8ec3d87db am 32c66ee4: am ccbf4c28: am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2'

* commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-07 14:54:22 -08:00
Andreas Huber
c4349603b9 am 5d676ad5: am 52f410e2: Merge change Ifef6435a into eclair-mr2
Merge commit '5d676ad5d94c3d4f831c2084012f955fe56a8af8'

* commit '5d676ad5d94c3d4f831c2084012f955fe56a8af8':
  Enable proper cleanup of OMX nodes managed through stagefright.
2009-12-07 14:53:27 -08:00
Christopher Tate
0303edf957 am a26b0a40: am ed6dd2e6: am d3bc1994: Merge change I397b6a93 into eclair
Merge commit 'a26b0a401b6aadb45fa58d1d05b3112fbfda3fba'

* commit 'a26b0a401b6aadb45fa58d1d05b3112fbfda3fba':
  Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-07 14:52:56 -08:00
Evan Millar
4adf801737 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
b5eb3902ff Merge change Ie70845ca into eclair-mr2
* changes:
  Add Sets#newSortedSet()
2009-12-07 14:41:49 -08:00
Vasu Nori
fa1fae1355 Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
This reverts commit 6d1ec0d81cd8ecdd390b31e724bac554bb955a94.
2009-12-07 14:38:35 -08:00
Andreas Huber
9659126db1 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
247003be9e 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
Fred Quintana
a5ef9acdf4 remove an old STOPSHIP comment 2009-12-07 14:23:33 -08:00
Andreas Huber
250f2433c6 Initial checkin of stagefright MP3 audio decoder based on PV source code. 2009-12-07 14:22:35 -08:00
Evan Millar
049070d365 Add Sets#newSortedSet() 2009-12-07 14:21:33 -08:00
Robert Greenwalt
511288a046 Filter out minor Connectivity Notifications.
Don't send a connectivity change notification if the change is in detailed state only.
IE, Disconnect/Idle -> Disconnect/Scanning should not trigger a connection change
notification.

bug: 2265222
2009-12-07 14:20:08 -08:00
Doug Zongker
18803d37e2 resolved conflicts for merge of 5a2fdbba to master 2009-12-07 14:12:02 -08:00
Leon Scroggins
0092ee13e4 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
8657978aab 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
6761e85d41 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
Leon Scroggins
aa7b9d7826 Set InputType of WebTextView according to <input> field's type.
Help fix http://b/issue?id=2150538 and http://b/issue?id=1890360

Use the <input type> information to set the InputType, so that
the IME can show the correct options.  Also consolidate setup
of WebTextView into setType().

Requires a change in external/webkit.
2009-12-07 16:36:34 -05:00
Grace Kloba
ddcea3d216 Expose onReceivedSslError() so that the WebView client
can accept the error and continue.

Fix http://b/issue?id=2299152
2009-12-07 13:20:33 -08:00
Grace Kloba
a49f91a2cb 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
14467eb2ee Merge change I234162b0 into eclair-mr2
* changes:
  Add "res" support for WebView.
2009-12-07 13:05:46 -08:00
Dave Sparks
610e50ccd2 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
54f5ca4115 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
62679112a2 Merge change I3c256cf3 into eclair-mr2
* changes:
  More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
2009-12-07 13:02:56 -08:00
Dave Sparks
3c256cf321 More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback. 2009-12-07 13:01:01 -08:00
Jason Sams
ffacbc3419 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
fd2f635832 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
0128c250e3 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
5ac5cd7300 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
Daniel Sandler
7aacc59abe Move the emergency call button to the top-right when there's no SIM.
In the process, clean up the way the lock screen's "toasts"
are handled so that those also match the desired UI.

http://b/2260798
2009-12-07 15:47:28 -05:00
Android (Google) Code Review
1b15acf705 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
9d5b7aca74 Merge change Ic0e3ddf8 into eclair-mr2
* changes:
  Remove unused Java object reference in native SoundPool code.
2009-12-07 12:40:17 -08:00
Jason Sams
771bebb940 Add Java exceptions to catch RS calls with no context or no surface. 2009-12-07 12:40:12 -08:00
Eric Laurent
bf831e0de0 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
38f6bdc418 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
Dave Sparks
c0e3ddf8f2 Remove unused Java object reference in native SoundPool code. 2009-12-07 12:36:20 -08:00