Commit Graph

8564 Commits

Author SHA1 Message Date
Robert Greenwalt
e72c4aca58 Fix build.
Missed a commit that fixed some issues.
bug:5237167

Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded
2011-11-08 10:12:25 -08:00
The Android Automerger
bd415a36db merge in ics-release history after reset to master 2011-11-08 06:53:51 -08:00
tk.mun
093f55ca9c Wimax : wimax framework related open source.
Integrate wimax network related changes into Android Framework.
- In Connectivity service, start wimax service.
- 4G icon display in StatusBarPolicy.
- DHCP renew add.
- Add radio for wiamx

Change-Id: I2d9012247edfdf49d71ca7e1414afd0006f330ca
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5237167
2011-11-07 14:47:40 -08:00
The Android Automerger
676e0a2db7 merge in ics-release history after reset to master 2011-11-06 07:00:26 -08:00
The Android Automerger
0f7eb3a300 merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:46:10 -08:00
Robert Greenwalt
85112853e0 am 9dcad728: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '9dcad728731206b3b41f07de65c706d9d4084124':
  Start using IP tool for advanced routing.
2011-11-04 22:57:48 +00:00
Robert Greenwalt
9dcad72873 am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
  Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00
Robert Greenwalt
49c75d3db9 Start using IP tool for advanced routing.
bug:5495862
bug:5396842
Change-Id: I5e31b352b14a4dc746cacce4d61cf8d9ad7382a0
2011-11-04 09:52:04 -07:00
Doug Zongker
f30bfd16cc Merge "store the hw addr in the extraInfo field of ethernet NetworkInfos" into ics-aah 2011-11-03 13:17:33 -07:00
Doug Zongker
947da0eb6d store the hw addr in the extraInfo field of ethernet NetworkInfos
Change-Id: Ic645396e81d1481d84061945eb9721f0eeb151eb
2011-11-03 12:45:42 -07:00
The Android Automerger
c010bce778 merge in ics-release history after reset to master 2011-11-03 06:59:11 -07:00
The Android Automerger
3414200369 merge in ics-mr1-release history after reset to ics-mr1 2011-11-03 06:44:18 -07:00
Jeff Sharkey
e370a59bec 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
2011-11-02 15:14:11 -07:00
The Android Automerger
5358edb6d7 merge in ics-release history after reset to master 2011-10-30 07:00:19 -07:00
The Android Automerger
6e46141933 merge in ics-mr1-release history after reset to ics-mr1 2011-10-30 06:46:55 -07:00
Robert Greenwalt
274518a279 Temp disable Tethering if DUN is required
Getting source-based routing working is too risk for this point
in the project but tethering is broken otherwise, so disable
the tethering option if DUN is required until we can get a real
fix in.

bug:5495862
Change-Id: I5e852bf30c887599024a8b61af86ffec1d5333af
2011-10-27 14:50:27 -07:00
The Android Automerger
566d8c4b49 merge in ics-release history after reset to master 2011-10-10 07:00:11 -07:00
Jeff Sharkey
aac2c50385 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
2011-10-09 13:49:08 -07:00
The Android Automerger
8cc55a22bc merge in ics-release history after reset to master 2011-10-09 07:00:35 -07:00
Scott Main
f58b7d82d0 docs: some helpful javadocs for network info
Change-Id: I8f1879bf10acd6371a76f11a8e5ec08643c3f943
2011-10-06 19:26:48 -07:00
Scott Main
5058914700 docs: deprecate thingy
Change-Id: I579824680f3b5110d56981becaaf81f917989e7e
2011-10-06 18:32:43 -07:00
Chia-chi Yeh
ec49c91929 Merge "VPN: temporarily disable the default proxy when VPN is active." 2011-10-06 15:29:50 -07:00
Chia-chi Yeh
f386f9ec7e Merge "ConnectivityService: detach the logic of global proxy." 2011-10-06 15:29:43 -07:00
Jeff Sharkey
7aaf57609e am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom
* commit 'a50d0f8985d811a6a2f49aa65e31892048e96ccf':
  Hide quota APIs until finalized.
