• Home
  • History
  • Annotate
  • only in /frameworks/base/core/tests/coretests/src/android/net/
History log of /frameworks/base/core/tests/coretests/src/android/net/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
daa57e8d1866fe4579c280c41604f3660db7cd01 19-Sep-2012 Jeff Sharkey <jsharkey@android.com> Migrate network stats from removed users.

When a user is removed, migrate all network stats belonging to that
user into special UID_REMOVED bucket. Also removes those stats from
kernel to avoid double-counting if another user is created.

Bug: 7194784
Change-Id: I03f1d660fe3754566326b7749cae8068fc224ea9
etworkStatsTest.java
fd5a80f6e98124d908643a14d33b8d2fa5238da6 18-Sep-2012 Geremy Condra <gcondra@google.com> Code cleanup for X509TrustManagerExtensionsTest.java

Change-Id: I85584f7a9dbc726be811f783d125efcf70c9f6af
ttp/X509TrustManagerExtensionsTest.java
cb4c5819758a7e2951bd4818383f7c5e10a5f016 18-Sep-2012 Geremy Condra <gcondra@google.com> Fix bad isinstance check in X509TrustManagerExtensions and add test.

Change-Id: I333957186655b2543a637dafa8c51b0bba9d4dfb
ttp/X509TrustManagerExtensionsTest.java
2108ead7f125536874d6de6ca1c0c4cffbf61b44 17-May-2012 Jesse Wilson <jessewilson@google.com> Change NPN to forbid empty lists of protocols.

Bug: http://b/6438423
Change-Id: Ie89220e5bc219396c15dbe1feaa2f74fa1b243eb
SLTest.java
f5fb5e80963abeabdf0ff10dcee068344235082e 23-Mar-2012 Jesse Wilson <jessewilson@google.com> Add an API to expose Next Protocol Negotiation (NPN).

Bug: http://b/4190756
Change-Id: If904f7ff440391a6adb2963eb2ecb990140ab7cc
SLTest.java
18c227ba72406c0b69ce9925a80113060d870256 15-Feb-2012 Jesse Wilson <jessewilson@google.com> Implement the (hidden) ExtendedResponseCache interface.

Bug: http://code.google.com/p/android/issues/detail?id=25418
Change-Id: I4b20d576bac7036f94e57db7124de44f5b8d75be
ttp/HttpResponseCacheTest.java
241dde2306202e7655fdf41d5381f2874e47e108 03-Feb-2012 Jeff Sharkey <jsharkey@android.com> Unify shorthand for byte-based units.

Change-Id: If990859dee3f0973e1d4c48f05312c84071b3328
etworkStatsHistoryTest.java
5898991075ad5aa941c7c3c92467c03d28902ecf 15-Nov-2011 Jeff Sharkey <jsharkey@android.com> am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1

* commit 'bc03c74c485669695805944a655795a6f9890956':
Conservatively trim data usage stats.
7ee8658453fe4efe04781bea9a14368e1d5ff41f 15-Nov-2011 Jeff Sharkey <jsharkey@android.com> Conservatively trim data usage stats.

Instead of trusting NTP time alone, use the most-conservative of
system clock and NTP.

Bug: 5584564
Change-Id: I5dd87fc009959b1cf0a7d660e385a0b1a8be238b
etworkStatsHistoryTest.java
c592a57f3ff4f4e051eef57c7fb50b8643a653e5 09-Nov-2011 Jeff Sharkey <jsharkey@android.com> am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1

* commit '489b431273500db81d35ed43440915187c238f92':
Make operation counts monotonically increase.
4abb1b8ef64dc4cd71966b59dc5d72a15055bf13 09-Nov-2011 Jeff Sharkey <jsharkey@android.com> Make operation counts monotonically increase.

Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
etworkStatsTest.java
4d81191dd377d30570d6c3294b0fb1f0ea681f46 03-Nov-2011 Jeff Sharkey <jsharkey@android.com> am 808ee95d: Merge "Correct proc file reader, optimizations." into ics-mr1

* commit '808ee95dd4244da6ae767d3ddd003ed7b48937d0':
Correct proc file reader, optimizations.
163e6443f27884a9bfcb9a48ef606dc635852c23 01-Nov-2011 Jeff Sharkey <jsharkey@android.com> Correct proc file reader, optimizations.

