13,045 commits

This branch

This branch

All branches

Message	SHA1
am 2ae3a05b: am b0014e9f: am 08ef66bb: am b5f86615: 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. Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-07-28 18:48:06 +00:00	738f5ae147
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 Robert Greenwalt   commited 2015-07-28 11:41:31 -07:00	b40e37e123
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 Paul Jensen   commited 2015-07-28 12:19:32 -04:00	8c23d5f652
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. Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-07-28 01:20:16 +00:00	b5f86615b6
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 Lorenzo Colitti   commited 2015-07-27 16:41:44 +09:00	994ba7343f
am 2308195d: Pass signal strength thresholds inside a Bundle ... * commit '2308195d12': Pass signal strength thresholds inside a Bundle Erik Kline   authored and   Android Git Automerger   commited 2015-07-21 17:12:27 +00:00	3853d2fa76
resolved conflicts for merge of 87f93fe6 to mnc-vt-dev ... Change-Id: I112f476acf812b7ca3052c1544f324b40a04b7fb Lorenzo Colitti   commited 2015-07-22 02:00:55 +09:00	7cc12b83c5
resolved conflicts for merge of d1039d17 to mnc-vt-dev ... Change-Id: I148cd278ada966e78d3976d32e33d36846a706d1 Lorenzo Colitti   commited 2015-07-22 01:38:26 +09:00	ab0d88c47f
resolved conflicts for merge of 6d71af1f to mnc-vt-dev ... Change-Id: Ib6418b64164c77fb1a8849af18da3c86e42a2730 Prerepa Viswanadham   commited 2015-07-20 15:53:54 -07:00	852a38e0d8
am 56066f60: am f35e9344: am ec69003d: am 2308195d: Pass signal strength thresholds inside a Bundle ... * commit '56066f6036afca62cf48b5971131503dba6ae7c1': Pass signal strength thresholds inside a Bundle Erik Kline   authored and   Android Git Automerger   commited 2015-07-18 18:21:25 +00:00	0f9cb6b6f5
am a1694609: am 1c6b02af: am da355c80: am 87f93fe6: Support NetworkCallbacks based on signal strength. ... * commit 'a1694609508b87c9c844ce07fb7a409b59c6b693': Support NetworkCallbacks based on signal strength. Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-07-18 18:21:18 +00:00	115d5e5ae8
am 15cda089: am 6163290e: am e647d93d: am d1039d17: ConnectivityManager API for for packet keepalives. ... * commit '15cda089b6209ba8d68beea81271b44612bbfb95': ConnectivityManager API for for packet keepalives. Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-07-18 18:05:13 +00:00	adffd32afe
am 2d2a5992: am 47a47d3b: am 00365fc6: am 6d71af1f: Make immutable NetworkCapabilities more explicit. ... * commit '2d2a59924d758660c40358477c54a85b03b70b75': Make immutable NetworkCapabilities more explicit. Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-07-18 18:05:07 +00:00	b0ebb04d8e
Pass signal strength thresholds inside a Bundle ... Bug: 21407651 Change-Id: I2c80e89441e2eb15a246cb1fa9347f886cefa80f Erik Kline   authored and   Prerepa Viswanadham   commited 2015-07-18 17:28:52 +00:00	2308195d12
Support NetworkCallbacks based on signal strength. ... Bug: 21405941 Change-Id: I2ed8a5aeb8dac464a4305671ed22abcacb485bc9 Lorenzo Colitti   authored and   Prerepa Viswanadham   commited 2015-07-18 17:28:26 +00:00	87f93fe6f4
ConnectivityManager API for for packet keepalives. ... Bug: 21405946 Change-Id: Ie1f8f8bee684fe2bb1092a9f1bc9f5dc29b1defc Lorenzo Colitti   authored and   Prerepa Viswanadham   commited 2015-07-18 17:00:13 +00:00	d1039d1731
Make immutable NetworkCapabilities more explicit. ... Bug: 21405941 Change-Id: Iafd738c31747b0f5f9356bed1c97f5f282830af1 Lorenzo Colitti   authored and   Prerepa Viswanadham   commited 2015-07-18 16:59:47 +00:00	6d71af1f53
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 Paul Jensen   commited 2015-07-16 14:41:18 +00:00	4afac2378d
am e3454420: am 678702d3: am 32cfbc9d: am 68bc390c: am c2ce3ff6: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev ... * commit 'e345442007b453c5f715ab204d48bb2082840c53': Log NetworkRequestInfo to get more detailed history Erik Kline   authored and   Android Git Automerger   commited 2015-07-14 18:45:03 +00:00	af953d0d56
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 Etan Cohen   authored and   Android Git Automerger   commited 2015-07-14 16:51:38 +00:00	74dc5c6558
am 68bc390c: am c2ce3ff6: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev ... * commit '68bc390c0ab592b86b93e153fcc0c0dd51545e44': Log NetworkRequestInfo to get more detailed history Erik Kline   authored and   Android Git Automerger   commited 2015-07-14 06:17:07 +00:00	006a220097
Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev Erik Kline   authored and   Android (Google) Code Review   commited 2015-07-14 04:09:29 +00:00	c2ce3ff6dd
Log NetworkRequestInfo to get more detailed history ... Bug: 21641983 Bug: 22235775 Bug: 22299819 Bug: 22358164 Change-Id: I48a2d162dd499a3590f06d805267a63822856969 Erik Kline   commited 2015-07-14 11:46:51 +09:00	47401fa30e
Merge "Pass signal strength thresholds inside a Bundle" into mnc-vt-dev Erik Kline   authored and   Android (Google) Code Review   commited 2015-07-14 01:50:52 +00:00	8300b39bd6
am 686be938: am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev ... * commit '686be93854cce44d2dd87148ff8063edc89b6d7b': Fix filter on CONNECTIVITY_ACTION updates Etan Cohen   authored and   Android Git Automerger   commited 2015-07-13 23:32:43 +00:00	778824231a
Pass signal strength thresholds inside a Bundle ... Bug: 21407651 Change-Id: I2c80e89441e2eb15a246cb1fa9347f886cefa80f Erik Kline   commited 2015-07-13 18:01:15 +09:00	15d54e5c02
Fix filter on CONNECTIVITY_ACTION updates ... Only send for network types which the network supports. bug:22411968 Change-Id: I97765544eb653caf0ea4fc5d3feec5742d5d88dc Robert Greenwalt   commited 2015-07-10 16:26:40 -07:00	dd1e223ce9
am f8b96edf: am 81093dd0: am 51cfb3a4: am 2164cf4f: am 90a45506: Merge "Legacy VPN calls to require a userID" into mnc-dev ... * commit 'f8b96edf47b4d54ccc91842c16cc505901459cae': Legacy VPN calls to require a userID Robin Lee   authored and   Android Git Automerger   commited 2015-07-10 20:17:52 +00:00	d1ac9b6cb3
am 2164cf4f: am 90a45506: Merge "Legacy VPN calls to require a userID" into mnc-dev ... * commit '2164cf4f4043b4892db5688ed53624af758fcdaa': Legacy VPN calls to require a userID Robin Lee   authored and   Android Git Automerger   commited 2015-07-10 19:35:39 +00:00	22cb4fe5a9
am cc5cd900: am e84c6b37: am 2cef47ff: am 66f59dc1: am 99959f18: Merge "Enable EMERGENCY mobile connections." into mnc-dev ... * commit 'cc5cd90029a1968ec3126f73735fef3234a31678': Enable EMERGENCY mobile connections. Robert Greenwalt   authored and   Android Git Automerger   commited 2015-07-10 19:32:12 +00:00	4edbed5c6f
am 66f59dc1: am 99959f18: Merge "Enable EMERGENCY mobile connections." into mnc-dev ... * commit '66f59dc1bde15be207d49fafb97db372cb01d977': Enable EMERGENCY mobile connections. Robert Greenwalt   authored and   Android Git Automerger   commited 2015-07-10 19:22:59 +00:00	3fa82879de
am 0bac7fa7: am 823ea71e: Fix build break. ... * commit '0bac7fa791ced8e1e1ab67eca72c48be1b19eded': Fix build break. Paul Jensen   authored and   Android Git Automerger   commited 2015-07-10 19:20:29 +00:00	61d99b0985
Merge "Legacy VPN calls to require a userID" into mnc-dev Robin Lee   authored and   Android (Google) Code Review   commited 2015-07-10 19:05:38 +00:00	90a455062e
resolved conflicts for merge of 7f9e3274 to mnc-vt-dev ... Change-Id: I6b6e5f2c1b624bf61e9d29620750cd4de8b5f3f4 Paul Jensen   commited 2015-07-10 15:00:14 -04:00	8e4a3c4a19
resolved conflicts for merge of b54ec1bd to mnc-vt-dev ... Change-Id: I975dbc6544dca1be0405b8fe62e0b3941fd6913b Paul Jensen   commited 2015-07-10 14:35:29 -04:00	0825968c35
Merge "Enable EMERGENCY mobile connections." into mnc-dev Robert Greenwalt   authored and   Android (Google) Code Review   commited 2015-07-10 18:23:24 +00:00	99959f18e4
am 7aafe379: am 59cabcec: am 42280a7a: am 0bac7fa7: am 823ea71e: Fix build break. ... * commit '7aafe37981427f83f8eb263a610e60cd292dbfdb': Fix build break. Paul Jensen   authored and   Android Git Automerger   commited 2015-07-10 17:54:12 +00:00	dce0b6f88c
am c4417cf9: am f50ac2e7: am cfedbc43: am 7f9e3274: am 9eb4dd2d: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev ... * commit 'c4417cf98a98211072b36cb246d0e30aa650e2f2': Fallback to Cellular if WiFi fails to validate Paul Jensen   authored and   Android Git Automerger   commited 2015-07-10 16:58:13 +00:00	0c9ea1c57a
am f1576d8d: am 54b98c71: am 99ef3aef: am b54ec1bd: am 36d8b23b: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev ... * commit 'f1576d8d07e844331685c35d976125f51a6d1a4d': Prepare some ConnectivityService logic for fallback to Cellular change Paul Jensen   authored and   Android Git Automerger   commited 2015-07-10 16:58:06 +00:00	8330b1e491
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 ece7dfa and 41c19a0. Change-Id: I8fd32e1a187236a65c1b7c0ecdf17b817d108fd0 Paul Jensen   commited 2015-07-10 12:29:23 -04:00	823ea71ef3
am 851bcaf2: am ca36baaf: am 2cb16d2e: am 75a43340: am 86599d6a: 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 Paul Jensen   authored and   Android Git Automerger   commited 2015-07-10 15:57:45 +00:00	1de03c6e5a
Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev Paul Jensen   authored and   Android (Google) Code Review   commited 2015-07-10 15:51:38 +00:00	9eb4dd2df9
Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev Paul Jensen   authored and   Android (Google) Code Review   commited 2015-07-10 15:51:23 +00:00	36d8b23b1e
am 75a43340: am 86599d6a: 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 Paul Jensen   authored and   Android Git Automerger   commited 2015-07-10 15:19:46 +00:00	93beca14f4
Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev Paul Jensen   authored and   Android (Google) Code Review   commited 2015-07-10 14:57:13 +00:00	86599d6a2a
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 Robert Greenwalt   commited 2015-07-09 14:49:35 -07:00	9db5f3c1cc
am 30d822e2: am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev ... * commit '30d822e2bdfde4360fc072f7f4ee16c83ac9dcc8': Revive NetworkInfo's SUSPENDED state. Robert Greenwalt   authored and   Android Git Automerger   commited 2015-07-09 20:13:59 +00:00	6a352b83af
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. Robert Greenwalt   authored and   Android Git Automerger   commited 2015-07-09 19:12:20 +00:00	80e1af8fa7
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 Paul Jensen   commited 2015-07-09 10:47:34 -04:00	4173cceaea
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 Paul Jensen   commited 2015-07-09 10:26:17 -04:00	25eb5fd97e