Commit Graph

1801 Commits

Author SHA1 Message Date
Vinit Deshpande
7e67bc3a2a am "Refactor NetworkUtils interaction with DHCP."
merged from goog/mirror-m-wireless-internal-release
25d2dba Refactor NetworkUtils interaction with DHCP.
2015-03-15 13:40:27 -07:00
Lorenzo Colitti
20a6c488b6 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/
2015-03-13 07:07:54 +00:00
Andreas Gampe
b96902e7bc resolved conflicts for merge of b6b9fe21 to master
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9
2015-03-13 00:04:10 -07:00
Wenchao Tong
ae7e9fb00a 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
2015-03-12 17:43:41 -07:00
Wenchao Tong
16ec7066c4 Merge "NetworkStats to support VPN accounting." 2015-03-12 22:10:56 +00:00
Lorenzo Colitti
7bf2334945 Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/" 2015-03-12 07:49:23 +00:00
Lorenzo Colitti
abd0acd039 Fix build, broken by https://android-review.googlesource.com/#/c/115890/
Change-Id: Ieafa2fb0a7f539d8f933ad9c98e3be80457da6e5
2015-03-12 16:48:12 +09:00
Paul Jensen
4c12c31336 Remove dead code, mostly DataStateTracker.
Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd
2015-03-11 10:03:58 -04:00
Wenchao Tong
d2515d61c3 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
2015-03-09 11:38:10 -07:00
Erik Kline
25d2dba89c 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
2015-03-02 12:35:35 +09:00
John Spurlock
ca9ba60d53 Remove unused imports in frameworks/base.
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
Narayan Kamath
6478469ae5 Merge "Move apache specific portions of android.net.http to external/apache-http." 2015-02-13 09:51:44 +00:00
Jeremy Joslin
b5ad62a8f5 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-02-12 19:40:58 +00:00
Jeremy Joslin
a0b0e76b46 am 861103ca: am 1267462c: am f456d4dc: am 0fb710e4: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '861103ca17c192f8d2f93050ed77a197e4d87570':
  Update Javadoc for EXTRA_NETWORK.
2015-02-12 19:40:48 +00:00
Jeremy Joslin
3dccd6654e am 1267462c: am f456d4dc: am 0fb710e4: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
automerge: 861103c

* commit '861103ca17c192f8d2f93050ed77a197e4d87570':
  Update Javadoc for EXTRA_NETWORK.
2015-02-12 19:39:20 +00:00
Jeremy Joslin
861103ca17 am 1267462c: am f456d4dc: am 0fb710e4: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
  Update Javadoc for EXTRA_NETWORK.
2015-02-12 18:56:35 +00:00
Jeremy Joslin
0fb710e494 Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 2015-02-12 18:34:03 +00:00
Narayan Kamath
439fe7bfb0 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
2015-02-12 11:15:49 +00:00
Lorenzo Colitti
2a6543b79a am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
automerge: a71787a

* commit 'a71787a1eb13f02adb2078c7079b728d22c32328':
  Make reportInetCondition revalidate if the report differs from our state
2015-02-12 07:51:11 +00:00
Lorenzo Colitti
a71787a1eb 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
2015-02-12 03:09:57 +00:00
Jeremy Joslin
fe76e0e853 Update Javadoc for EXTRA_NETWORK.
Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
2015-02-11 18:28:57 -08:00
Lorenzo Colitti
3c4f6c2fbb am 28707dd6: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b automerge: 00c8450
* commit '28707dd663af8772c3069b6b66b13b2d07b3f3c0':
  Make getNetworkInfo() take into account VPN underlying networks.
2015-02-11 07:40:08 +00:00
Lorenzo Colitti
28707dd663 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.
2015-02-11 07:32:53 +00:00
Lorenzo Colitti
bdda6bf579 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
2015-02-11 11:03:50 +09:00
Lorenzo Colitti
66d4ed04ca 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
2015-02-11 10:21:01 +09:00
Lorenzo Colitti
579c5cd0fc am 2a93f1de: am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."
* commit '2a93f1de470cc6981bb4d55f1044ea1160817496':
  Add a unit test for StaticIpConfiguration.
2015-02-05 02:41:31 +00:00
Lorenzo Colitti
2a93f1de47 am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."
* commit '12b26c12483633f7a75d1f1c9ead73eaf6056811':
  Add a unit test for StaticIpConfiguration.
2015-02-05 02:31:40 +00:00
Lorenzo Colitti
e5c450b671 Add a unit test for StaticIpConfiguration.
Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7
2015-02-04 17:28:35 +09:00
Lorenzo Colitti
548851645c Merge "Also include the domain when parceling StaticIpConfiguration." automerge: 998c8f7 automerge: 5b392ee
automerge: e142cde

* commit 'e142cde1b354022044aaade6bee226c0010ea953':
  Also include the domain when parceling StaticIpConfiguration.
