Commit graph

13,045 commits

Message SHA1
Remove dead code, mostly DataStateTracker.
(cherry picked from AOSP commit 4c12c31336)

Change-Id: I18c44cd08dfb51e02a96d0b726e9af1db21e3058

Paul Jensen   commited 2015-03-18 12:29:13 -04:00
6879b9138d
Make NetworkCapabilities.NOT_VPN javadoc visible.
Also adjust wording to be more suitable for NetworkRequests and NetworkAgents.

Change-Id: I1cc93cb20779cf02d6ffa0fa11ad2916c199b365

Paul Jensen   commited 2015-03-18 09:33:07 -04:00
46c53b8099
merge in master-release history after reset to master
The Android Automerger   commited 2015-03-18 01:02:56 -07:00
1c6a1bfa8e
Merge "Fix missing printf argument." into m-wireless-dev
Erik Kline   authored and   Android Partner Code Review   commited 2015-03-18 00:18:41 +00:00
d99db0eb98
Fix missing printf argument.
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7

Erik Kline   commited 2015-03-18 08:41:42 +09:00
15417fb325
Fix missing printf argument.
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7

Erik Kline   commited 2015-03-18 08:08:57 +09:00
a2bdd8b832
Add a protectFromVpn method that takes a FileDescriptor
Bug: 19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19

Lorenzo Colitti   commited 2015-03-17 19:46:12 +09:00
5077751ec3
merge in master-release history after reset to master
The Android Automerger   commited 2015-03-17 01:03:04 -07:00
45c34c7dd8
Merge changes from topic 'dhcpclient' into m-wireless-dev
* changes:
  DHCP: Minor cleanups to the packet code.
  DHCP: Move the packet code to frameworks/base/services.
  DHCP: Add a native method for making a DHCP socket.
  DHCP: Add a superclass for DhcpStateMachine.

Lorenzo Colitti   authored and   Android Partner Code Review   commited 2015-03-16 12:12:42 +00:00
e4c5223b2b
Merge "Add two utility methods for IPv4 netmasks." into m-wireless-dev
Lorenzo Colitti   authored and   Android Partner Code Review   commited 2015-03-16 12:11:37 +00:00
d1914c5cd6
DHCP: Add a native method for making a DHCP socket.
Bug: 19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be

Lorenzo Colitti   commited 2015-03-16 20:08:45 +09:00
0e61c519ab
Add two utility methods for IPv4 netmasks.
1. Add a validating method to convert a netmask to a prefix length.
2. Add a function to get the implicit netmask of an IPv4 address.
3. Add a unit test.

Bug: 19704592
Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26

Lorenzo Colitti   commited 2015-03-16 16:07:36 +09:00
7a864c2df4
am "Refactor NetworkUtils interaction with DHCP."
merged from goog/mirror-m-wireless-internal-release
25d2dba Refactor NetworkUtils interaction with DHCP.

Vinit Deshpande   commited 2015-03-15 13:40:27 -07:00
7e67bc3a2a
merge in master-release history after reset to master
The Android Automerger   commited 2015-03-14 01:05:17 -07:00
506b20b4a4
Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK.
Change-Id: I5ad30a34f96e9e99a557b5bae9a30bfc08c89620

Paul Jensen   commited 2015-03-13 14:06:12 -04:00
7af7fd3afb
am 4a61eaf7: am 7bf23349: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"
* commit '4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b':
  Fix build, broken by https://android-review.googlesource.com/#/c/115890/

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-03-13 07:07:54 +00:00
20a6c488b6
resolved conflicts for merge of b6b9fe21 to master
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9

Andreas Gampe   commited 2015-03-13 00:04:10 -07:00
b96902e7bc
NetworkStatsService to adjust VPN stats before recording.
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183