Moved away from BufferedReader, which only reads the first 8KB of
some proc files because it aggresively fills its buffer. Optimized
proc parsing, now double the speed. Tests to cover.

Log when NetworkStats counters roll backwards when subtracting, and
optimizations around findIndex(). When system removes UID, also
remove from last stats snapshot to avoid xt counters from rolling
backwards.

Bug: 5472949, 5458380
Change-Id: I07c08fe5233156fac2b84450f6291868bf9bfaf2
etworkStatsTest.java
0f28af209ac877091f4a096f7553f02a0b401596 29-Oct-2011 Jesse Wilson <jessewilson@google.com> Interpret '+' as a space char in the URL query params.

This changes Uri.decode() to use libcore's implementation
of the same behavior.

Bug: http://code.google.com/p/android/issues/detail?id=21064
Change-Id: If81005492b12d3aaecc745471e0a28679544a391
riTest.java
1059c3c30ad96a15695c1a92ae8896e078a6309f 05-Oct-2011 Jeff Sharkey <jsharkey@android.com> Move battery stats to xt_qtaguid for data stats.

Replace TrafficStats calls by reading values from xt_qtaguid kernel
module. To keep BatteryStatsImpl changes lightweight, cache recently
parsed stats. Tracks mobile ifaces from ConnectivityService.

Refactor xt_qtaguid parsing into factory outside of NMS. Add stats
grouping based on UID, and total based on limiting filters like iface
prefix and UID.

Bug: 4902271
Change-Id: I533f116c434b77f93355bf95b839e7478528505b
etworkStatsTest.java
905b5891d2aa802f447ac2ce5d77b6c5ba06277a 01-Oct-2011 Jeff Sharkey <jsharkey@android.com> Track xtables summary, move tether stats, time.

Begin tracking xtables summary of data usage to compare with values
reported from /proc/net/dev. Roll tethering directly into UID stats
to trigger UID stats persisting when crossing threshold.

Include xtables summary and authoritative time in samples.

Bug: 5373561, 5397882, 5381980
Change-Id: Ib7945522caadfbe0864fdf391582dc820f4f371e
etworkStatsTest.java
de5d7d250848b0db4119f362e2e700cb19e02293 28-Sep-2011 Jesse Wilson <jessewilson@google.com> Test to demonstrate NPE in DefaultRequestDirector

When the HTTP client encountered a server failure while
talking through a proxy, it fails with an NullPointerException
and not an IOException.

Change-Id: I4b287105bf78b832d034557e37e74ce576c7894d
Bug: http://b/5372438
ttp/AbstractProxyTest.java
69b0f63af2e3babc2e9f048c4682032a0c17d9d0 12-Sep-2011 Jeff Sharkey <jsharkey@android.com> Data usage structure optimizations.

Driven by traceview hotspots found in Settings UI.

Change-Id: I614a049523c526b7fcd12fffdf53a3e4723623e4
etworkStatsHistoryTest.java
558a23200697d306b75750cf4612cf0717e73537 25-Aug-2011 Jeff Sharkey <jsharkey@android.com> Data usage buckets active time, parsing ISE.

When recording data usage, measure the actual active time, since
buckets can be quite long. Offer incrementOperationCount() version
that reads thread stats tag for caller. Rethrow any NPE as ISE
during stats parsing, which callers already handle.

Bug: 5171812, 5184508, 5180659
Change-Id: I6da80ccc0162be68bee279529e3a23b6f98ebd87
etworkStatsHistoryTest.java
8e9992ae5053a3ac52d28a5a892aed0a0798c7ab 24-Aug-2011 Jeff Sharkey <jsharkey@android.com> Register for kernel global data usage alerts.

Instead of polling every 15 minutes, register for alerts that trigger
when system-wide traffic passes a threshold. Still mixed with polling
to persist UID stats, but relaxed to 30 minutes. Currently watches
for every 512kB.

Make persistence decision separately for network versus UID, and use
total delta bytes when making decision. Use light bootstrap during
systemReady() instead of heavy poll, which had been force-loading all
UID data unnecessarily.

