Commit graph

13,045 commits

Message SHA1
am 7e81cdef: am af3f8553: Add a lastValidated bit and use it when reporting capabilities.
automerge: 95c793a2

* commit '95c793a23d':
  Add a lastValidated bit and use it when reporting capabilities.

Lorenzo Colitti   authored and   android-build-merger   commited 2014-12-19 10:51:18 +00:00
5933735259
am b069e434: am 80a0b535: Rename validated to everValidated.
automerge: db09781

* commit 'db0978147a':
  Rename validated to everValidated.

Lorenzo Colitti   authored and   android-build-merger   commited 2014-12-19 10:49:24 +00:00
aaf03c3b12
am 7e81cdef: am af3f8553: Add a lastValidated bit and use it when reporting capabilities.
* commit '7e81cdef3625b52642969dd226a1446745e633e8':
  Add a lastValidated bit and use it when reporting capabilities.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2014-12-19 10:47:26 +00:00
95c793a23d
am b069e434: am 80a0b535: Rename validated to everValidated.
* commit 'b069e434cba6dd8f949c3ebe44507da32aef3496':
  Rename validated to everValidated.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2014-12-19 10:47:20 +00:00
db0978147a
Add a lastValidated bit and use it when reporting capabilities.
When we switched the way the status bar determines if a
connection is validated from using INET_CONDITION_ACTION
broadcasts to calling getDefaultNetworkCapabilitiesForUser(),
the statusbar stopped displaying ! when a network stopped having
working Internet connectivity. This is because the validated bit
is never set to false once a network is validated.

Fix this, hopefully temporarily, by introducing a new validated
bit that does go back to being false when a network no longer
has working connectivity, and use that bit in
getDefaultNetworkCapabilitiesForUser().

Bug: 18777225
Change-Id: I991c068be50252391d0e64c647fcf2e053dc82f9

Lorenzo Colitti   commited 2014-12-19 19:10:42 +09:00
af3f855333
Rename validated to everValidated.
This is a straight rename and thus a complete no-op from a
functionality perspective.

Bug: 18777225
Change-Id: I140d7640f1460c869a311294873772819a7a7059

Lorenzo Colitti   commited 2014-12-19 19:10:42 +09:00
80a0b535a8
merge in master-release history after reset to master
The Android Automerger   commited 2014-12-18 05:54:06 -08:00
a96349a7ff
am eeea8725: am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
* commit 'eeea8725dd':
  Fix race between CONNECTIVITY_ACTION and setting default network.

Paul Jensen   authored and   Android Git Automerger   commited 2014-12-17 13:11:21 +00:00
fdd3384f9f
am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
* commit '24594794cbb9bf6bb9c8b57e4427c88efee82304':
  Fix race between CONNECTIVITY_ACTION and setting default network.

Paul Jensen   authored and   Android Git Automerger   commited 2014-12-17 13:05:39 +00:00
eeea8725dd
Fix race between CONNECTIVITY_ACTION and setting default network.
Now that the delay between connectivity changes and CONNECTIVITY_ACTION
has been removed (ag/599650) races between CONNECTIVITY_ACTION and
the setting of the default network become more evident.
In http://crbug.com/441818 Chrome is calling getaddrinfo()
immediately after a device goes from no connectivity to cellular
connectivity, and Chrome is erroneously getting back EAI_NODATA
because netd hasn't yet set the default network for DNS resolutions.

bug:18757162
Change-Id: Ib607dcb3697403272a8c838713a9cb602e9c6820

Paul Jensen   commited 2014-12-15 15:20:30 -05:00
314f51e80d
merge in master-release history after reset to master
The Android Automerger   commited 2014-12-11 05:56:35 -08:00
5852d37a1a
am 269d28ea: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc
automerge: 51d8af7

* commit '51d8af74a5':
  Fix several HTTP proxy issues with multinetworking.

Paul Jensen   authored and   android-build-merger   commited 2014-12-11 10:25:47 +00:00
025b336325
am 269d28ea: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
automerge: d9d48cc

* commit 'd9d48cc9c7ab0d1590918e199917968eafc48288':
  Fix several HTTP proxy issues with multinetworking.