Wenchao Tong   commited 2015-03-12 17:43:41 -07:00
ae7e9fb00a
Merge "NetworkStats to support VPN accounting."
Wenchao Tong   authored and   Android (Google) Code Review   commited 2015-03-12 22:10:56 +00:00
16ec7066c4
Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2015-03-12 07:49:23 +00:00
7bf2334945
Fix build, broken by https://android-review.googlesource.com/#/c/115890/
Change-Id: Ieafa2fb0a7f539d8f933ad9c98e3be80457da6e5

Lorenzo Colitti   commited 2015-03-12 16:48:12 +09:00
abd0acd039
Remove dead code, mostly DataStateTracker.
Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd

Paul Jensen   commited 2015-03-11 10:03:58 -04:00
4c12c31336
NetworkStats to support VPN accounting.
Create a new method to migrate underlying network traffic
from VPN app to other apps.

Bug: 19536273
Change-Id: I3434cad361592e26b01225edf8012f7b16afc98f

Wenchao Tong   commited 2015-03-09 11:38:10 -07:00
d2515d61c3
merge in master-release history after reset to master
The Android Automerger   commited 2015-03-05 01:01:25 -08:00
4335be12eb
merge in master-release history after reset to master
The Android Automerger   commited 2015-03-04 09:28:06 -08:00
013a2685b0
merge in master-release history after reset to master
The Android Automerger   commited 2015-03-03 01:01:19 -08:00
c06d90eb25
Refactor NetworkUtils interaction with DHCP.
Separate out starting DHCP (DISCOVER) and RENEW operations from fetching
the results.  Add NetworkUtils.getDhcpResults(), to enable quick checks
of any available DhcpResults without extraneous interaction with the
DHCP daemon.

Bug: 19422416
Change-Id: I58808e529dda8429737e749f5caef56d923c0809

Erik Kline   commited 2015-03-02 12:35:35 +09:00
25d2dba89c
Remove unused imports in frameworks/base.
Change-Id: I031443de83f93eb57a98863001826671b18f3b17

John Spurlock   commited 2015-02-28 14:47:49 -05:00
ca9ba60d53
merge in master-release history after reset to master
The Android Automerger   commited 2015-02-14 01:03:45 -08:00
4dc7166d2b
Merge "Move apache specific portions of android.net.http to external/apache-http."
Narayan Kamath   authored and   Android (Google) Code Review   commited 2015-02-13 09:51:44 +00:00
6478469ae5
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Jeremy Joslin   authored and   Android Git Automerger   commited 2015-02-12 19:40:58 +00:00
b5ad62a8f5
am 861103ca: am 1267462c: am f456d4dc: am 0fb710e4: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '861103ca17':
  Update Javadoc for EXTRA_NETWORK.

Jeremy Joslin   authored and   Android Git Automerger   commited 2015-02-12 19:40:48 +00:00
a0b0e76b46
am 1267462c: am f456d4dc: am 0fb710e4: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
automerge: 861103c

* commit '861103ca17':
  Update Javadoc for EXTRA_NETWORK.

Jeremy Joslin   authored and   android-build-merger   commited 2015-02-12 19:39:20 +00:00
3dccd6654e
am 1267462c: am f456d4dc: am 0fb710e4: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
  Update Javadoc for EXTRA_NETWORK.

Jeremy Joslin   authored and   Android Git Automerger   commited 2015-02-12 18:56:35 +00:00
861103ca17
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
Jeremy Joslin   authored and   Android (Google) Code Review   commited 2015-02-12 18:34:03 +00:00
0fb710e494
Move apache specific portions of android.net.http to external/apache-http.
We continue to compile external/apache-http into ext.jar. This contains
a few changes apart fom the classes moving around :

- Makefile changes to build docs and api-stubs for now. A future change
  will revert these changes and remove these classes from stubs and
  docs.
- Hardcode event IDs in legacyerrorstrings to avoid a dependency between
  the frameworks and apache. These strings are on their way out and will
  never change anyway.
