Commit Graph

2635 Commits

Author SHA1 Message Date
Lorenzo Colitti
b5b3f6578e am a1694609: am 1c6b02af: am da355c80: am 5d2656c1: Support NetworkCallbacks based on signal strength.
* commit 'a1694609508b87c9c844ce07fb7a409b59c6b693':
  Support NetworkCallbacks based on signal strength.
2015-07-18 18:21:18 +00:00
Lorenzo Colitti
72458ff026 am 15cda089: am 6163290e: am e647d93d: am 0b798a83: ConnectivityManager API for for packet keepalives.
* commit '15cda089b6209ba8d68beea81271b44612bbfb95':
  ConnectivityManager API for for packet keepalives.
2015-07-18 18:05:13 +00:00
Lorenzo Colitti
e2a3e5fa2d am 2d2a5992: am 47a47d3b: am 00365fc6: am 6b56e9e1: Make immutable NetworkCapabilities more explicit.
* commit '2d2a59924d758660c40358477c54a85b03b70b75':
  Make immutable NetworkCapabilities more explicit.
2015-07-18 18:05:07 +00:00
Erik Kline
8d59d1c718 Pass signal strength thresholds inside a Bundle
Bug: 21407651
Change-Id: I2c80e89441e2eb15a246cb1fa9347f886cefa80f
2015-07-18 17:28:52 +00:00
Lorenzo Colitti
5d2656c181 Support NetworkCallbacks based on signal strength.
Bug: 21405941
Change-Id: I2ed8a5aeb8dac464a4305671ed22abcacb485bc9
2015-07-18 17:28:26 +00:00
Lorenzo Colitti
0b798a8331 ConnectivityManager API for for packet keepalives.
Bug: 21405946
Change-Id: Ie1f8f8bee684fe2bb1092a9f1bc9f5dc29b1defc
2015-07-18 17:00:13 +00:00
Lorenzo Colitti
6b56e9e1c0 Make immutable NetworkCapabilities more explicit.
Bug: 21405941
Change-Id: Iafd738c31747b0f5f9356bed1c97f5f282830af1
2015-07-18 16:59:47 +00:00
Paul Jensen
57e65708a8 Disable WiFi autojoin when user decides via "Stay connected?" dialog
If the user selects "No" in the "Stay connected?" dialog box:
1. Disable autojoining that network in the future, and
2. Disassociate from that network.

Bug:22187193
Change-Id: I14dc9236c57e3ab7d3ec95edc906787cbfbf3c9f
2015-07-16 14:41:18 +00:00
Erik Kline
6d3d49a49f am e3454420: am 678702d3: am 32cfbc9d: am 68bc390c: am 204b77ac: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
* commit 'e345442007b453c5f715ab204d48bb2082840c53':
  Log NetworkRequestInfo to get more detailed history
2015-07-14 18:45:03 +00:00
Etan Cohen
2f8e223fa9 am 6c2bba69: am afe38c01: am a249976c: am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
* commit '6c2bba69d561ec28143d81cdb67314aa74563ce0':
  Fix filter on CONNECTIVITY_ACTION updates
2015-07-14 16:51:38 +00:00
Erik Kline
6dc0891236 am 68bc390c: am 204b77ac: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
* commit '68bc390c0ab592b86b93e153fcc0c0dd51545e44':
  Log NetworkRequestInfo to get more detailed history
2015-07-14 06:17:07 +00:00
Erik Kline
204b77ac87 Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev 2015-07-14 04:09:29 +00:00
Erik Kline
edf878bedb Log NetworkRequestInfo to get more detailed history
Bug: 21641983
Bug: 22235775
Bug: 22299819
Bug: 22358164
Change-Id: I48a2d162dd499a3590f06d805267a63822856969
2015-07-14 11:46:51 +09:00
Erik Kline
99f47eaf04 Merge "Pass signal strength thresholds inside a Bundle" into mnc-vt-dev 2015-07-14 01:50:52 +00:00
Etan Cohen
67b1d603a4 am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
* commit '686be93854cce44d2dd87148ff8063edc89b6d7b':
  Fix filter on CONNECTIVITY_ACTION updates
2015-07-13 23:32:43 +00:00
Erik Kline
57fc627c32 Pass signal strength thresholds inside a Bundle
Bug: 21407651
Change-Id: I2c80e89441e2eb15a246cb1fa9347f886cefa80f
2015-07-13 18:01:15 +09:00
Robert Greenwalt
3df86c6974 Fix filter on CONNECTIVITY_ACTION updates
Only send for network types which the network supports.

bug:22411968
Change-Id: I97765544eb653caf0ea4fc5d3feec5742d5d88dc
2015-07-10 16:26:40 -07:00
Robin Lee
1bdddfab3d am f8b96edf: am 81093dd0: am 51cfb3a4: am 2164cf4f: am 718df19e: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit 'f8b96edf47b4d54ccc91842c16cc505901459cae':
  Legacy VPN calls to require a userID