Paul Jensen   authored and   android-build-merger   commited 2014-12-11 05:49:18 +00:00
51d8af74a5
Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-12-11 04:51:16 +00:00
269d28ea09
Initial empty repository
Qiwen Zhao   commited 2014-12-10 14:10:18 -08:00
54e0c99fe8
am cb34622b: am b6992b4e: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev automerge: 56d2e8f
* commit 'cb34622bc7':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.

Erik Kline   authored and   Android Git Automerger   commited 2014-12-10 21:58:42 +00:00
a841f3a6b4
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

Paul Jensen   commited 2014-12-10 15:22:12 -05:00
1213135858
am b6992b4e: 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.

Erik Kline   authored and   android-build-merger   commited 2014-12-10 19:06:50 +00:00
cb34622bc7
merge in master-release history after reset to master
The Android Automerger   commited 2014-12-10 05:55:41 -08:00
0c33452fc7
Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
Erik Kline   authored and   Android (Google) Code Review   commited 2014-12-10 07:29:47 +00:00
b6992b4ea8
am 421a8451: am 2f5cb843: am e6ec511d: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
* commit '421a8451e8':
  Add subId as parameter for get/setDataEnabled.

Wink Saville   authored and   Android Git Automerger   commited 2014-12-09 23:47:19 +00:00
62b358f9fd
am 2f94bf63: am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
* commit '2f94bf63a7':
  Direct notification of network interface changes.

Jeff Sharkey   authored and   Android Git Automerger   commited 2014-12-09 23:20:26 +00:00
87ad83ed10
am 843d49ab: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit '843d49abea':
  Offer to "merge" subscribers for data usage.

Jeff Sharkey   authored and   Android Git Automerger   commited 2014-12-09 22:23:19 +00:00
7da4003ef1
am 2f5cb843: am e6ec511d: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
* commit '2f5cb843553a596d314596c2bb776541db864d63':
  Add subId as parameter for get/setDataEnabled.

Wink Saville   authored and   Android Git Automerger   commited 2014-12-09 18:06:03 +00:00
421a8451e8
Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
Wink Saville   authored and   Android (Google) Code Review   commited 2014-12-09 17:52:27 +00:00
e6ec511d92
am a20d7aa6: am c4b2ec1a: am 7032a8b9: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
* commit 'a20d7aa65d':
  Don't send the same PendingIntent more than once.

Jeremy Joslin   authored and   Android Git Automerger   commited 2014-12-09 01:00:09 +00:00
730455234b
am 5eba470d: am a4afe13a: am e19ed284: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev
* commit '5eba470dd7':
  Reap unvalidated networks that have no chance of becoming highest scoring.

Paul Jensen   authored and   Android Git Automerger   commited 2014-12-09 01:00:00 +00:00
5c2d8224ab
am 28fa1299: am e52a2ea0: am ebd504dc: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev
* commit '28fa1299fa':
  Fix issue #17323751: Additional items in aggregated battery stats

Dianne Hackborn   authored and   Android Git Automerger   commited 2014-12-09 00:59:01 +00:00
38e1f92aa7
am 26bf8bec: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
* commit '26bf8bec31':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"

Pavel Zhamaitsiak   authored and   Android Git Automerger   commited 2014-12-09 00:18:39 +00:00
903066df79
am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev
* commit '2f1e953f8fd6d7ee32c00a680f887607f1005f62':
  Direct notification of network interface changes.

Jeff Sharkey   authored and   Android Git Automerger   commited 2014-12-09 00:18:01 +00:00
2f94bf63a7
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

Jeff Sharkey   commited 2014-12-08 14:50:14 -08:00
7c503b1a25
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.

Jeff Sharkey   authored and   Android Git Automerger   commited 2014-12-08 19:44:27 +00:00
843d49abea
am c4b2ec1a: am 7032a8b9: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
* commit 'c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2':
  Don't send the same PendingIntent more than once.

