Commit Graph

565 Commits

Author SHA1 Message Date
Robert Greenwalt
be591d736e am 86574d66: am 0d8acea9: Make copy-constructor make deep copy.
* commit '86574d66dacc09c9b5a0a0ab2623ec01704b6fc8':
  Make copy-constructor make deep copy.
2011-07-29 09:24:38 -07:00
Robert Greenwalt
86574d66da am 0d8acea9: Make copy-constructor make deep copy.
* commit '0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
  Make copy-constructor make deep copy.
2011-07-29 09:20:51 -07:00
Robert Greenwalt
0d8acea9bb Make copy-constructor make deep copy.
Used to grab immutables but now will copy the data so the result
is mutable and we don't get crashes.

bug:5051667
Change-Id: I0878bf8c58069055f528121541d1911f404cbe49
2011-07-28 17:21:25 -07:00
Kristian Monsen
77d739006a Merge "Part of fix for bug 4997380: Some error types unknown to SslError" 2011-07-28 06:50:40 -07:00
Jeff Sharkey
2043b01b20 Merge "Maintain separate "restrict background data" flag." 2011-07-27 22:08:02 -07:00
Jeff Sharkey
4664500de0 Maintain separate "restrict background data" flag.
Since "restrict background" depends on active networks, separate its
definition from setBackgroundDataSetting().

Bug: 4979025
Change-Id: I12bfe3a2e606375b39c67706270caa7a1bb0214e
2011-07-27 21:11:32 -07:00
Chia-chi Yeh
fcbb492486 Merge "Unhide APIs for user space VPN." 2011-07-27 18:35:51 -07:00
Jeff Sharkey
41ff7ec824 Revise data limit notifs, watch kernel alerts.
Teach NetworkPolicy limits to "snooze" when requested by user, and
notify with both dialog and notification.  Register for network alerts
through NMS to trigger updates immediately instead of waiting for
next stats update.

Enforce that all NetworkPolicy are unique on a template basis, and
move SCREEN_ON/OFF broadcasts to background thread.  Launch SystemUI
and Settings directly instead of using actions, and include full
NetworkTemplate in extras.

Tests to verify notification and snooze behavior.

Bug: 5057979, 5023579, 4723336, 5045721
Change-Id: I03724beff94a7c0547cb5220431ba8d4cd44d077
2011-07-27 09:31:39 -07:00
Robert Greenwalt
41394a3610 Merge "Use dns proxy a bit." into honeycomb-LTE 2011-07-26 13:21:09 -07:00
Robert Greenwalt
572b7048a6 Use dns proxy a bit.
Sets the current default interface and sets the dns per interface.
port of changes 23041 and 22098 from opensource.
bug:5060618

Change-Id: I80e7ef88727eeb8ff2b48059f69b270e5a6b5c16
2011-07-25 17:00:13 -07:00
Robert Greenwalt
a10b7fd223 resolved conflicts for merge of a7f68230 to master
Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9
2011-07-25 16:06:25 -07:00
Robert Greenwalt
37e433fd1c Fix build.
Add NetworkUtils function missed in manual merge.

Change-Id: Ifce8f2988bb581ddc9b971b8af07a32f46c91e14
2011-07-25 14:00:42 -07:00
Mike Lockwood
5db7af968a Merge "Fix USB tethering" 2011-07-23 19:36:32 -07:00
Mike Lockwood
6c2260b3af Fix USB tethering
The previous approach no longer works with the new USB drivers, since the usb0
interface is no longer enabled by default.
This introduced a chicken & egg problem - usb0 will not be enabled until the
user tries to start tethering, but Settings will not enable the checkbox unless
usb0 is enabled.
To fix this we add an explicit call to start USB tethering in the connectivity manager.
This will enable RNDIS if necessary and then bring up tethering once usb0 is enabled.

Change-Id: Iae1f733366aa6b0dafa66d4c97207794173ef54b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-23 21:57:55 -04:00
Robert Greenwalt
6dcf2d7776 am 19933916: am ad55d351: Add better routes for secondary DNS
* commit '199339169476d0d6d0ecaa8ed3bff3a9e9a0f430':
  Add better routes for secondary DNS
2011-07-22 13:17:54 -07:00
Robert Greenwalt
ad55d35114 Add better routes for secondary DNS
We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on
some devices (multi-homed stingray) this is a problem.  Add gateway-ed hostroutes
instead so the BP can do it's nonstandard "magical" demultiplexing.

bug:5011392
Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb
2011-07-22 12:52:21 -07:00
JP Abgrall
b6055fe747 Merge "NetworkManagementService: receive bandwidth controller events" 2011-07-21 18:44:52 -07:00
Chia-chi Yeh
3c2529c717 Unhide APIs for user space VPN.
Change-Id: I2d9e5a8a3ee8556626e373bfdc93c809dad40bff
2011-07-21 18:26:46 -07:00
Chia-chi Yeh
6abf39879a VPN: add VpnBuilder as the public API of user space VPN.
Change-Id: I5d30cf592bead315509038632647c88de5060e50
2011-07-21 15:37:16 -07:00
Alon Albert
eaef351afc Add a getter for the active tag
Change-Id: I597e041867fba7efae41feea63fa196bc10e4aa2
2011-07-19 22:04:22 -07:00
Jeff Sharkey
02e21d6a5b Data usage notifs, newly installed apps, defaults.
Only show warning/limit notifications for active networks, since they
aren't actionable for inactive IMSI.  Include IMSI in debug output on
engineering builds.

Move default policy warning to be configured through overlay.  Watch
for newly installed packages to enforce global policy.