2011-10-06 11:22:40 -07:00
Jeff Sharkey
eb3e8c66cb Hide quota APIs until finalized.
Bug: 5383656
Change-Id: Ia2a978a6ff2ee642b0ea4d7d6b8857b7efffd612
2011-10-06 10:50:09 -07:00
The Android Automerger
78c740e6c4 merge in ics-release history after reset to master 2011-10-05 06:58:56 -07:00
Jeff Sharkey
d49f1a59f9 Read iface stats from single proc file.
When available, use single "iface_stat_all" file instead of reading
values from dozens of files scattered across proc.  Tests to verify.

Bug: 5397840
Change-Id: I0247be518436c1f79b32c4b72216739f49a9e8cc
2011-10-04 13:22:39 -07:00
Jeff Sharkey
ad268036a4 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
2011-10-03 17:21:05 -07:00
Chia-chi Yeh
763a11c5bd VPN: temporarily disable the default proxy when VPN is active.
Bug: 5361858
Change-Id: I99e84cce9c99ff1f5fdccbfd3bfb9cf496ac541c
2011-10-03 15:34:04 -07:00
Chia-chi Yeh
ae16661808 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
2011-10-03 14:04:42 -07:00
The Android Automerger
853de1d9e9 merge in ics-release history after reset to master 2011-09-30 06:45:07 -07:00
Lorenzo Colitti
aa035385d3 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
2011-09-28 23:07:03 -07:00
The Android Automerger
1724d7dbdd merge in ics-release history after reset to master 2011-09-26 06:59:53 -07:00
Jeff Sharkey
6d38bd1bc3 Merge "Watch network subtype, tethering teardown, empty." 2011-09-25 23:44:10 -07:00
The Android Automerger
3afd130d3b merge in ics-release history after reset to master 2011-09-25 07:00:19 -07:00
Robert Greenwalt
bc75548c32 am c1abed5b: Merge "Tell the resolver what protocols to use." into ics-factoryrom
* commit 'c1abed5b5b202d7dec168959b9b8cb3f78ccbad3':
  Tell the resolver what protocols to use.
2011-09-22 23:39:53 -07:00
Robert Greenwalt
c1abed5b5b Merge "Tell the resolver what protocols to use." into ics-factoryrom 2011-09-22 16:57:43 -07:00
Robert Greenwalt
521aaa48e2 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
2011-09-22 16:43:15 -07:00
Jeff Sharkey
b6188a1aac 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
2011-09-22 16:19:06 -07:00
Wink Saville
693ee83a6c am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom
* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
  Notify people of empty proxies too.
2011-09-22 10:53:40 -07:00
The Android Automerger
73b5a19829 merge in ics-release history after reset to master 2011-09-22 07:00:05 -07:00
Robert Greenwalt
90b574ef05 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
2011-09-21 16:37:34 -07:00
Wink Saville
933cb47f64 am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom
* commit '4aa8d943a970008915b703758743b107927d96fa':
  Reduce connectivity logging
2011-09-21 14:14:28 -07:00
Wink Saville
a7d56571c2 Reduce connectivity logging
Change-Id: I5d45b8fbcd01e42df7f2b1cf02fb5b226128abb8
2011-09-21 11:05:43 -07:00
The Android Automerger
a9ae5b7c80 merge in ics-release history after reset to master 2011-09-21 07:00:07 -07:00
Irfan Sheriff
4aa0b2ece5 Change hostname format to conform to specification
Underscore is not allowed as per RFC 952

Bug: 5348537
Change-Id: I618c137fd54ecf36cece3b9eba39c51cda3aeac3
2011-09-20 15:22:00 -07:00
The Android Automerger
c9ce515a2a merge in ics-release history after reset to master 2011-09-19 06:59:57 -07:00
Jeff Sharkey
f444762587 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
2011-09-18 16:27:21 -07:00
Jeff Sharkey
c611ea2aac 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.
2011-09-18 16:21:38 -07:00
Jeff Sharkey
ade8174d53 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
2011-09-18 16:17:51 -07:00