Commit Graph

2499 Commits

Author SHA1 Message Date
Lorenzo Colitti
9a9ab05153 resolved conflicts for merge of 2d2a8d16 to mnc-vt-dev
Change-Id: Ic16a7e4b146e6b2af00ae17976f876ace29a60e8
2015-07-29 09:52:48 +09:00
Robert Greenwalt
5f301c3345 am 691b8104: am f99b6f28: am 872d264c: am 91892f55: am f5a934b6: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit '691b81042f0d443dc16d82426c043d4a3f76378a':
  Un-remove legacy ConnectivityManager API.
2015-07-28 21:26:33 +00:00
Robert Greenwalt
91892f5524 am f5a934b6: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit 'f5a934b60c6ade4f034e3b5222adc1a1be66a9a4':
  Un-remove legacy ConnectivityManager API.
2015-07-28 19:57:31 +00:00
Robert Greenwalt
f5a934b60c Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 2015-07-28 19:39:48 +00:00
Lorenzo Colitti
950c6c88ab am 2ae3a05b: am b0014e9f: am 08ef66bb: am 2d2a8d16: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit '2ae3a05b424f7ef7c3a28507e2c19fde7f1e5963':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 18:48:06 +00:00
Robert Greenwalt
8c160a7614 Un-remove legacy ConnectivityManager API.
These were @removed too soon.  We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.

bug:22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
2015-07-28 11:41:31 -07:00
Paul Jensen
6eb94e6f5f Fix missing onLost NetworkCallbacks when network loses capability
If a network no longer satisfies a NetworkRequest, send the onLost
NetworkCallback.  If it was a real request (not listen) then update
the NetworkFactories.

To test this change I created a little infrastructure to fake
different Internet connectivity probe results during tests.  This
allowed me to rewrite some of ConnectivityServiceTest's logic for
validating networks.  This brought to light a couple issues that
I had to address to keep tests passing:
1. testUnlingeringDoesNotValidate was relying on a bad side-effect
   of my old method of ConnectivityServiceTest's logic for
   validating networks, so I rewrote the test.
2. ConnectivityService was not sending out NetworkCallbacks for
   WiFi when Cellular was validated.  I'm including a fix for this
   in this CL also.

Bug:22220234
Change-Id: I29314f38189817f8b2561a213c4f9e8522696663
2015-07-28 12:19:32 -04:00
Lorenzo Colitti
2d2a8d167e am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit 'e288b3af14421731d8f477b97e8d77588f20498b':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 01:20:16 +00:00
Lorenzo Colitti
05a505c943 Always check off-link connectivity in NetworkDiagnostics.
Currently, NetworkDiagnostics only checks off-link connectivity if
one of the DNS servers is off-link. Make it check off-link
connectivity in all cases by sending probes to Google Public DNS
if off-link DNS servers are not specified.

Bug: 22569331
Bug: 22641669
Bug: 22748900
Change-Id: I6cb0dd8491bc0c1a488631deca56722b9c1d2b3f
2015-07-27 16:41:44 +09:00
Erik Kline
797bf533c5 am 8d59d1c7: Pass signal strength thresholds inside a Bundle
* commit '8d59d1c718126ca893cfbe9a64e0e25770049ef0':
  Pass signal strength thresholds inside a Bundle
2015-07-21 17:12:27 +00:00
Lorenzo Colitti
260e4f7347 resolved conflicts for merge of 5d2656c1 to mnc-vt-dev
Change-Id: I112f476acf812b7ca3052c1544f324b40a04b7fb
2015-07-22 02:00:55 +09:00
Lorenzo Colitti
341df4fa1a resolved conflicts for merge of 0b798a83 to mnc-vt-dev
Change-Id: I148cd278ada966e78d3976d32e33d36846a706d1
2015-07-22 01:38:26 +09:00
Prerepa Viswanadham
511450f6e6 resolved conflicts for merge of 6b56e9e1 to mnc-vt-dev
Change-Id: Ib6418b64164c77fb1a8849af18da3c86e42a2730
2015-07-20 15:53:54 -07:00
Erik Kline
58e1ae7855 am 56066f60: am f35e9344: am ec69003d: am 8d59d1c7: Pass signal strength thresholds inside a Bundle
* commit '56066f6036afca62cf48b5971131503dba6ae7c1':
  Pass signal strength thresholds inside a Bundle
2015-07-18 18:21:25 +00:00
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