2015-07-10 20:17:52 +00:00
Robin Lee
1fdce40a96 am 2164cf4f: am 718df19e: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit '2164cf4f4043b4892db5688ed53624af758fcdaa':
  Legacy VPN calls to require a userID
2015-07-10 19:35:39 +00:00
Robert Greenwalt
f5e8488b72 am cc5cd900: am e84c6b37: am 2cef47ff: am 66f59dc1: am 4ab39690: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit 'cc5cd90029a1968ec3126f73735fef3234a31678':
  Enable EMERGENCY mobile connections.
2015-07-10 19:32:12 +00:00
Robert Greenwalt
79661f9187 am 66f59dc1: am 4ab39690: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit '66f59dc1bde15be207d49fafb97db372cb01d977':
  Enable EMERGENCY mobile connections.
2015-07-10 19:22:59 +00:00
Paul Jensen
41b982ccc5 am 0bac7fa7: am 8079795a: Fix build break.
* commit '0bac7fa791ced8e1e1ab67eca72c48be1b19eded':
  Fix build break.
2015-07-10 19:20:29 +00:00
Robin Lee
718df19ed0 Merge "Legacy VPN calls to require a userID" into mnc-dev 2015-07-10 19:05:38 +00:00
Paul Jensen
4a111ae355 resolved conflicts for merge of 7f9e3274 to mnc-vt-dev
Change-Id: I6b6e5f2c1b624bf61e9d29620750cd4de8b5f3f4
2015-07-10 15:00:14 -04:00
Paul Jensen
9d01d09c79 resolved conflicts for merge of b54ec1bd to mnc-vt-dev
Change-Id: I975dbc6544dca1be0405b8fe62e0b3941fd6913b
2015-07-10 14:35:29 -04:00
Robert Greenwalt
4ab39690aa Merge "Enable EMERGENCY mobile connections." into mnc-dev 2015-07-10 18:23:24 +00:00
Paul Jensen
1aaddf3607 am 7aafe379: am 59cabcec: am 42280a7a: am 0bac7fa7: am 8079795a: Fix build break.
* commit '7aafe37981427f83f8eb263a610e60cd292dbfdb':
  Fix build break.
2015-07-10 17:54:12 +00:00
Paul Jensen
07934c24da am c4417cf9: am f50ac2e7: am cfedbc43: am 7f9e3274: am 4387ed35: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev
* commit 'c4417cf98a98211072b36cb246d0e30aa650e2f2':
  Fallback to Cellular if WiFi fails to validate
2015-07-10 16:58:13 +00:00
Paul Jensen
9cf7a099b1 am f1576d8d: am 54b98c71: am 99ef3aef: am b54ec1bd: am e40da7fc: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev
* commit 'f1576d8d07e844331685c35d976125f51a6d1a4d':
  Prepare some ConnectivityService logic for fallback to Cellular change
2015-07-10 16:58:06 +00:00
Paul Jensen
8079795a7b Fix build break.
Automatic merge commit caused breakage due to someone else's
intervening change adding a call site of a function whose last
parameter I removed.  Function in question is
ConnectivityService.rematchAllNetworksAndRequests.
Changes that merged badly are d2a43f9 and 7fb8adc.

Change-Id: I8fd32e1a187236a65c1b7c0ecdf17b817d108fd0
2015-07-10 12:29:23 -04:00
Paul Jensen
c26f580415 am 851bcaf2: am ca36baaf: am 2cb16d2e: am 75a43340: am f2479b9d: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
* commit '851bcaf2edc88d3d193304d64415a50613f46141':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
2015-07-10 15:57:45 +00:00
Paul Jensen
4387ed3583 Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev 2015-07-10 15:51:38 +00:00
Paul Jensen
e40da7fc3b Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev 2015-07-10 15:51:23 +00:00
Paul Jensen
d5088d7222 am 75a43340: am f2479b9d: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
* commit '75a43340b675fd13eac05965438aaac2a7164658':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
2015-07-10 15:19:46 +00:00
Paul Jensen
f2479b9d50 Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 2015-07-10 14:57:13 +00:00
Robert Greenwalt
b1f7f75874 Enable EMERGENCY mobile connections.
Hooks the ConnectivityManager.TYPE_MOBILE_EMERGENCY,
PhoneConstants.APN_TYPE_EMERGENCY, and NetworkCapabilities.NET_CAPABILITY_EIMS
together so carrier apps can request connections to this APN.

bug:21785357
Change-Id: Id92a5e28d19407cc7a8f8b5478b23457f2f7f89d
2015-07-09 14:49:35 -07:00
Robert Greenwalt
b2fbd1a5d6 am 30d822e2: am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev
* commit '30d822e2bdfde4360fc072f7f4ee16c83ac9dcc8':
  Revive NetworkInfo's SUSPENDED state.