Jeremy Joslin   authored and   Android Git Automerger   commited 2014-12-08 19:36:27 +00:00
a20d7aa65d
am a4afe13a: am e19ed284: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev
* commit 'a4afe13af38c03ae6abb76d2cf36ae0672328fd8':
  Reap unvalidated networks that have no chance of becoming highest scoring.

Paul Jensen   authored and   Android Git Automerger   commited 2014-12-08 19:36:08 +00:00
5eba470dd7
am e52a2ea0: am ebd504dc: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue #17323751: Additional items in aggregated battery stats

Dianne Hackborn   authored and   Android Git Automerger   commited 2014-12-08 19:33:49 +00:00
28fa1299fa
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"

Pavel Zhamaitsiak   authored and   Android Git Automerger   commited 2014-12-08 19:16:43 +00:00
26bf8bec31
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

Jeff Sharkey   commited 2014-12-08 08:42:59 -08:00
fe0b08d122
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

Erik Kline   commited 2014-12-08 16:25:20 +09:00
e2d501253b
merge in master-release history after reset to master
The Android Automerger   commited 2014-12-06 05:53:44 -08:00
5057e60781
Merge "Don't send the same PendingIntent more than once." into lmp-mr1-dev
Jeremy Joslin   authored and   Android (Google) Code Review   commited 2014-12-06 02:05:22 +00:00
7032a8b913
Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-12-06 01:23:56 +00:00
e19ed28412
Don't send the same PendingIntent more than once.
Fixing a bug where a NetworkRequest's PendingIntent can be sent more
than once when networks are rematched before the intent completes.

Added a small delay before removing the request to give the receiving
client an opportunity to put in its own request. The delay value is
configurable via Settings.Secure.

Bug: 18614074
Change-Id: Iac7c5e5a04f42f2b6794e9e22349cc631bebeab7

Jeremy Joslin   commited 2014-12-05 14:58:04 -08:00
b9846d0e61
Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev
Dianne Hackborn   authored and   Android (Google) Code Review   commited 2014-12-05 22:54:08 +00:00
ebd504dc9a
Fix issue #17323751: Additional items in aggregated battery stats
- Now aggregate number of times each process has crashed and ANRed.
- Now aggregate total number of connectivity changes.
- Now record connectivity changes in the history.

Crash and ANR counts are new entries at the end of "pr" in checkin.

Connectivity change counts is a new entry at the end of "m" in checkin.

Connectivity changes in the history checkin are Ecn and include the
type of connection and its state.

Change-Id: I0c01186446034cf6c3fb97d45f5e3b5c69a0438a

Dianne Hackborn   commited 2014-12-05 13:54:24 -08:00
2813a69af1
am d1c85235: am 461e7367: am f2568cef: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit 'd1c8523566':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.

Paul Jensen   authored and   Android Git Automerger   commited 2014-12-05 21:19:57 +00:00
773c74b5c9
am 461e7367: am f2568cef: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit '461e73677d208e4e97356cbc781ce490b90e2027':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.

Paul Jensen   authored and   Android Git Automerger   commited 2014-12-05 20:18:45 +00:00
d1c8523566
Add subId as parameter for get/setDataEnabled.
Bug: 18279333
Change-Id: I2496a2fd92b154e5e6981cbf6b5b5939cda59122

Wink Saville   commited 2014-12-05 11:10:30 -08:00
02eb35caee
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
This is the revert of ag/572619.

This reverts commit 31c992a477, reversing
changes made to 32b61ab28f54e5b00f472b2166f9b1100375e4ff.

Bug: 18609055
Bug: 17769720
Change-Id: I122eba200f2071d4e5777ec34c1d04fb567345a8

Erik Kline   authored and   Pavel Zhamaitsiak   commited 2014-12-05 18:02:56 +00:00
2e3fd9c6a2
am 4a3360aa: am 95b5ca90: am 31c992a4: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
* commit '4a3360aa65':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.

Erik Kline   authored and   Android Git Automerger   commited 2014-12-04 21:55:38 +00:00
25bacb41a6
am 95b5ca90: am 31c992a4: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.

Erik Kline   authored and   Android Git Automerger   commited 2014-12-04 21:45:33 +00:00
4a3360aa65