Commit Graph

1531 Commits

Author SHA1 Message Date
Robert Greenwalt
6b58bc2ba2 am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev automerge: 911bcea
automerge: 46765a0

* commit '46765a0fbc015ae07be5a8e18afd66f048883462':
  Add toString in NetworkFactory.
2014-12-11 18:15:07 +00:00
Robert Greenwalt
46765a0fbc am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev
automerge: 911bcea

* commit '911bceab1ead02fde9ccb6fe2651fee13aca817e':
  Add toString in NetworkFactory.
2014-12-11 18:07:53 +00:00
Robert Greenwalt
bde00a2b5c Merge "Add toString in NetworkFactory." into lmp-mr1-dev 2014-12-11 16:59:13 +00:00
Paul Jensen
87dfb9ec25 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc
automerge: 8f58207

* commit '8f58207319fc2b73f83874892a544f8cf59cf7e9':
  Fix several HTTP proxy issues with multinetworking.
2014-12-11 10:25:47 +00:00
Paul Jensen
8f58207319 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
automerge: d9d48cc

* commit 'd9d48cc9c7ab0d1590918e199917968eafc48288':
  Fix several HTTP proxy issues with multinetworking.
2014-12-11 05:49:18 +00:00
Paul Jensen
2122e14cca Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 2014-12-11 04:51:16 +00:00
Robert Greenwalt
6b746b5e14 Add toString in NetworkFactory.
Needed some additional logging to track down this bug
so add toString to capture the state.

bug:18569575
Change-Id: I4047b8f8797bac09bcff31e99d9cb117abb04df4
2014-12-10 19:04:50 -08:00
Erik Kline
0bf20bea81 am 34b3b53f: am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev automerge: 56d2e8f
* commit '34b3b53f9c21346282cb889363024fa4c7bb558d':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 21:58:42 +00:00
Paul Jensen
e0bef71662 Fix several HTTP proxy issues with multinetworking.
1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
   not just the default network.
2. When a process is bound to a particular Network, update the proxy
   system properties to those for the bound Network, and keep them
   updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.

bug:17905627
bug:17420465
bug:18144582