2015-07-09 20:13:59 +00:00
Robert Greenwalt
f19cb714e4 am c3ed104c: am 49a8822d: am 8d6620bd: am 30d822e2: am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev
* commit 'c3ed104c25621dce3bbb50fe28e0bf9923307721':
  Revive NetworkInfo's SUSPENDED state.
2015-07-09 19:12:20 +00:00
Paul Jensen
75e0adb220 Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
This new class replaces the awkward string token and ConnectivityManager APIs
used by apps handling captive portals.

Bug:21343774
Change-Id: I1a2c69edb17322715bf8422bb4216b0ea60bfd59
2015-07-09 10:47:34 -04:00
Paul Jensen
de49eb18c6 Fallback to Cellular if WiFi fails to validate
Previously, once a network validated, for the purposes of comparing networks
to select the default network, we always considered it validated.
With this change if a network later fails to validate, we'll take this latest
validation result into account.  This means if WiFi and cellular are up
(e.g. if we recently switched from cellular->WiFi, and cellular is now
lingering) and both are validated, but for some reason WiFi fails a validation,
cellular will become the default network connection.

Bug:20896761
Change-Id: I858aa10c1aaec5cd9032067f960963409107bdb1
2015-07-09 10:26:17 -04:00
Paul Jensen
d2a43f9b6d Prepare some ConnectivityService logic for fallback to Cellular change
Reduce the duplication of some logic so when falling back to Cellular
when WiFi fails to validate is enabled, there's less chance for bugs
and failures:
1. De-duplicate several Network vs NetworkRequest matching functions
2. Remove the very tricky nascent logic by adding a simple "lingering" bit.

Bug:20896761
Change-Id: I21da9e827eec9cfd6835fcaa650192b9186ed053
2015-07-09 10:26:08 -04:00
Robert Greenwalt
7fb8adcd51 Revive NetworkInfo's SUSPENDED state.
This got lost in the multinetwork work for L.  It means
that if telephony stops having the ability to pass packets for a while
the rest of the platform doesn't know.

Telephony enters the suspended state if it enters a telephony call
while using certain radio access technologies, or if it switches to
one of those RATs while in a call.  It also can enter this state if
it temporarily loses contact with the network - the modem will
not report the loss of the data call for an indeterminant time in
the hope that regaining the network will restore the connection
without harm to any ongoing ip layer interactions.  For example
passing through a tunnel or taking an elevator trip may use this
mechanism.

bug: 19637156
Change-Id: If9fde68175e8561c19323c81fbfcb02a6e5a00fb
2015-07-08 20:42:55 -07:00
Lorenzo Colitti
98a4c4d25b Support NetworkCallbacks based on signal strength.
Bug: 21405941
Change-Id: I2ed8a5aeb8dac464a4305671ed22abcacb485bc9
2015-07-09 03:34:25 +09:00
Lorenzo Colitti
493910ac44 ConnectivityManager API for for packet keepalives.
Bug: 21405946
Change-Id: Ie1f8f8bee684fe2bb1092a9f1bc9f5dc29b1defc
2015-07-09 03:34:24 +09:00
Lorenzo Colitti
696a214258 Make immutable NetworkCapabilities more explicit.
Bug: 21405941
Change-Id: Iafd738c31747b0f5f9356bed1c97f5f282830af1
2015-07-09 03:34:24 +09:00
Robin Lee
35ca2e7768 Legacy VPN calls to require a userID
This way, system applications with INTERACT_ACROSS_USERS permission will
be able to fetch the information they need.

Pre-requisite for bug 21499103

Change-Id: I7e759d5039ae6e85abc6435049016b1dcaabc834
2015-07-07 19:37:21 +00:00
Paul Jensen
8e6e66dfec am 5973eb48: am bf816248: am e51c46b0: Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev
* commit '5973eb48220e1e44a4a3192cd9740fe8b47f8a3a':
  Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API
2015-07-03 05:35:58 +00:00
Paul Jensen
cb9c502cdb am e51c46b0: Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev
* commit 'e51c46b0683114d0aa9010a45ec0443505a0b389':
  Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API
2015-07-01 16:28:56 +00:00
Paul Jensen
169f662203 Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API
This better pairs up with
registerNetworkCallback(NetworkRequest, PendingIntent).

Bug:22175708
Change-Id: I336df3f48a0b814f1cbeba6d00afc4e6cc536483
2015-06-30 14:29:18 -04:00
Paul Jensen
6181a88767 am 2d72041d: am 013275d5: am 0a1bac88: Merge "Don\'t reevaluate disconnected networks" into mnc-dev
* commit '2d72041d47faa6718a7a0ec0b9b9b9b75757651b':
  Don't reevaluate disconnected networks
2015-06-30 11:44:49 +00:00