Commit graph

4,287 commits

Message SHA1
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

Jeff Sharkey   commited 2011-10-03 17:21:05 -07:00
ad268036a4
VPN: temporarily disable the default proxy when VPN is active.
Bug: 5361858
Change-Id: I99e84cce9c99ff1f5fdccbfd3bfb9cf496ac541c

Chia-chi Yeh   commited 2011-10-03 15:34:04 -07:00
763a11c5bd
ConnectivityService: detach the logic of global proxy.
The current implementation of global proxy is dead,
and it will be removed completely in separate changes.

Change-Id: I54f6b3960f761483d28d808e99db4c71c9c0348d

Chia-chi Yeh   commited 2011-10-03 14:04:42 -07:00
ae16661808
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-30 06:45:07 -07:00
853de1d9e9
Revert "Tell the resolver what protocols to use."
Change Ife82a8d8 broke IPv6 on wifi. Change I4e3a69ea is
an alternate approach that does not require any framework
changes.

Bug: 5284168
Change-Id: Ib6e002aa23700adc71051cf6b76860545497dbf4

Lorenzo Colitti   commited 2011-09-28 23:07:03 -07:00
aa035385d3
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-26 06:59:53 -07:00
1724d7dbdd
Merge "Watch network subtype, tethering teardown, empty."
Jeff Sharkey   authored and   Android (Google) Code Review   commited 2011-09-25 23:44:10 -07:00
6d38bd1bc3
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-25 07:00:19 -07:00
3afd130d3b
am c1abed5b: Merge "Tell the resolver what protocols to use." into ics-factoryrom
* commit 'c1abed5b5b':
  Tell the resolver what protocols to use.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-09-22 23:39:53 -07:00
bc75548c32
Merge "Tell the resolver what protocols to use." into ics-factoryrom
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-09-22 16:57:43 -07:00
c1abed5b5b
Tell the resolver what protocols to use.
Stop guessing based on the connectivity of the default route and use the correct
v4/v6 proto for your pid.

bug:5284168
Change-Id: Ife82a8d8e54c0ace2bc9e8a624b11d29a4e285e2

Robert Greenwalt   commited 2011-09-22 16:43:15 -07:00
521aaa48e2
Watch network subtype, tethering teardown, empty.
Watch for changes to telephony network subtype, and update iface
mapping to persist stats under correct type.  Update network stats
before removing tethering NAT rules.

Skip recording that would create empty historical buckets.  Query UID
stats before iface stats to always skew positive when counters are
actively rolling forward.

Bug: 5360042, 5359860, 5335674, 5334448
Change-Id: I8aa37b568e8ffb70647218aa1aff5195d3e44d5a

Jeff Sharkey   commited 2011-09-22 16:19:06 -07:00
b6188a1aac
am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom
* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
  Notify people of empty proxies too.

Wink Saville   authored and   Android Git Automerger   commited 2011-09-22 10:53:40 -07:00
693ee83a6c
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-22 07:00:05 -07:00
73b5a19829
Notify people of empty proxies too.
We were telling people when the proxy changed, except if it was changed to null.
bug:5263946

Change-Id: I83416dac8fe992168a8aafd5676f9faee4e484d0

Robert Greenwalt   commited 2011-09-21 16:37:34 -07:00
90b574ef05
am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom
* commit '4aa8d943a970008915b703758743b107927d96fa':
  Reduce connectivity logging

Wink Saville   authored and   Android Git Automerger   commited 2011-09-21 14:14:28 -07:00
933cb47f64
Reduce connectivity logging
Change-Id: I5d45b8fbcd01e42df7f2b1cf02fb5b226128abb8

Wink Saville   commited 2011-09-21 11:05:43 -07:00
a7d56571c2
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-21 07:00:07 -07:00
a9ae5b7c80
Change hostname format to conform to specification
Underscore is not allowed as per RFC 952

Bug: 5348537
Change-Id: I618c137fd54ecf36cece3b9eba39c51cda3aeac3

