10918 Commits

Author SHA1 Message Date
Ken Shirriff
1719a39a4c Migration to TrafficStats.
TrafficStats is the SDK version of NetStat.
2009-12-08 11:14:03 -08:00
Ken Shirriff
f7d0b01387 Add TrafficStats class to SDK.
This class (a rename of NetStat) provides network byte and packet statistics.
NetStat will be removed separately, to avoid breaking other packages when submitting.
2009-12-08 10:50:25 -08:00
Andreas Huber
7c55c3f5f5 Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM. 2009-12-08 10:07:22 -08:00
Android (Google) Code Review
6d35d4c2cf 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
3f5b28679b 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
ee3a2443de 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
10c1dfad63 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
Derek Sollenberger
51ef573a83 Switching from activity based full screen plugins to a view system overlay. 2009-12-08 08:12:44 -05:00
Trevor Johns
7e42e8f334 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
Trevor Johns
d59fb6e743 Updating list of standard Intents in android.content.Intent
documentation.
2009-12-07 22:38:49 -08:00
Wu-cheng Li
ebc7799444 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
0766b2d0f3 Update service example code.
Switch aidl sample to match the change in ApiDemos, add sample code
to the Service class.
2009-12-07 18:06:09 -08:00
Wu-cheng Li
9c79938d47 Document that some parameters will not be null and fix getSupportedPictureFormats. 2009-12-08 09:41:08 +08:00
Mike Lockwood
259e3384fa 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
7e90005fcb 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
18ff0e329b 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
1067c3cbab Merge change Ia5ef9acd into eclair
* changes:
  remove an old STOPSHIP comment
2009-12-07 16:59:46 -08:00
Andreas Huber
c532c95695 Note to self: Don't reverse the arguments to fseek(o)... 2009-12-07 16:41:57 -08:00
Andreas Huber
8f65821453 Minor tweaks to the mp3 and aac software decoders, propagate duration to output format. 2009-12-07 16:41:16 -08:00
Andreas Huber
b16e554371 Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek. 2009-12-07 16:40:29 -08:00
Jaikumar Ganesh
b08170ad7e 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
ae88e2d130 Merge change I38227501 into eclair
* changes:
  Add API to get Active Sinks.
2009-12-07 15:49:50 -08:00
Mike Lockwood
dbd6fd8ebb GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Change-Id: I705b1d33af2d70aa1084cca8f6280fade9461d2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-07 18:46:55 -05:00
Robert Greenwalt
54a4a66d38 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
47cc8112c3 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
9ae9763b7e Merge change Ib097fbbf into eclair
* changes:
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:27:19 -08:00
Android (Google) Code Review
9d3cb9bfc6 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
b097fbbff3 DO NOT MERGE Reverting change I53e91db7.
Accidentally submitted into eclair instead of eclair-mr2.
I apparently rebased my mr2 working dir to eclair by mistake.

Do not merge this so the desired change will survive on mr2 as intended.

bug: 2265222
2009-12-07 15:20:50 -08:00
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
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
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
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
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
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
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
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
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