Bug: 5023631
Change-Id: I04b723d6c4bf872fb1028071122dba66a8e1b576
etworkStatsTest.java
b5d55e302d2253e4bfb233ea705caf258cdc4cb9 11-Aug-2011 Jeff Sharkey <jsharkey@android.com> Foreground/background network stats using sets.

Teach NetworkStats about "counter sets" coming from kernel, and use
them to track usage in foreground/background. Add AID_NET_BW_ACCT to
system_server so it can control counter sets.

Move to composite key of NetworkIdentitySet, UID, set, and tag when
recording historical usage. Persisting still clusters by identity,
since that is heaviest object.

Request async stats poll during systemReady() to bootstrap later
delta calculations. Reset kernel counters when UID removed. Update
various tests.

Bug: 5105592, 5146067
Change-Id: Idabec9e3ffcaf212879821515602ecde0a03de8c
etworkStatsTest.java
63d27a9233fed934340231f438493746084a681d 04-Aug-2011 Jeff Sharkey <jsharkey@android.com> Network stats with varint, omit parcel fields.

Persist NetworkStatsHistory using variable-length encoding; since
most buckets have small numbers, we can encode them tighter. Initial
test showed 44% space savings. Also persist packet and operation
counters.

Let NetworkStatsHistory consumers request which fields they actually
need to reduce parcel overhead.

Tests for verify varint and history field requests, also verify end-
to-end by persisting history into byte[] and restoring. Expose
bandwidth control enabled state. Extend random generation to create
packet and operation counts. Moved operation counts to long.

Fix bug that miscalculated bytes since last persist, which would
cause partial stats loss when battery pulled.

Bug: 4581977, 5023706, 5023635, 5096903
Change-Id: If61e89f681ffa11fe5711471fd9f7c238d3d37b0
etworkStatsHistoryTest.java
a63ba59260cd1bb3f5c16e395ace45a61f1d4461 20-Jul-2011 Jeff Sharkey <jsharkey@android.com> Add operation counts to network statistics.

Provide API to increment "operation counts" for a UID and tag, used
to eventually derive bytes/operation stats. Internally is stored at
network layer, but should belong at data layer. Switch profiling
to use data layer stats, which are emulated by summarizing network
layer details.

Read packet counts from new /proc/ columns and collect them into
NetworkStatsHistory. Prevent double-counting by ignoring values from
first snapshot. Watch for duplicate /proc/ entries. Update tests
to verify packet and operation counters.

Bug: 5052136, 5097392
Change-Id: I1832f65a2b8a9188f8088f253474a667c21a2f09
etworkStatsHistoryTest.java
etworkStatsTest.java
434962e44ea93b1c4d216c55f636a435bf54aa54 13-Jul-2011 Jeff Sharkey <jsharkey@android.com> Include full network history around current time.

When requesting historical values with time ranges, always include
full values for buckets that span current time. (It doesn't make
sense to interpolate partial data.) Move getTotalData() to return
full Entry objects to prepare for packet counts.

Bug: 4691901
Change-Id: I717bd721be9f1d4a47c4121e46e07a56cb15bbf1
etworkStatsHistoryTest.java
d37948f6ed1667d077e0e3a38808f42f981ddcc2 12-Jul-2011 Jeff Sharkey <jsharkey@android.com> Hide NetworkStatsHistory internals.

Instead of exposing internal storage details, offer getValues()
accessor which populates values into a recycled structure.

Change-Id: I5228d7099a8f61b2018a435a813435a67dae49b4
etworkStatsHistoryTest.java
etworkStatsTest.java
fd8be3e5e7420f3cca591daeec8a44487f5f65aa 11-Jul-2011 Jeff Sharkey <jsharkey@android.com> Return stats from inactive ifaces, packet counts.

When an iface goes inactive, xt_qtaguid maintains historical counters
instead of discarding. Now reading and returning those values in
NetworkManagementService summary calls. Tests to verify stats are
returned.

Modify NetworkStats to include rxPackets and txPackets values, and
move to Entry to eventually hide internal storage details.

