Commit graph

4,287 commits

Message SHA1
am 4dd0424d: am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
* commit '4dd0424da1':
  Fix FeatureUser leak in ConnectivityService

Wink Saville   authored and   Android Git Automerger   commited 2011-07-19 12:42:01 -07:00
8f3e3bca45
am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
* commit 'f679d4cb92b6d1c193a154abb5ae8fb3a786fc43':
  Fix FeatureUser leak in ConnectivityService

Wink Saville   authored and   Android Git Automerger   commited 2011-07-19 12:39:42 -07:00
4dd0424da1
Fix FeatureUser leak in ConnectivityService
In case infinite restoral timer is used for a network feature,
FeatureUser could be keep added but never released if a user
is keep calling "startUsingNetworkFeature".

This patch will add duplication check when adding a FeatureUser
into the list in case infinite restoral timer is used.

Bug: 5043513
Change-Id: I47e7076e217f201454fae33ce596ecdc63cf7908

Kazuhiro Ondo   authored and   Wink Saville   commited 2011-07-19 12:02:01 -07:00
cae18f1a8e
Start default connections on startup.
On devices with mobile data we were kind of doing this in Telephony.
Devices without could use this.

bug:5030831
Change-Id: I9940561e88e43917bc8e638f5c3b15fced3821ae

Robert Greenwalt   commited 2011-07-15 11:16:45 -07:00
497ff5e731
am 2ff2707d: am 57c83bb4: Small fix to 5008973 fix.
* commit '2ff2707df4':
  Small fix to 5008973 fix.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-15 11:03:52 -07:00
804e1eaec6
resolved conflicts for merge of d57579a4 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81

Robert Greenwalt   commited 2011-07-15 10:52:54 -07:00
3079c1666e
am 57c83bb4: Small fix to 5008973 fix.
* commit '57c83bb4e6':
  Small fix to 5008973 fix.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-15 10:20:48 -07:00
2ff2707df4
resolved conflicts for merge of e8d2a4a8 to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783

Robert Greenwalt   commited 2011-07-15 09:55:48 -07:00
d57579a4a4
Small fix to 5008973 fix.
Removed redundent log.
Cleaned some logic.
Will try to modify route even if recursive operation had an error.

bug: 5008973
Change-Id: Ie2ca51cc39cfac027a8a2e2eaddcb7d6c378c4da

Robert Greenwalt   commited 2011-07-15 09:45:08 -07:00
57c83bb4e6
Hide NetworkTemplate details, buffered stats I/O.
Move template matching to builder methods instead of exposing the
internal constants.  Also rule to match Ethernet usage.  Buffer
reading and writing of network stats, making operations 5x faster.

Change-Id: Iedb2d0ab3b26a976811c050f84a164e909eb74b6

Jeff Sharkey   commited 2011-07-14 20:43:27 -07:00
5a0a7aa5a4
Apply the dns and route diff which we get a change
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc

Robert Greenwalt   commited 2011-07-14 18:12:14 -07:00
e8d2a4a8a0
VPN: close the socket in protectVpn() to avoid leaking descriptors.
Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354

Chia-chi Yeh   commited 2011-07-14 16:19:19 -07:00
9e4ff6ef91
Fix build.
Changes in ConnectivityService in hc-LTE when merged with changes
happening in Master caused the build to break.

Change-Id: I92a0b782ae58e9789b1e950c94ef966234fa94af

Wink Saville   commited 2011-07-14 12:23:28 -07:00
dc5d1badd0
am 6b5e201d: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '6b5e201d47':
  Remove STOPSHIP but allow seamless Handoff when possible.

Wink Saville   authored and   Android Git Automerger   commited 2011-07-14 10:55:58 -07:00
d622c319ae
am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.

Wink Saville   authored and   Android Git Automerger   commited 2011-07-13 14:19:12 -07:00
6b5e201d47
Remove STOPSHIP but allow seamless Handoff when possible.
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9

Wink Saville   commited 2011-07-13 13:44:13 -07:00
051a664b14
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

Jeff Sharkey   commited 2011-07-12 20:20:56 -07:00
26f35e29cd
Hide NetworkStatsHistory internals.
Instead of exposing internal storage details, offer getValues()
accessor which populates values into a recycled structure.

Change-Id: I5228d7099a8f61b2018a435a813435a67dae49b4

Jeff Sharkey   commited 2011-07-12 13:57:06 -07:00
aa731e75a9
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

Jeff Sharkey   commited 2011-07-11 14:39:56 -07:00
337b986b98
resolved conflicts for merge of a3b4b5ca to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12

Wink Saville   commited 2011-07-08 12:49:14 -07:00
620e1078ec
am c101c56e: Use resetConnections with resetMask.
* commit 'c101c56ecc':
  Use resetConnections with resetMask.

Wink Saville   authored and   Android Git Automerger   commited 2011-07-08 09:40:08 -07:00
a3b4b5ca19
Use resetConnections with resetMask.
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694

Wink Saville   commited 2011-07-07 16:17:06 -07:00
c101c56ecc
VPN: implement status report for legacy VPN.
Change-Id: I81c28dafd9588572df76cbc303b0d6a0f41f9bc6

Chia-chi Yeh   commited 2011-07-04 03:23:12 -07:00
bded3eb138
VPN: convert prepare() into a form which helps solve race conditions.
When someone tries to revoke packageA, it is possible that packageA is
already revoked by packageB. In this case packageB should not be revoked,
and the new prepare() can help solve this problem.

Change-Id: Iee056a191dd99467b8ad1b5379a17b02d404bad1

Chia-chi Yeh   commited 2011-07-03 17:03:27 -07:00
3e2e1da0a0
VPN: remove the old VpnService.
Now VPN is (kind of) integrated into ConnectivityService.

Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55