- Remove imports due to {@link} tags and use {@code} instead.
- Remove an accidental(?) dependency on apache commons code that's a
  part of apache-http.

bug: 18027885

Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf

Narayan Kamath   commited 2015-02-12 11:15:49 +00:00
439fe7bfb0
merge in master-release history after reset to master
The Android Automerger   commited 2015-02-12 01:04:14 -08:00
161729b583
am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
automerge: a71787a

* commit 'a71787a1eb':
  Make reportInetCondition revalidate if the report differs from our state

Lorenzo Colitti   authored and   android-build-merger   commited 2015-02-12 07:51:11 +00:00
2a6543b79a
am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
* commit 'b0dfaad8c2a02c33885e6a278c7901da69d8ab49':
  Make reportInetCondition revalidate if the report differs from our state

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-02-12 03:09:57 +00:00
a71787a1eb
Update Javadoc for EXTRA_NETWORK.
Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef

Jeremy Joslin   commited 2015-02-11 18:28:57 -08:00
fe76e0e853
am 28707dd6: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b automerge: 00c8450
* commit '28707dd663':
  Make getNetworkInfo() take into account VPN underlying networks.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-02-11 07:40:08 +00:00
3c4f6c2fbb
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b
automerge: 00c8450

* commit '00c8450d2711de57ee45f66cae1050dbca98d1f5':
  Make getNetworkInfo() take into account VPN underlying networks.

Lorenzo Colitti   authored and   android-build-merger   commited 2015-02-11 07:32:53 +00:00
28707dd663
Make reportInetCondition revalidate if the report differs from our state
1. If reportInetCondition says the network is not working, and
   the network is already marked not validated, don't revalidate
   it. This was superfluous and should save battery.
2. If reportInetCondition says the network is working, and the
   network is not marked as validated, revalidated. This will
   allow us to get out of a validated state quickly based on app
   input (e.g., allowing GCM's exponential backoff timer to drive
   revalidation instead of our 10-minute timer).

Bug: 19258761
Bug: 19209043
Change-Id: Iaa4bac82d117ed1f4088dab106e6f6ce46b34bc3

Lorenzo Colitti   commited 2015-02-11 11:03:50 +09:00
bdda6bf579
Make getNetworkInfo() take into account VPN underlying networks.
If a user is subject to a VPN, getActiveNetworkInfo() will return
the VPN's underlying network (e.g., TYPE_WIFI), so that apps that
call getActiveNetworkInfo to answer questions like "is the device
connected to wifi?" will continue to work. Make getNetworkInfo
do this as well: if the query is for a network type that is
underlying the current user's VPN, then return that network.

Bug: 19196545
Change-Id: Ic5a651735b927c758594a26d26a03fbd704b52e6

Lorenzo Colitti   commited 2015-02-11 10:21:01 +09:00
66d4ed04ca
merge in master-release history after reset to master
The Android Automerger   commited 2015-02-07 02:04:50 -08:00
8e0f04dd79
am 2a93f1de: am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."
* commit '2a93f1de47':
  Add a unit test for StaticIpConfiguration.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-02-05 02:41:31 +00:00
579c5cd0fc
am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."
* commit '12b26c12483633f7a75d1f1c9ead73eaf6056811':
  Add a unit test for StaticIpConfiguration.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-02-05 02:31:40 +00:00
2a93f1de47
Add a unit test for StaticIpConfiguration.
Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7

Lorenzo Colitti   commited 2015-02-04 17:28:35 +09:00
e5c450b671
merge in master-release history after reset to master
The Android Automerger   commited 2015-01-31 05:52:31 -08:00
9fb9391252
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: 998c8f7 automerge: 5b392ee
automerge: e142cde

* commit 'e142cde1b3':
  Also include the domain when parceling StaticIpConfiguration.

Lorenzo Colitti   authored and   android-build-merger   commited 2015-01-30 15:59:49 +00:00
548851645c