Irfan Sheriff   commited 2011-09-20 15:22:00 -07:00
4aa0b2ece5
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-19 06:59:57 -07:00
c9ce515a2a
Sample atomic network stats buckets, full poll.
When sampling network stats, always use atomic buckets instead of
interpolating.  Always poll iface and UID together so we distribute
into buckets equally.  Move stale bucket trimming to just before
writing stats.

Bug: 5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4

Jeff Sharkey   commited 2011-09-18 16:27:21 -07:00
f444762587
am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
* commit 'aaf301736e923db15918617145069658696be453':
  DO NOT MERGE: Sample atomic network stats buckets, full poll.

Jeff Sharkey   authored and   Android Git Automerger   commited 2011-09-18 16:21:38 -07:00
c611ea2aac
DO NOT MERGE: Sample atomic network stats buckets, full poll.
When sampling network stats, always use atomic buckets instead of
interpolating.  Always poll iface and UID together so we distribute
into buckets equally.  Move stale bucket trimming to just before
writing stats.

Bug: 5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4

Jeff Sharkey   commited 2011-09-18 16:17:51 -07:00
ade8174d53
am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom
* commit '3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799':
  Collect and persist tethering stats.

Jeff Sharkey   authored and   Android Git Automerger   commited 2011-09-18 16:17:39 -07:00
8f5e775626
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-18 07:00:21 -07:00
733e7f1993
Collect and persist tethering stats.
Use new "gettetherstats" netd command to retrieve statistics for
active tethering connections.  Keep tethering poll events separate
from UID poll, even though they end up same historical structures.

Bug: 5244846
Change-Id: Ia0c5165f6712c12b51586f86c331a2aad4ad6afb

Jeff Sharkey   commited 2011-09-16 16:05:51 -07:00
300f08f094
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-15 06:34:24 -07:00
bad184a939
NetworkManagement SocketTagger: Migrate QTagUid support to JNI.
* Instead of javaland trying to write commands to
   /proc/net/xt_qtaguid/ctrl
use the libcutils/qtaguid.c support via JNI.
* Get rid of tagToKernel() handled by qtaguid library.

Requires libcutils changes from c/132538/

Change-Id: I9de5b3fa4a596c56835024c6d376769a0eea7db1

JP Abgrall   commited 2011-09-15 02:29:03 -07:00
7682298a7d
Merge "Network stats flag to force complete poll."
Jeff Sharkey   authored and   Android (Google) Code Review   commited 2011-09-14 21:44:19 -07:00
9c57b7f2ef
Network stats flag to force complete poll.
Devices currently delay collecting UID stats during common operations
like global alerts to reduce parsing load.  Here we introduce a flag
to always collect UID and iface stats together to aid debugging.

Bug: 5321340
Change-Id: Ia8e1daf1a6f9d5f5cf1f64a04b6b6766ee965ab6

Jeff Sharkey   commited 2011-09-14 19:47:05 -07:00
d34133cad7
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
Change-Id: I2ef7b37dce08a4012ed7ba1704841fb2af846b76

The Android Open Source Project   commited 2011-09-14 07:22:47 -07:00
3b30b92fac
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-14 06:34:13 -07:00
a533b39a78
am ee4e84b3: am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE
* commit 'ee4e84b334':
  Make copies of NetworkInfo to give out.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-09-13 14:25:27 -07:00
a8d046103a
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-13 06:34:10 -07:00
6d9e964f00
Data usage structure optimizations.
Driven by traceview hotspots found in Settings UI.

Change-Id: I614a049523c526b7fcd12fffdf53a3e4723623e4

Jeff Sharkey   commited 2011-09-12 16:13:20 -07:00
4dc0642d32
Make copies of NetworkInfo to give out.
Otherwise we'll change it out from under those we've given it too.
bug:5233462

Change-Id: Iffc886849edfa6ced3da1133f9d363e11b2733f8