Bug: 5038729, 5038541, 4979026, 5023634
Change-Id: I8fc8ab4c23c440a3091504ea16133ed6ababf58e
2011-07-17 16:28:02 -07:00
Robert Greenwalt
d9212d3088 resolved conflicts for merge of 8550f3b8 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
2011-07-15 10:52:54 -07:00
Jeff Sharkey
4e814c348c 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
2011-07-14 20:43:27 -07:00
Robert Greenwalt
0a46db5d88 Apply the dns and route diff which we get a change
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
2011-07-14 18:12:14 -07:00
JP Abgrall
12b933d0d9 NetworkManagementService: receive bandwidth controller events
This is a 1st pass at receiving events that indicate
some quota has been reached e.g. warning quota, data collection quota,
 cutoff quota,...

It needs:
  - new kernel with quota2 logging support
  - new net:bandwidthcontroller that supports
    . quota2,
    . setting alerts.
  - new NetlinkEvent/NetlinkManager/NetlinkHandler to process
     NETLINK NFLOG messages.

Change-Id: Ibfbb13512c5350cdee0e544ec14caa6f59812409
2011-07-14 18:09:22 -07:00
Chia-chi Yeh
5779c9c2d9 VPN: close the socket in protectVpn() to avoid leaking descriptors.
Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354
2011-07-14 16:19:19 -07:00
Wink Saville
76326a9d7d am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
  Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-14 10:55:58 -07:00
Kristian Monsen
1abd5b3e6f Part of fix for bug 4997380: Some error types unknown to SslError
Mapping chromium error codes from net/base/net_error_list.h to
SslError codes.

Change-Id: Ie4f98974e23969c3b5ae1f8c4413772cf93603b9
2011-07-13 22:09:01 +01:00
Wink Saville
e822225f7a 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
2011-07-13 13:44:13 -07:00
Jeff Sharkey
3862096cbf Merge "Include full network history around current time." 2011-07-12 20:23:03 -07:00
Jeff Sharkey
434962e44e 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
2011-07-12 20:20:56 -07:00
Elliott Hughes
7b91b31e28 Fix typo in AndroidHttpClient JavaDoc.
Bug: http://code.google.com/p/android/issues/detail?id=14788
Change-Id: I7465c6c42e7b208efc9c954ac46c1b683676106e
2011-07-12 16:02:50 -07:00
Jeff Sharkey
d37948f6ed Hide NetworkStatsHistory internals.
Instead of exposing internal storage details, offer getValues()
accessor which populates values into a recycled structure.

Change-Id: I5228d7099a8f61b2018a435a813435a67dae49b4
2011-07-12 13:57:06 -07:00
Jeff Sharkey
fd8be3e5e7 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
2011-07-11 14:39:56 -07:00
Wink Saville
ae367419df resolved conflicts for merge of e4a56a32 to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
2011-07-08 12:49:14 -07:00
Wink Saville
8171e6f690 Use resetConnections with resetMask.
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
2011-07-07 16:17:06 -07:00
Irfan Sheriff
6d815e9dd0 Merge "Moved WifiWatchdogService and DnsPinger" 2011-07-06 22:08:38 -07:00
Isaac Levy
a7bc1135c2 Moved WifiWatchdogService and DnsPinger
- Moved WWS and DnsPinger in prep for StateMachine rewrite
 intent.

Change-Id: I912ca80d31ee2ded99eb345a2e5a55d01bd9910c
2011-07-06 13:54:48 -07:00
Brian Carlstrom
4a06281052 Adding additional details to ssl_certificate view
Change-Id: I3da80988b749fe60174c3c8df856d714ede518ba
2011-07-06 12:07:41 -07:00
Chia-chi Yeh
2e46764a70 VPN: implement status report for legacy VPN.
Change-Id: I81c28dafd9588572df76cbc303b0d6a0f41f9bc6
2011-07-04 03:23:12 -07:00
Chia-chi Yeh
100155a310 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
2011-07-03 17:03:27 -07:00
Chia-chi Yeh
77fd485c2f VPN: export legacy VPN in IConnectivityManager.
Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1
2011-07-02 17:15:00 -07:00
Jeff Sharkey
350083e36b 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
2011-06-30 15:47:51 -07:00
Jeff Sharkey
b3f19ca36c Enforce background data flag, rules through netd.
Connect up netd penalty box through NMS, and enforce the existing
background data flag by putting all UIDs in penalty box.  Allow
platform applications to have policy applied.  Only dispatch unique
rules to netd, avoiding any repeats.

Bug: 4598463, 4965677
Change-Id: Ibf9beff998ba7a1ea92f5e2f7eeba7b483d4b918
2011-06-30 00:17:46 -07:00
Jesse Wilson
8568db5341 Move socket tagging from libcore.
Change-Id: I7515896936c5bbd212c88e2801b831914219a925
2011-06-28 23:43:51 -07:00
Jeff Sharkey
4414cea139 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
2011-06-28 17:59:00 -07:00
Huahui Wu
5bb9b19c5a 2nd try: Gets the URL that has a cert error and carrys it in SslError.
Identical to https://android-git.corp.google.com/g/#change,117828
which was reverted since its collaborative CL broke the build.

Change-Id: I5fa7d3e9b6026639bf72530ff5b449e36f802914
2011-06-28 12:32:56 -07:00
Huahui Wu
899639dd44 Merge "Revert "Gets the URL that has a cert error and carrys it in SslError."" 2011-06-28 10:12:56 -07:00
Huahui Wu
2e029c67a8 Revert "Gets the URL that has a cert error and carrys it in SslError."
This reverts commit 3015516a46.
2011-06-28 10:10:07 -07:00
Huahui Wu
fa487ca830 Merge "Gets the URL that has a cert error and carrys it in SslError." 2011-06-28 09:38:47 -07:00