(cherry-pick of https://android-review.googlesource.com/#/c/115170)

Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
2014-12-10 15:22:12 -05:00
Erik Kline
34b3b53f9c am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
automerge: 56d2e8f

* commit '56d2e8fb7b2ab6e32efea59604eb0cd72745df1b':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 19:06:50 +00:00
Erik Kline
33cd463bbb Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 2014-12-10 07:29:47 +00:00
Wink Saville
189c180857 am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
* commit '7a4df2b7d8fc162881dd482fb13fe85c780d0351':
  Add subId as parameter for get/setDataEnabled.
2014-12-09 23:47:19 +00:00
Elliott Hughes
de472a53ac am d50a5e74: am afc5b22c: am da30b545: Merge "Fix typo."
* commit 'd50a5e7486432f7554f5135ac0609531d0fa8663':
  Fix typo.
2014-12-09 23:46:44 +00:00
Jeff Sharkey
dc460d3512 am ea06d6ce: am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
* commit 'ea06d6ceb70a0a091cae674bb7296bb470f7e594':
  Direct notification of network interface changes.
2014-12-09 23:20:26 +00:00
Jeff Sharkey
a9f6048a94 am d5b5576d: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit 'd5b5576dd6565a61030d7769a44bd5189242a7e2':
  Offer to "merge" subscribers for data usage.
2014-12-09 22:23:19 +00:00
Elliott Hughes
0aac16bbf1 am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
* commit 'b034de7eefc82a951bbf36a65b304f9475e1b44c':
  Fix typo.
2014-12-09 21:34:06 +00:00
Elliott Hughes
b034de7eef am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
* commit '12f100def9e34a554df07f47badc259028ac4c68':
  Fix typo.
2014-12-09 19:30:26 +00:00
Elliott Hughes
547b0acae1 Fix typo.
Bug: https://code.google.com/p/android/issues/detail?id=78422

(cherry picked from commit 0adcf15ad8)

Change-Id: I62746a0690e9845b20b23b91f2a50d85214e8aa1
2014-12-09 10:31:37 -08:00
Wink Saville
7a4df2b7d8 am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
* commit '2f5cb843553a596d314596c2bb776541db864d63':
  Add subId as parameter for get/setDataEnabled.
2014-12-09 18:06:03 +00:00
Wink Saville
15b29ac7fa Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 2014-12-09 17:52:27 +00:00
Elliott Hughes
d50a5e7486 am afc5b22c: am da30b545: Merge "Fix typo."
* commit 'afc5b22c229b94228aa5ae1ff20117c9c76ba2ad':
  Fix typo.
2014-12-09 16:17:34 +00:00
Elliott Hughes
0adcf15ad8 Fix typo.
Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56
2014-12-08 20:50:00 -08:00
Pavel Zhamaitsiak
0cec63a283 am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
* commit '913c9895466c6749aa1c41b875d69d5de3e3b66b':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-09 00:18:39 +00:00
Jeff Sharkey
ea06d6ceb7 am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
* commit '2f1e953f8fd6d7ee32c00a680f887607f1005f62':
  Direct notification of network interface changes.
2014-12-09 00:18:01 +00:00
Jeff Sharkey
6973634ce6 Direct notification of network interface changes.
Connectivity broadcasts recently changed and are no longer sent for
certain types of network changes.  For example, when stacked network
interfaces change for a mobile network.  To ensure that we pick up
all these details, directly wire the two services together.

Also remove some unused code for split network types.

Bug: 18666753
Change-Id: I0467bd5b330c0e0cb51af2306d821b41ad16337a
2014-12-08 14:50:14 -08:00
Jeff Sharkey
d5b5576dd6 am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit '5b41696c56c124124d48168227a83b63bd55aea7':
  Offer to "merge" subscribers for data usage.
2014-12-08 19:44:27 +00:00
Pavel Zhamaitsiak
913c989546 am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-08 19:16:43 +00:00
Jeff Sharkey
3256601f5e Offer to "merge" subscribers for data usage.
There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective.  This is done by extending the template used for
matching purposes to support multiple subscribers.

Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included.  When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.

This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface.  Also correctly create default policies for multi-SIM
devices.  This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent.  (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)

Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
2014-12-08 08:42:59 -08:00
Erik Kline
8f29dcfb53 Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
Since optimistic addresses are useable upon kernel notification
there is no need for this extra connectivity delay.

---

This functionality was originally submitted in ag/572619.  Owing
to issues with bind()ing to optimistic addresses (see b/18609055)
this was reverted in ag/598673.

This reverts the revert.  :-)

Bug: 17769720
Change-Id: Ibee490b2af72050693b6bd748193f51e312ca527
2014-12-08 16:25:20 +09:00
Wink Saville
36ffb0494d Add subId as parameter for get/setDataEnabled.
Bug: 18279333
Change-Id: I2496a2fd92b154e5e6981cbf6b5b5939cda59122
2014-12-05 11:10:30 -08:00
Erik Kline
e660e27603 Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
This is the revert of ag/572619.

This reverts commit 9261d9d645, reversing
changes made to 32b61ab28f.

Bug: 18609055
Bug: 17769720
Change-Id: I122eba200f2071d4e5777ec34c1d04fb567345a8
2014-12-05 18:02:56 +00:00
Erik Kline
0f3c0704c5 am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
* commit '180a30aa57e0790453944533dc442704f7596f65':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 21:55:38 +00:00
Erik Kline
180a30aa57 am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 21:45:33 +00:00
Erik Kline
9261d9d645 Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev 2014-12-04 03:14:02 +00:00
Sreeram Ramachandran
16d75742fc am 3a8fbb80: am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
* commit '3a8fbb8072f564c6da9b7655c1c90b26670d2f12':
  Fix docs per API review.
2014-12-03 21:51:05 +00:00
Lorenzo Colitti
41762ecac0 am 45cd4df6: am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev
* commit '45cd4df6a0915558efa6bf4ec9c61fadff70572f':
  Make StatusBar display all default networks.