Bug: 4984539
Change-Id: I1ba0bb5580c62e946d9dff2cc2a6f64aff403efc
etworkStatsTest.java
df867f8f8025c778a2d2eb4c4e364d967808743c 24-Jun-2011 Jesse Wilson <jessewilson@google.com> Test that algorithm name is case-insensitive for digest auth.

Change-Id: I891a533ae3b16b838925fa488093c19dfeb32efa
http://code.google.com/p/android/issues/detail?id=16051
ttp/DefaultHttpClientTest.java
1b5a2a96f793211bfbd39aa29cc41031dfa23950 19-Jun-2011 Jeff Sharkey <jsharkey@android.com> Read "qtaguid" network stats, refactor templates.

Teach NMS to read qtaguid stats from kernel, but fall back to older
stats when kernel doesn't support. Add "tags" to NetworkStats entries
to support qtaguid. To work around double-reporting bug, subtract
tagged stats from TAG_NONE entry.

Flesh out stronger NetworkTemplate. All NetworkStatsService requests
now require a template, and moved matching logic into template.

Record UID stats keyed on complete NetworkIdentitySet definition,
similar to how interface stats are stored. Since previous UID stats
didn't have iface breakdown, discard during file format upgrade.

Change-Id: I0447b5e7d205d73d28e71c889c568e536e91b8e4
etworkStatsTest.java
4a97122ebf4d92a3f94402041729d77905e6c0c0 12-Jun-2011 Jeff Sharkey <jsharkey@android.com> Growable NetworkStats object instead of builder.

NetworkStats now grows in place with arraycopy() instead of callers
needing to know record count a priori. Better growth calculation for
both NetworkStats and NetworkStatsHistory; 50% each time. Better
estimates of buckets needed in calling services.

Change-Id: I3adbffa0b7407612cc6349d9135a8b4eb63cd440
etworkStatsTest.java
3f3913550c10792edb8aecf66cc83c3db5c8b311 06-Jun-2011 Jeff Sharkey <jsharkey@android.com> Persist network stats using AtomicFile.

Implements read/write of network stats using AtomicFile, along with
magic number and versioning. Stores in "/data/system/netstats.bin"
for now. Tests to verify that stats are persisted across a simulated
reboot, and to verify that TEMPLATE_WIFI is working.

Fixed bug where kernel counters rolling backwards would cause negative
stats to be recorded; now we clamp deltas at 0.

Change-Id: I53bce26fc8fd3f4ab1e34ce135d302edfa34db34
etworkStatsTest.java
19862bf5d058b6ab0c2979e7a5e0297dae6b170b 03-Jun-2011 Jeff Sharkey <jsharkey@android.com> Compute range-based usage in NetworkStatsHistory.

When given a start/end range, interpolate between buckets to return
the total network usage. Used to summarize detailed UID stats. Method
to combine NetworkStatsHistory regardless of bucket size. Used to
combine all histories matching a template.

Added tests for both methods.

Change-Id: Ia463910c0ecf7cf08dcf97c658ad99742bd6b882
etworkStatsHistoryTest.java
d2a458750e5a3d490af09cecb5c28370baf0a913 29-May-2011 Jeff Sharkey <jsharkey@android.com> Map network identity using ConnectivityService.

Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService. Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates. Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
etworkStatsHistoryTest.java
7ad00e6f5ccaf975a49870cdd267d28ae144314e 07-Jun-2011 Jesse Wilson <jessewilson@google.com> Use external/mockwebserver in frameworks/base

Change-Id: Ifb45671e3e7256692c74587984ee5fe1d0eca181
ttp/AbstractProxyTest.java
ttp/CookiesTest.java
ttp/DefaultHttpClientTest.java
75279904202357565cf5a1cb11148d01f42b4569 25-May-2011 Jeff Sharkey <jsharkey@android.com> Collect historical network stats.

Periodically records delta network traffic into historical buckets to
support other services, such NetworkPolicyManager and Settings UI.

Introduces NetworkStatsHistory structure which contains sparse, uniform
buckets of data usage defined by timestamps. Service periodically
polls NetworkStats and records changes into buckets. It only persists
to disk when substantial changes have occured. Current parameters
create 4 buckets each day, and persist for 90 days, resulting in about
8kB of data per network.