Chia-chi Yeh   commited 2011-07-02 20:21:09 -07:00
6c500a4c5a
VPN: export legacy VPN in IConnectivityManager.
Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1

Chia-chi Yeh   commited 2011-07-02 17:15:00 -07:00
7e026b38e9
VPN: Use List<String> instead for dnsServers and searchDomains.
Change-Id: I5d72c182ad47f59121a04b68ec6c2d164e2d00a8

Chia-chi Yeh   commited 2011-07-01 01:14:19 -07:00
d050d1c82c
Migrate bandwidth control to NMS, omit history.
Both stats and policy make NMS calls that depend on bandwidth control
being enabled, so move enable/disable into NMS and drop calls when
disabled.  This avoids throwing heavy ISE exceptions when disabled.

Only include recent data when writing NetworkStatsHistory as part of
dumpsys call.  Introduce manual poll event for Settings UI.

Bug: 4982115, 4770435, 4515856
Change-Id: I257820b057af2f0f99c736fb4f61e55b9fdc3e66

Jeff Sharkey   commited 2011-06-30 15:47:51 -07:00
cd18d74b94
Move socket tagging from libcore.
Change-Id: I7515896936c5bbd212c88e2801b831914219a925

Jesse Wilson   commited 2011-06-28 23:43:51 -07:00
92f7f93fca
Better network stats parsing, integer tags, async.
Change NMS parsing to handle extended /proc/ stats formats by pairing
values with header keys.  Move TrafficStats to integer tags to match
kernel internals, and offer well-known tags for system services.

Async policy event dispatch from NPMS, and update tests to block for
event dispatch.  Narrow app policy to exclude apps signed with system
key, which are usually critical.

Bug: 4948913, 4903489, 4585280

Change-Id: Idb357227ccaa617906411f309371cea18d7bc519

Jeff Sharkey   commited 2011-06-28 17:59:00 -07:00
2cc5fa7fbe
am 3f2f58e9: am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
* commit '3f2f58e9d5':
  Temporary re-enabling iface name change handling on HO

Wink Saville   authored and   Android Git Automerger   commited 2011-06-27 14:14:45 -07:00
efaa396ae9
Merge "WifiWatchdogService - disable bad connections"
Irfan Sheriff   authored and   Android (Google) Code Review   commited 2011-06-25 11:20:54 -07:00
e7bfeb3d77
resolved conflicts for merge of 40717996 to master
Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada

Robert Greenwalt   commited 2011-06-24 16:10:06 -07:00
968330fae8
WifiWatchdogService - disable bad connections
Complete rewrite of WifiWatchdogService.java.  Checking for connectivity and managing wifi upon failure detection.

Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44

Isaac Levy   commited 2011-06-24 15:48:10 -07:00
5cdb9c934c
am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
* commit 'f49e4d3f182071081537dba3387db20cae27c427':
  Temporary re-enabling iface name change handling on HO

Wink Saville   authored and   Android Git Automerger   commited 2011-06-23 18:25:38 -07:00
3f2f58e9d5
Temporary re-enabling iface name change handling on HO
Temporary accept interface name change in ConnectivityService.
See bug/4455071.

Bug: 4903011
Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a

Kazuhiro Ondo   authored and   Wink Saville   commited 2011-06-23 14:58:50 -07:00
0768006559
am db32c8c5: Merge "Restrict access to protected networks." into honeycomb-LTE
* commit 'db32c8c540':
  Restrict access to protected networks.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-06-23 08:19:48 -07:00
7fb0b2856f
am be859295: (-s ours) am 9a33301d: resolved conflicts for merge of ea8e3c23 to honeycomb-LTE
* commit 'be85929569':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""

Irfan Sheriff   authored and   Android Git Automerger   commited 2011-06-23 08:16:44 -07:00
df6bab0528
Merge "Restrict access to protected networks." into honeycomb-LTE
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-06-23 08:04:48 -07:00
db32c8c540
am 060e2a4a: (-s ours) am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE
* commit '060e2a4a98':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"

Irfan Sheriff   authored and   Android Git Automerger   commited 2011-06-23 07:50:01 -07:00
016cd82367
Restrict access to protected networks.
Some networks should only be brought up and controlled by system apps.

bug: 4585677
Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b

Robert Greenwalt   commited 2011-06-22 16:35:12 -07:00
6cac07422e
resolved conflicts for merge of 796539b1 to master
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f

Robert Greenwalt   commited 2011-06-22 13:20:14 -07:00
09d6cdf338
am 9a33301d: resolved conflicts for merge of ea8e3c23 to honeycomb-LTE
* commit '9a33301da1':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""

Irfan Sheriff   authored and   Android Git Automerger   commited 2011-06-22 11:19:09 -07:00
be85929569
resolved conflicts for merge of ea8e3c23 to honeycomb-LTE
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e

Irfan Sheriff   commited 2011-06-22 11:01:16 -07:00
9a33301da1
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"

Irfan Sheriff   authored and   Android Git Automerger   commited 2011-06-22 07:47:16 -07:00
060e2a4a98
resolved conflicts for merge of 267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04

Irfan Sheriff   commited 2011-06-22 07:11:42 -07:00
a565295565
Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
This reverts commit a3663884ca.

Irfan Sheriff   commited 2011-06-21 14:26:37 -07:00
ea8e3c2322
DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
This reverts commit 9cfe6197fb.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64

Irfan Sheriff   commited 2011-06-21 11:38:23 -07:00
a3663884ca
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713

Robert Greenwalt   commited 2011-06-20 12:15:24 -07:00
796539b12a
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

Robert Greenwalt   commited 2011-06-20 11:09:23 -07:00
33cdcdf2fa