2015-01-30 15:59:49 +00:00
Lorenzo Colitti
94ef2da53c Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: 3937646 automerge: 786deba
automerge: c91a880

* commit 'c91a880e015cf545367c109412fd1fe8cf9eb60d':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
2015-01-30 15:58:39 +00:00
Lorenzo Colitti
e142cde1b3 Merge "Also include the domain when parceling StaticIpConfiguration." automerge: 998c8f7
automerge: 5b392ee

* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
  Also include the domain when parceling StaticIpConfiguration.
2015-01-30 15:56:00 +00:00
Lorenzo Colitti
c91a880e01 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: 3937646
automerge: 786deba

* commit '786deba636618fcf530e42340b0e5d683c5af74c':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
2015-01-30 15:54:45 +00:00
Lorenzo Colitti
998c8f7372 Merge "Also include the domain when parceling StaticIpConfiguration." 2015-01-30 07:07:49 +00:00
Lorenzo Colitti
39376468a4 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 2015-01-30 07:00:38 +00:00
Lorenzo Colitti
67635d5982 Also include the domain when parceling StaticIpConfiguration.
StaticIpConfiguration objects are parceled at least as part of the
IpConfiguration objects that are passed to IEthernetManager when an
application sets static IP configuration on Ethernet.

Change-Id: I49991e2f591cc6cf01b503c18eb343b5929efe29
2015-01-29 12:20:55 +00:00
Lorenzo Colitti
efdb876a00 Merge "Support connecting to networks with misconfigured subnet masks." automerge: 6eaba37 automerge: fb69689
automerge: acb4bba

* commit 'acb4bbad2ab74d0303b83cbf8653e24cae7fa64e':
  Support connecting to networks with misconfigured subnet masks.
2015-01-29 08:46:07 +00:00
Lorenzo Colitti
acb4bbad2a Merge "Support connecting to networks with misconfigured subnet masks." automerge: 6eaba37
automerge: fb69689

* commit 'fb696894ee24ffee3135f4bc460afa84f23efaeb':
  Support connecting to networks with misconfigured subnet masks.
2015-01-29 08:42:18 +00:00
Lorenzo Colitti
6eaba37f45 Merge "Support connecting to networks with misconfigured subnet masks." 2015-01-29 08:35:36 +00:00
Paul Jensen
fe83f04c44 Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

(cherry picked from commit f084aea4d7)

bug:18252947
Change-Id: I6235fcd6b875aee516efbb5f880db1a99380355b
2015-01-29 17:12:35 +09:00
Lorenzo Colitti
d5824b5d2b Support connecting to networks with misconfigured subnet masks.
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207

(cherry picked from commit d2a878d730)

Change-Id: I80088f291466dbd5a47f360dcc1620acee5cf57e
2015-01-28 20:36:37 +09:00
Lorenzo Colitti
22d4a6f870 am 50f9d93a: am 220f987b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
automerge: 2ee310c

* commit '2ee310c9c1d1ee443d087bdd0cd2c7c685da0e98':
  Support connecting to networks with misconfigured subnet masks.
2015-01-23 13:05:26 +00:00
Lorenzo Colitti
2ee310c9c1 am 50f9d93a: am 220f987b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
* commit '50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
  Support connecting to networks with misconfigured subnet masks.
2015-01-23 13:01:42 +00:00
Lorenzo Colitti
220f987bde Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 2015-01-23 12:50:32 +00:00
Lorenzo Colitti
d2a878d730 Support connecting to networks with misconfigured subnet masks.
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
2015-01-23 21:10:34 +09:00
Erik Kline
ff4e44dde5 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 8640c5d automerge: 4f36150
automerge: 0a30fd7

* commit '0a30fd758aae14a64f6bf31e826698dd57115351':
  Log interface name and uid when filtering a blocked network.
2015-01-22 07:22:19 +00:00
Erik Kline
0a30fd758a Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 8640c5d
automerge: 4f36150

* commit '4f3615036db441c4a099dc789ebcdf641ac5a987':
  Log interface name and uid when filtering a blocked network.
2015-01-22 07:18:00 +00:00
Erik Kline
8640c5de6c Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 2015-01-22 07:07:36 +00:00
Robert Greenwalt
29797098f9 am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev automerge: 9e7cb40
automerge: ef9f564

* commit 'ef9f5644077b097d300331fcde7ca7875e4cd9ee':
  Fix legacy request removal.
2015-01-22 00:10:54 +00:00
Robert Greenwalt
ef9f564407 am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
automerge: 9e7cb40

* commit '9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
  Fix legacy request removal.
2015-01-22 00:00:43 +00:00
Erik Kline
a0c6e4539a Log interface name and uid when filtering a blocked network.
Bug: 18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601
2015-01-21 12:02:11 +09:00