Commit graph

1,794 commits

Message SHA1
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
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
Remove unused imports in frameworks/base.
Change-Id: I031443de83f93eb57a98863001826671b18f3b17

John Spurlock   commited 2015-02-28 14:47:49 -05:00
ca9ba60d53
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
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
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 "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
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: 3937646 automerge: 786deba
automerge: c91a880

* commit 'c91a880e01':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()

Lorenzo Colitti   authored and   android-build-merger   commited 2015-01-30 15:58:39 +00:00
94ef2da53c
Merge "Also include the domain when parceling StaticIpConfiguration." automerge: 998c8f7
automerge: 5b392ee

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

Lorenzo Colitti   authored and   android-build-merger   commited 2015-01-30 15:56:00 +00:00
e142cde1b3
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: 3937646
automerge: 786deba

* commit '786deba636618fcf530e42340b0e5d683c5af74c':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()

Lorenzo Colitti   authored and   android-build-merger   commited 2015-01-30 15:54:45 +00:00
c91a880e01
Merge "Also include the domain when parceling StaticIpConfiguration."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2015-01-30 07:07:49 +00:00
998c8f7372
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2015-01-30 07:00:38 +00:00
39376468a4
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

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

* commit 'acb4bbad2a':
  Support connecting to networks with misconfigured subnet masks.

Lorenzo Colitti   authored and   android-build-merger   commited 2015-01-29 08:46:07 +00:00
efdb876a00
Merge "Support connecting to networks with misconfigured subnet masks." automerge: 6eaba37
automerge: fb69689

* commit 'fb696894ee24ffee3135f4bc460afa84f23efaeb':
  Support connecting to networks with misconfigured subnet masks.

Lorenzo Colitti   authored and   android-build-merger   commited 2015-01-29 08:42:18 +00:00
acb4bbad2a
Merge "Support connecting to networks with misconfigured subnet masks."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2015-01-29 08:35:36 +00:00
6eaba37f45
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

Paul Jensen   authored and   Lorenzo Colitti   commited 2015-01-29 17:12:35 +09:00
fe83f04c44
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

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

* commit '2ee310c9c1':
  Support connecting to networks with misconfigured subnet masks.

Lorenzo Colitti   authored and   android-build-merger   commited 2015-01-23 13:05:26 +00:00
22d4a6f870
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.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-01-23 13:01:42 +00:00
2ee310c9c1
Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2015-01-23 12:50:32 +00:00
220f987bde
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

Lorenzo Colitti   commited 2015-01-23 21:10:34 +09:00
d2a878d730
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 8640c5d automerge: 4f36150
automerge: 0a30fd7

* commit '0a30fd758a':
  Log interface name and uid when filtering a blocked network.

Erik Kline   authored and   android-build-merger   commited 2015-01-22 07:22:19 +00:00
ff4e44dde5
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.

Erik Kline   authored and   android-build-merger   commited 2015-01-22 07:18:00 +00:00
0a30fd758a
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
Erik Kline   authored and   Android (Google) Code Review   commited 2015-01-22 07:07:36 +00:00
8640c5de6c
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev automerge: 9e7cb40
automerge: ef9f564

* commit 'ef9f564407':
  Fix legacy request removal.

Robert Greenwalt   authored and   android-build-merger   commited 2015-01-22 00:10:54 +00:00
29797098f9
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
automerge: 9e7cb40

* commit '9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
  Fix legacy request removal.

Robert Greenwalt   authored and   android-build-merger   commited 2015-01-22 00:00:43 +00:00
ef9f564407
Log interface name and uid when filtering a blocked network.
Bug: 18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601

Erik Kline   commited 2015-01-21 12:02:11 +09:00
a0c6e4539a
am c526df98: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
* commit 'c526df987d':
  Changes associated with an OkHttp upgrade

Neil Fuller   authored and   Android Git Automerger   commited 2015-01-20 13:29:31 +00:00
915c21e46d
resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp
Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0

Neil Fuller   commited 2015-01-20 13:21:58 +00:00
c526df987d
Changes associated with an OkHttp upgrade
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5

Neil Fuller   commited 2015-01-20 11:59:24 +00:00
61baa3a7ff
Fix legacy request removal.
Don't say we're disconnected from a legacy type until there are no outstanding requests for it.

bug:18946574
Change-Id: I8e45c4a7558f7ced0840b71c50081989ba13c1c7

Robert Greenwalt   commited 2015-01-16 16:06:39 -08:00
b0491bb5a8
resolve merge conflicts of 87f5369 to master.
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086

Jorim Jaggi   commited 2015-01-15 00:12:18 +01:00
e3de01130b
am be61ffa4: am a76959f5: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
* commit 'be61ffa4fe42b4e6fdb677c7b1aeefb43ad3ef9f':
  Don't blindly teardown unvalidated networks when releasing NetworkRequests.

Paul Jensen   authored and   Android Git Automerger   commited 2015-01-14 19:24:09 +00:00
3897079ce9
Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2015-01-14 12:39:01 +00:00
a76959f5f9