Only records stats for "well known" network interfaces that have been
claimed by Telephony or Wi-Fi subsystems. Historical stats are also
keyed off identity (such as IMSI) to support SIM swapping.

Change-Id: Ia27d1289556a2bf9545fbc4f3b789425a01be53a
etworkStatsHistoryTest.java
etworkStatsTest.java
a7284f0e72745d66155e1e282fc07113332790fa 27-May-2011 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to master

Adapt to change in the way MockWebServer sets up CONNECT proxies.
git cherry-pick --no-commit c7e2feee5e7908a019a0de91123c1feb9bdc38bc

React to move of Base64 in libcore
git cherry-pick --no-commit 119f7ebdd1f8df3a8ff8e3b8056bff725d569253

Expose and document android.net.HttpResponseCache.
git cherry-pick --no-commit 7b73f0fdb8c032a65c55610541d66385bd8bcbe6)

make update-api

Change-Id: Ieb48b304ea38ee8c2ec01e860d99b1404583889e
ttp/AbstractProxyTest.java
ttp/HttpResponseCacheTest.java
eedcb9525ba5befee2ba6ebb7a9ee3f13395c2a3 17-May-2011 Jeff Sharkey <jsharkey@android.com> APIs to profile network usage for current UID.

Added startDataProfiling() and stopDataProfiling() to TrafficStats,
which can be used by apps to measure network usage delta between two
points in time. Currently takes two NetworkStats snapshots and returns
delta, which will eventually include tag-level granularity. Added
tests for NetworkStats delta subtraction.

Added NMS.getNetworkStatsUidDetail() that returns stats for specific
UID. Always gives stats access for the calling UID, otherwise enforces
that caller has permission. Fix readSingleLongFromFile(), since
/proc/ files don't have well-defined lengths.

Change-Id: Ic5b6414d8effbd66846e275b00d4b8a82c74589d
etworkStatsTest.java
aa70f101e08098ed9cb190abe2d7f952561026b8 28-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Add RouteInfo objects for tracking routes.

Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
inkPropertiesTest.java
4e900091c4da26eb1c9f0d232ee0e50f4522cc69 04-Apr-2011 John Wang <johnwang@google.com> Make LinkProperties comparable.

Add equals() and hashcode() to LinkProperties and related fields.

Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
inkPropertiesTest.java
0cb0d7a2d43874895e764fabed6a6692818dc89d 17-Dec-2010 Jesse Wilson <jessewilson@google.com> Test that DefaultHttpClient responds gracefully when the server closes a socket.
http://b/2612240

Change-Id: Iafde060572f7865b72fc568b3b55578ed5dd9c94
ttp/DefaultHttpClientTest.java
bf1df887d4b87f7da69cd4fe9306eb0d19166d52 16-Dec-2010 Jesse Wilson <jessewilson@google.com> New tests for AndroidHttpClient with a proxy server.

Change-Id: I03ec2f1257824c8675156dd80f6045512d1a36fe
http://b/3254717
ttp/AbstractProxyTest.java
ttp/AndroidHttpClientProxyTest.java
ttp/DefaultHttpClientProxyTest.java
ttp/ProxyTest.java
ee3567558f594c9039a7605d88d5671bcf465488 07-Dec-2010 Jesse Wilson <jessewilson@google.com> Merge "Test that we use proxies specified by system properties."
10733a71c5557861160292e07de011ea9a4db25c 07-Dec-2010 Jesse Wilson <jessewilson@google.com> Test that we use proxies specified by system properties.

This tests that we use the properties and also that the
precedence prefers client and request properties.

Change-Id: I480dacaf373e3ddd7642d3c918fa50695b36cdba
http://b/3254717
ttp/HttpsThroughHttpProxyTest.java
ttp/ProxyTest.java
47413708eb42753d891882f488c2d6399b298169 01-Dec-2010 Jesse Wilson <jessewilson@google.com> Add a test to demonstrate parsing of trailing URI parameters.

Change-Id: I1fde21381cf74b5e4847bb2c2a9ef52f8ac6a2bb
http://b/3124097
riTest.java
40811b01542cec7a76bdfee79e77d1f684731d37 09-Nov-2010 Jesse Wilson <jessewilson@google.com> Test to demonstrate that HTTP cookie hostnames aren't case-sensitive.

