Commit Graph

399 Commits

Author SHA1 Message Date
Isaac Levy
5cdb9c934c WifiWatchdogService - disable bad connections
Complete rewrite of WifiWatchdogService.java.  Checking for connectivity and managing wifi upon failure detection.

Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44
2011-06-24 15:48:10 -07:00
Irfan Sheriff
df6bab0528 am be859295: (-s ours) am 9a33301d: resolved conflicts for merge of ea8e3c23 to honeycomb-LTE
* commit 'be85929569e103613ec760571caff3a12d7cbeff':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
2011-06-23 08:16:44 -07:00
Irfan Sheriff
016cd82367 am 060e2a4a: (-s ours) am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE
* commit '060e2a4a98b85f06d58d761b1fd977b7d6fe812e':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
2011-06-23 07:50:01 -07:00
Robert Greenwalt
09d6cdf338 resolved conflicts for merge of 796539b1 to master
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f
2011-06-22 13:20:14 -07:00
Irfan Sheriff
be85929569 am 9a33301d: resolved conflicts for merge of ea8e3c23 to honeycomb-LTE
* commit '9a33301da1fdff65836443538935b1c77ba0cb1a':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
2011-06-22 11:19:09 -07:00
Irfan Sheriff
9a33301da1 resolved conflicts for merge of ea8e3c23 to honeycomb-LTE
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
2011-06-22 11:01:16 -07:00
Irfan Sheriff
060e2a4a98 am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE
* commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
2011-06-22 07:47:16 -07:00
Irfan Sheriff
a565295565 resolved conflicts for merge of 267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
2011-06-22 07:11:42 -07:00
Irfan Sheriff
ea8e3c2322 Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
This reverts commit a3663884ca.
2011-06-21 14:26:37 -07:00
Irfan Sheriff
a3663884ca DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
This reverts commit 9cfe6197fb.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
2011-06-21 11:38:23 -07:00
Robert Greenwalt
796539b12a resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
2011-06-20 12:15:24 -07:00
Robert Greenwalt
33cdcdf2fa Fix tethering upstream determination.
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:4530116

Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71
2011-06-20 11:09:23 -07:00
Jeff Sharkey
d723e62717 Persist "tagged" network stats along with UIDs.
Now stores tags other than TAG_NONE (0x0), which are useful for app
debugging.  Combine UID and tag together into single long key, and
expose tag data through AIDL when requested.  Change NMS to track
TAG_NONE as total UID traffic, matching the kernel definition.

Added TAG_MAX_HISTORY to control how long tag-granularity statistics
are stored; overall UID usage is still kept for UID_MAX_HISTORY.  Fix
bug to trim NetworkStatsHistory outside normal polling loops to catch
non-active networks and UIDs.

Test to verify UID and tag packing, and to verify that UID traffic on
two networks are combined to match MOBILE_ALL template.

Change-Id: If0e039416d9e7f63b1a39e04cddfb1133b5a78ee
2011-06-19 21:58:39 -07:00
Jeff Sharkey
d57635406d Handle removed UIDs in network stats and policy.
When UID_REMOVED, clean up any existing UID network policy so it
doesn't linger for future apps.  Also move any NetworkStatsHistory
to special UID_REMOVED tracking bucket.

Tests for new removal code.  Also test detailed UID stats, including
network changes to verify template matching logic.

Bug: 4584212
Change-Id: I9faadf6b6f3830eb45d86c7f1980a27cdbcdb11e
2011-06-19 01:08:12 -07:00
Jeff Sharkey
de450f98eb 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
2011-06-18 22:23:11 -07:00
Jeff Sharkey
a47d7a1a70 Notify policy listeners about metered ifaces.
Currently, kernel definition of metered networks is applied at the
interface level.  This change maintain list of those metered ifaces
and notifies policy listeners, like ConnectivityService.  (This gives
us a consistent picture of when a network would be blocked.)

Bug: 4601393
Change-Id: I277d5ca96ab967a1c1c3f1da8f9587557cd6d74c
2011-06-17 16:49:21 -07:00
Jeff Sharkey
29fc3322d5 Merge "DownloadManager flags for network policy." 2011-06-16 13:39:02 -07:00
Jeff Sharkey
4434b0b55b DownloadManager flags for network policy.
Handful of DownloadManager flags to record when a download was paused
because of NetworkPolicyManager rules.

Change-Id: I99fc47f529cb6c8a42dbeca049e0cd0f1556eac4
2011-06-16 13:04:34 -07:00
Robert Greenwalt
9d145fde31 am 00ca322d: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '00ca322d5d99056b47a74075e2d2c8b464bbdbc1':
  Reset connections AFTER we take down the network.
2011-06-16 12:50:46 -07:00
Robert Greenwalt
00ca322d5d am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
  Reset connections AFTER we take down the network.
2011-06-16 12:42:15 -07:00
Robert Greenwalt
36ea869426 Reset connections AFTER we take down the network.
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.

bug: 3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
2011-06-16 11:26:54 -07:00
Chia-chi Yeh
75cacd5525 VPN: migrate from generic Bundle to our own Parcelable VpnConfig.
Note that VpnConfig is for internal use only.
Also remove hidden methods from ConnectivityManager.

Change-Id: Ic298c4dc9a2c6c452bd8f4be6fa84e7ac489c0c4
2011-06-15 17:08:58 -07:00
Jeff Sharkey
97abbe95cd 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
2011-06-11 22:17:17 -07:00
Jeff Sharkey
837b4ebf7e Persist UID stats, lazy loading, resize buckets.
Persisting detailed UID stats in separate "netstats_detail.bin" file
to enable different schedules for summary and detail polling.  Only
load detailed UID history on demand, since it's not needed during
boot.  Add test to verify UID stats are persisted across simulated
reboot.