2014-12-03 21:49:38 +00:00
Sreeram Ramachandran
3a8fbb8072 am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
* commit '95e4474c7069bdd85178aab96182bc0088b43a70':
  Fix docs per API review.
2014-12-03 20:43:50 +00:00
Lorenzo Colitti
45cd4df6a0 am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev
* commit 'd99cd44f317a0e1b188a0033ebe4948f13c32491':
  Make StatusBar display all default networks.
2014-12-03 20:41:10 +00:00
Sreeram Ramachandran
9e956e9b9a Fix docs per API review.
Bug: 18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144
2014-12-03 10:53:35 -08:00
Lorenzo Colitti
403aa2684e Make StatusBar display all default networks.
The basic principle is: if an app's traffic could possibly go
over a network without the app using the multinetwork APIs (hence
"by default"), then the status bar should show that network's
connectivity.

In the normal case, app traffic only goes over the system's default
network connection, so that's the only network returned.

With a VPN in force, some app traffic may go into the VPN, and thus over
whatever underlying networks the VPN specifies, while other app traffic
may go over the system default network (e.g.: a split-tunnel VPN, or an
app disallowed by the VPN), so the set of networks returned includes the
VPN's underlying networks and the system default.

Specifically:

1. Add a NETWORK_CAPABILITY_VALIDATED bit to NetworkCapabilities.
2. Add a hidden API to retrieve the NetworkCapabilities of
   all default networks for a given macro-user.
3. Modify the status bar code that used getActiveNetworkInfo to
   determine which network was active, and make it consider all
   validated networks instead.
4. Because the set of active networks depends on which VPN app
   the user is running, make the status bar re-evaluate the
   networking situation when the active user changes.

Bug: 17460017
Change-Id: Ie4965f35fb5936b088e6060ee06e362c22297ab2
2014-12-02 10:27:05 -08:00
Erik Kline
80a4543ca2 am d8b011a3: am d125266b: am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev
* commit 'd8b011a3548910a26d5b7a451bafb07b5384e246':
  Revert some verbose logging from ag/489226
2014-12-02 07:42:45 +00:00
Erik Kline
d8b011a354 am d125266b: am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev
* commit 'd125266b3c0cabcb42e6331a312c66071fedd752':
  Revert some verbose logging from ag/489226
2014-12-02 07:35:59 +00:00
Narayan Kamath
24009c1b87 am f1459604: am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."
* commit 'f1459604392dc0416500e149f1bafa11139dcfcc':
  Stop using ErrorStrings for apache.
2014-11-27 18:09:40 +00:00
Narayan Kamath
f145960439 am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."
* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
  Stop using ErrorStrings for apache.
2014-11-27 18:03:15 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache.
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
2014-11-27 17:23:41 +00:00
Narayan Kamath
0f4a1abc39 am d534645b: am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class."
* commit 'd534645bab608bbee1ec6e9e72d10b88c53c023f':
  Delete general sounding "CharArrayBuffers" class.
2014-11-27 14:15:22 +00:00
Narayan Kamath
d534645bab am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class."
* commit 'bedb13782a6beb5f15621915a7b68439c6649ced':
  Delete general sounding "CharArrayBuffers" class.
2014-11-27 14:10:03 +00:00
Narayan Kamath
b8b6e1f8f1 am 5445d3de: am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http."
* commit '5445d3de90fd28ba8e096a109a242615bb8222d3':
  Delete unused class from android.net.http.
2014-11-27 14:01:23 +00:00
Narayan Kamath
5445d3de90 am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http."
* commit 'f0c22b0c72c8fbd5ce507419adda0670871a07bf':
  Delete unused class from android.net.http.
2014-11-27 13:55:02 +00:00
Narayan Kamath
0ea4e7b581 Delete general sounding "CharArrayBuffers" class.
Move the code to the only point of use. Preparatory work for
decoupling apache-http from the frameworks.

Change-Id: Ieee54bb725cbac19d0c7513867635df6fbcf2b49
2014-11-27 13:52:11 +00:00