Change-Id: I05c764876acdc1e85b41f4558bd03fff526da1b4
http://b/3167208
ttp/CookiesTest.java
ad4eeb6e76420c434c7239cc1f7df6f8a6baf63e 16-Oct-2010 Jesse Wilson <jessewilson@google.com> am 9bb8e5cc: am 8f666c2d: Merge "Test that we don\'t leak sensitive information when logging cookies." into gingerbread

Merge commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429'

* commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429':
Test that we don't leak sensitive information when logging cookies.
2102bde9d4afc2a7246b62ceaab495a8ec7401f3 15-Oct-2010 Jesse Wilson <jessewilson@google.com> Test that we don't leak sensitive information when logging cookies.

Change-Id: I048a785fa7209841ff1bffc365ed5e1bceb53522
http://b/3095990
ttp/CookiesTest.java
eb8be973c7982fe3ece0aeaeca379c3b3cdced0c 12-Oct-2010 Bjorn Bringert <bringert@android.com> Make fields in WebAddress private, add getters/setters

Change-Id: Iceaf3d648289344e53c37273f7324a79676fbef7
ebAddressTest.java
d58429f9acdb33f05bdb233b7bba495de80cb336 28-Sep-2010 Steve Howard <showard@google.com> Manual merge: Move DownloadManager to android.app

Changing package at hackbod's request.

Change-Id: I867017b6a9f4684d30c6c5bd1b07f9cabecddb9f
ownloadManagerBaseTest.java
ownloadManagerIntegrationTest.java
ownloadManagerStressTest.java
31fd85f39b554e09b2e6c1c2ccf5c186859880fa 28-Sep-2010 Steve Howard <showard@google.com> Move DownloadManager to android.app (DO NOT MERGE)

Changing package at hackbod's request. I'll merge this manually, as
there's some additional master-only code that will be to be
simultaneously changed.

Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117
ownloadManagerBaseTest.java
ownloadManagerIntegrationTest.java
ownloadManagerStressTest.java
c64c6a99fb36c6d93055d6ab5c17cdf124c9ad92 21-Sep-2010 Neal Nguyen <tommyn@google.com> am abb45e67: am b9881e6b: Merge "Adding more DL Manager tests." into gingerbread

Merge commit 'abb45e6720a035e909644941b8ef7f92faeb6f34'

* commit 'abb45e6720a035e909644941b8ef7f92faeb6f34':
Adding more DL Manager tests.
df7a865bbf45b57c60d294d5ac721e67e69a2dd6 09-Sep-2010 Neal Nguyen <tommyn@google.com> Adding more DL Manager tests.

Change-Id: I87bf91fdd7dbd058c8d619200d2826ba5e7f76fb
ownloadManagerBaseTest.java
ownloadManagerIntegrationTest.java
00cfe112b436eaafb44c0466ceacce3baf10a8f3 17-Sep-2010 Wink Saville <wink@google.com> Add LinkSocket API

Restructuring ConnectivityService to handle multiple connections.

Change-Id: Ia993fbb120bebb844fd0d603dc76fbc700b31fd1
inkSocketTest.java
1e3187c27f878c083170149e645b1e2d19bc40a6 09-Sep-2010 Neal Nguyen <tommyn@google.com> am 0c592acf: Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp

Merge commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911'

* commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911':
Adding Download Manager Integration, stress, and hosts-based tests.
5f53bca55b2c9e217dee12bff8ce55e168829783 09-Aug-2010 Neal Nguyen <tommyn@google.com> Adding Download Manager Integration, stress, and hosts-based tests.

Change-Id: I97008f6cfd95ea9950db0b4e093da02528849b63
ownloadManagerBaseTest.java
ownloadManagerIntegrationTest.java
ownloadManagerStressTest.java
cf67abbc48d6d56538dd6f2412d6aa9863a31637 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp

Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e'

* commit '6ffee9bbba53700d33456261b986ac8a3f333b9e':
Revert "resolve conflicts"
2cc595af6542ba898ce3aa79daeee923b1a585fa 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Revert "resolve conflicts"