Move external settings into well-named interface, which is still
backed by Settings.Secure.  During periodic poll events, resize any
history to match current bucket duration setting.  Test to verify.

Change-Id: I6366f3583a591f8ba859b0e5987daf8cafa4e95a
2011-06-11 17:55:56 -07:00
Jeff Sharkey
ebbebc73a0 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
2011-06-09 10:14:13 -07:00
Chia-chi Yeh
9a4ad7d52c The service part of the user space VPN support.
The dialogs will be in another change.

Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc
2011-06-08 14:16:42 -07:00
Robert Greenwalt
269d732e13 resolved conflicts for merge of 510d0a75 to master
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
2011-06-08 10:01:06 -07:00
Jeff Sharkey
512b757b08 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
2011-06-07 23:54:28 -07:00
Jeff Sharkey
21062e7c7e 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
2011-06-07 23:09:25 -07:00
Chia-chi Yeh
ab2c05370e Merge "Do not register the callbacks in the constructor." 2011-06-07 18:18:56 -07:00
Robert Greenwalt
510d0a756a am f17deff9: resolved conflicts for merge of 8de47a2f to honeycomb-LTE
* commit 'f17deff97b290382b9e111e35fc2189ac8ffb75c':
  Reveal some network constants.
2011-06-07 13:12:29 -07:00
Robert Greenwalt
f17deff97b resolved conflicts for merge of 8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Jeff Sharkey
d26449fd76 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
2011-06-01 17:44:52 -07:00
Jeff Sharkey
921ebf2ee5 Policy and rules work for ConnectivityManager.
Teach ConnectivityManager about UID-specific rules derived from policy,
such as rejecting network traffic on "paid" interfaces.  Calls that
return NetworkInfo now filter based on any REJECT rules in effect for
the calling UID.  (Added uid parameter if callers that still want all
interfaces.)

Changed NetworkPolicyManager to derive rules based on current policy
combined with PowerManager and ActivityManager status, which it passes
to ConnectivityService for eventual enforcement through netd.  When
rules change the usability of a NetworkInfo for a specific UID, it also
dispatches CONNECTIVITY_ACTION broadcasts to that UID.  Combined paid
and background policy together to match current working definition.

Change-Id: I797ea49439fcc487cfe2cbc16703d4b91ceb9af6
2011-06-01 17:00:42 -07:00
Robert Greenwalt
6a9d45449d Reveal some network constants.
Since we've already decided to inc the sdk version we should try to get these in too.

bug:4500218
Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
2011-05-31 12:06:08 -07:00
Mike Lockwood
0d5916c21e Move stringToFile utility from ConnectivityService to FileUtils
Change-Id: I59a2dc649d59677f6b5e7ade252587c7c151ec06
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-28 13:28:12 -04:00
Jeff Sharkey
0d49ed3ca8 Merge "APIs to profile network usage for current UID." 2011-05-23 18:38:04 -07:00
Chia-chi Yeh
f3204aad8e Do not register the callbacks in the constructor.
Change-Id: Ic7509c35cfb17b022a2af3cc14170942d6510e2d
2011-05-23 15:08:29 -07:00
Robert Greenwalt
1b507045bd am e0f7bc0b: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
* commit 'e0f7bc0b841c0b6a09fb7d5b259a6772b3a53df3':
  Simplfy getActive* calls in ConnectivityService
2011-05-21 21:35:38 -07:00
Jeff Sharkey
f65d11df61 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
2011-05-21 15:02:58 -07:00
Robert Greenwalt
e0f7bc0b84 resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
2011-05-20 15:45:55 -07:00
The Android Open Source Project
991f5f4ec9 Reconcile with honeycomb-release
Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f
2011-05-20 14:33:41 -07:00
The Android Open Source Project
969a009cbd Reconcile with gingerbread-release
Change-Id: If7c568d850eaffbcfc237e8b875bc5684c6dc651
2011-05-20 13:50:51 -07:00
Robert Greenwalt
e1544bb9ea Simplfy getActive* calls in ConnectivityService
One had been simplified on GB, but somehow it didn't make it here.
bug: 4463770

Change-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b
2011-05-20 12:23:41 -07:00
Wink Saville
1dc369c378 am 2a4ebb81: am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE
* commit '2a4ebb810d66b0afa75647b978febf7d337c5f78':
  Reset connection while data state changed.
2011-05-19 11:32:27 -07:00
Wink Saville
2a4ebb810d am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE
* commit '049694bfa249c9238d24e0f635b763a53c179ca2':
  Reset connection while data state changed.
2011-05-19 11:28:36 -07:00
Wink Saville
049694bfa2 Merge "Reset connection while data state changed." into honeycomb-LTE 2011-05-19 11:25:45 -07:00
Jean-Baptiste Queru
65727c9c5d Merge f024027b
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
2011-05-19 07:54:53 -07:00
Kazuhiro Ondo
842c177850 am a9f139c4: am 3a34041f: Linkproperties update via unsol data call state change.
* commit 'a9f139c4f0858bde86febd3d87bdc443c73ac220':
  Linkproperties update via unsol data call state change.
2011-05-18 17:48:37 -07:00
Robert Greenwalt
f024027b55 am 355205c0: Switch to use netd to add/remove routes.
* commit '355205c0cd712fb964cd47ec7f65616808d5ef75':
  Switch to use netd to add/remove routes.
2011-05-18 16:33:16 -07:00