Robert Greenwalt   authored and   The Android Automerger   commited 2011-09-11 16:46:33 -07:00
ab13e9c111
am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE
* commit '2f835a6193c14e27cf761d85ac3ea4c9bd9296f8':
  Make copies of NetworkInfo to give out.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-09-09 15:52:42 -07:00
ee4e84b334
Make copies of NetworkInfo to give out.
Otherwise we'll change it out from under those we've given it too.
bug:5233462

Change-Id: Iffc886849edfa6ced3da1133f9d363e11b2733f8

Robert Greenwalt   commited 2011-09-09 15:10:42 -07:00
3084999887
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-08 06:34:13 -07:00
bd4c36e6d0
Poll UID stats during iface changes, enforce idx.
When ifaces change, poll UID stats without persisting, since they
depend on knowing active iface to store correctly.  Log dropped UID
stats when iface is unknown.  Switch to using flags when calling
performPoll().

Enforce that "idx" values are consistent from xt_qtaguid.  Transition
to using Log.wtf() for important checks, mostly around file I/O,
kernel stats parsing, and kernel module control.  Increase stats
persist threshold to 2MB to reduce churn.

Bug: 5269476, 5270106
Change-Id: I721215bfb65127f95775c71cf135e907cd567e92

Jeff Sharkey   commited 2011-09-07 18:06:30 -07:00
d1a5951ed9
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-02 16:02:32 -07:00
b804552052
Merge "Selectively add stats based on iface active state."
Jeff Sharkey   authored and   Android (Google) Code Review   commited 2011-09-01 21:31:15 -07:00
adbe75aaab
Selectively add stats based on iface active state.
Only combine /proc/net/dev and xt_qtaguid stats when iface is marked
as active.  When inactive, only return xt_qtaguid stats.  When iface
is unknown to xt_qtaguid, always pass through /proc/net/dev stats.

Bug: 5242730
Change-Id: I469fc6abe45309f794afebca814cbb39e4f13af5

Jeff Sharkey   commited 2011-09-01 15:23:38 -07:00
8e3b6c6eee
merge in ics-release history after reset to master
The Android Automerger   commited 2011-09-01 06:33:57 -07:00
a148e070cd
Create new isNetworkSupported API
Useful for checking if on a wifi-only device.
Similar to asking for NetworkInfo for a network type and checking for
null, though here the intent is explicit.

bug:5087537
Change-Id: Ia3ddd09b6b735b8b3ceb7a347891e015fd96b218

Robert Greenwalt   commited 2011-08-31 16:53:12 -07:00
0114f6e8e9
merge in ics-release history after reset to master
The Android Automerger   commited 2011-08-30 13:42:46 -07:00
b8660cf43f
merge in ics-release history after reset to master
The Android Automerger   commited 2011-08-30 12:45:34 -07:00
751c7451c7
Introduce immediate CONNECTIVITY_ACTION variant.
New broadcast that is dispatched immediately after connectivity
changes have been handled by ConnectivityService, bypassing any
applicable CONNECTIVITY_CHANGE_DELAY.

Also protect CONNECTIVITY_CHANGE broadcasts, since they should only
be sent by system.

Bug: 5198167
Change-Id: I75f1fb44b21da1879f0ab960bcaa481126d70fde

Jeff Sharkey   commited 2011-08-29 16:10:43 -07:00
971cd16561
Always splice historical data stats, debug info.
When reading network counters, always splice in xt_qtaguid values
to avoid counting backwards. Test to verify.

Remove verbose logging around global alerts, and add dumpsys debug
info for NMS and MDST. Also fix subtle bug around stats persisting
and dumping.

Bug: 5212893, 5211028
Change-Id: I783e5286637a67ee2dd2b09878198711a926d0cb

Jeff Sharkey   commited 2011-08-26 14:19:54 -07:00
0a7279c958
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

Jeff Sharkey   commited 2011-08-24 16:00:39 -07:00
3dadd0f1f6