This reverts commit 84f992a249491b9f755e879bf096baac3f9472f5.
ownloadManagerBaseTest.java
ownloadManagerIntegrationTest.java
ownloadManagerStressTest.java
980bd4a12d70e87cdab3c7b39b5b1d7828913933 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 84f992a2: resolve conflicts

Merge commit '84f992a249491b9f755e879bf096baac3f9472f5'

* commit '84f992a249491b9f755e879bf096baac3f9472f5':
Adding Download Manager Integration, stress, and hosts-based tests.
40ef0f49ea9fa7c39eb0018fdb4df4b73a11a77d 09-Aug-2010 Neal Nguyen <tommyn@google.com> Adding Download Manager Integration, stress, and hosts-based tests.

Change-Id: If75021380f4aee9c650f6e34093779e85cc4e5d8
ownloadManagerBaseTest.java
ownloadManagerIntegrationTest.java
ownloadManagerStressTest.java
8bb37f7ffb24ab06576dd4225ab0a5e1828a0d07 07-Sep-2010 Steve Block <steveblock@google.com> Adds a test case for WebAddress where the path component does not have a leading slash

When a URL is malformed because the path does not start with a slash,
we assume that the path starts with the first character that is not
valid in the host and insert a leading slash. This is the reason why
the regex for the path component does not force a leading slash.

Bug: 1011602
Change-Id: I8efe46c058d2ee2d1a6a4406ee25dc021315222b
riTest.java
ebAddressTest.java
582deec1f3c8f51b431bb2ad685c9217ffd9eaad 06-Sep-2010 Steve Block <steveblock@google.com> Fixes a problem with URL parsing when the host ends with a dot

The WebAddress class provides a lenient parser for URLs. Currently, it
identifies the host portion with the regex [<chars>]+(\.[<chars>]+)* where
<chars> is the set of characters valid for the host name. This pattern excludes
the case where the host ends with a dot, which is valid possibility. As a
result, any trailing dot is pushed into the path component. Since we add a
leading slash to the path if one is missing, the result is a path that begins
with '/.'.

This fix changes the host regex to [<chars>]+[<chars>\.]* which allows trailing
dots and fixes the problem.

Bug: 2337042
Change-Id: I310512531787e0f742988f5d815ad944fd39e059
riTest.java
ebAddressTest.java
58a345936d7e2b66bdeefb492e4f777754792d7e 19-Aug-2010 Ben Dodson <bjdodson@google.com> Added methods for managing uri query parameters

Change-Id: Ic98c1bd159740dd4d895889079f9f2abae4fc2b9
riTest.java
4d42ccd1579da53aaaf132a6ad26a06e2baa5b98 19-Aug-2010 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit 353ab63e412dd15029143de238e9590ab35eb583)
make update-api

Change-Id: I9e61616828a3a5745421350b9a2fc78ba181d388
ttp/HttpsThroughHttpProxyTest.java
3c7c351a6217ac48b741740167c201a679a0ca65 05-Aug-2010 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
ttp/HttpsThroughHttpProxyTest.java
9114a8bb8b241bb8d3be307b29e64ea64ab27901 11-May-2010 Keith Ito <kito@google.com> Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter

Change-Id: I10b02306478d9c595dbcae0767b44c403d50e24a
riTest.java
e41c317348cfe23a78bfd97609c3489c6cc4a786 21-Mar-2010 Keith Ito <kito@google.com> Advance encodedKeySearchIndex if encodedKey matches a suffix of a parameter.

Bug: 2524610
Change-Id: I51bbf8248133b61825d2ae14afe175cb4d0413b8
riTest.java
1a44d5dcabc18cd5ef111f732ccff91683a1a093 13-Jan-2010 Neal Nguyen <tommyn@google.com> Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.

Most of these are file moves; a couple notable exceptions are the changes due to the move, and fixing up test code:
- database/DatabaseCursorTest.java
- database/DatabaseStatementTest.java
- net/UriTest.java
ocalSocketTest.java
SLTest.java
riMatcherTest.java
riTest.java
6505122dfe96322bdeac4210d313b3f043c6a29a 27-Jan-2010 Brian Carlstrom <bdc@google.com> Issue 1597: browser crash possibly related to invalid SSL certificate
ttp/SslCertificateTest.java