Erik Kline
6dbe7e6c98
am 0b8b1872: am 157cccef: am 3d54e672: Merge "Carefully select which DNS servers to send to netd" into mnc-dev
...
* commit '0b8b18721503d84104e1d6aaf69993f3b532a9fc':
Carefully select which DNS servers to send to netd
2015-06-18 06:56:23 +00:00
Erik Kline
a13e82d771
am 3d54e672: Merge "Carefully select which DNS servers to send to netd" into mnc-dev
...
* commit '3d54e672a58301ff60498fc7c57870d9bccd0e45':
Carefully select which DNS servers to send to netd
2015-06-18 06:36:35 +00:00
Erik Kline
0f0dbb8222
Carefully select which DNS servers to send to netd
...
Select only DNS servers that:
- are reachable, according to routes in the LinkProperties, AND
- have a "suitable" source address in the LinkProperites, meaning:
- IPv4 DNS server:
- only if LinkProperties has any IPv4 address
- IPv6 link-local DNS server:
- only if the server has a scopeId set
- assume for now that LinkProperties has a suitable
link-local address
- IPv6 non-link-local DNS server:
- only if LinkProperties has a global, preferred IPv6 address
Bug: 19470192
Bug: 20733156
Change-Id: Ibd95f3f7b33a4fb6c36d1cea4adb63c99068f657
2015-06-18 14:50:21 +09:00
Paul Jensen
9facc78f66
am 79cd02c4: am 8235c839: am 278bc590: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
...
* commit '79cd02c4b0ada6eff5979f0cd39f3799606ba9bb':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-16 22:03:06 +00:00
Paul Jensen
7418567b59
am 278bc590: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
...
* commit '278bc59082828203df6c052999c2b7e30cdfd483':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-16 11:38:18 +00:00
Paul Jensen
278bc59082
Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
2015-06-16 11:30:51 +00:00
Erik Kline
fdfd66c062
am 47585f46: am a01b9e6f: am e1ee8c66: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
...
* commit '47585f462a9cde661169b16cea870c05e91d92f8':
Add a test that Network#getNetworkHandle() behaves sanely.
2015-06-16 04:17:27 +00:00
Erik Kline
682c093dba
am e1ee8c66: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
...
* commit 'e1ee8c665f7eec15d863b6643870c1d6860ccb07':
Add a test that Network#getNetworkHandle() behaves sanely.
2015-06-16 03:52:43 +00:00
Erik Kline
e1ee8c665f
Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
2015-06-16 03:43:56 +00:00
Paul Jensen
c6b3de1e4a
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
...
- There are no callers of
NetworkInfo.setIsConnectedToProvisioningNetwork(), so remove all the
code that deals with mIsConnectedToProvisioningNetwork being true,
including the two ConnectiviyManager APIs.
- There are no callers of
ConnectivityManager.getMobileRedirectedProvisioningUrl(), so remove
the code that reads this URL.
- There are no callers of
ConnectivityManager.captivePortalCheckCompleted(), so remove this
API which is currently a no-op.
Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
2015-06-16 02:07:36 +00:00
Paul Jensen
bad054a7bc
am b379fdd0: am 49ab026a: am 5cc59014: Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
...
* commit 'b379fdd0e9fa560e0abfe771acf920bb6aca60ad':
Remove most sleep() calls from ConnectivityServiceTest
2015-06-15 14:11:20 +00:00
Paul Jensen
8a97666f03
am 5cc59014: Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
...
* commit '5cc59014636a8e88427a8ea165f6208cc421e653':
Remove most sleep() calls from ConnectivityServiceTest
2015-06-15 13:50:49 +00:00
Paul Jensen
5cc5901463
Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev
2015-06-15 13:35:48 +00:00
Erik Kline
cc00792876
Add a test that Network#getNetworkHandle() behaves sanely.
...
Additionally:
- make zero more obvious for debugging, rather than emitting
some inscrutable magic value.
Bug: 19537384
Change-Id: Iac9a3297a0dda1ba3d69fd01cf6de81f01fd837e
2015-06-15 15:18:38 +09:00
Chris Wren
197908c00c
am 604f6cf1: am 63cae6c8: am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev
...
* commit '604f6cf11307f1be19fad05c40482fd792ab3162':
remove usage of deprecated method setLatestEventInfo
2015-06-12 20:05:49 +00:00
Chris Wren
12f9e13483
am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev
...
* commit '17de4b2a73996366ff3d7759793a6809654caebe':
remove usage of deprecated method setLatestEventInfo
2015-06-12 19:40:13 +00:00
Paul Jensen
f98df17f98
Remove most sleep() calls from ConnectivityServiceTest
...
Change-Id: I90d2f6811ed1cb84614101200ac377e920bd864a
2015-06-12 10:31:09 -04:00
Chris Wren
cb43350ffd
remove usage of deprecated method setLatestEventInfo
...
Bug: 18510449
Change-Id: I56a77991c729990e501f402e007dfa79ee57621e
2015-06-12 10:16:04 -04:00
Robert Greenwalt
df7f5bfb61
am ddb3d3aa: Merge "Remove network requests properly." into mnc-dev
...
* commit 'ddb3d3aaccfed319c473d5738a106ee4e0da34e9':
Remove network requests properly.
2015-06-11 15:56:23 +00:00
Paul Jensen
bcf1ce158a
am 69f4bb15: Merge "Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs" into mnc-dev
...
* commit '69f4bb15a964dbcd301287d5ac36a68c17361c98':
Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs
2015-06-11 14:52:57 +00:00
Lorenzo Colitti
4688180ef9
am ccd85f3e: Merge "When no Internet access is detected, display a notification first." into mnc-dev
...
* commit 'ccd85f3e29cb247393a7ffa513f30553c5c9b3aa':
When no Internet access is detected, display a notification first.
2015-06-11 14:50:30 +00:00
Lorenzo Colitti
3a9df1a8cd
Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.
...
The API review comments in http://b/21343774 point out that the
suggested use case for onPreCheck (captive portal login apps) is
not a good use case as it requires that the app always be
running.
Also, unhide NET_CAPABILITY_VALIDATED, which is useful to apps
that want to detect captive portals and network connectivity
failures.
Bug: 21343774
Change-Id: Iad7c839bcc136b0fa9581dccc5fd97a28efed4ab
2015-06-11 15:30:13 +09:00
Robert Greenwalt
6e032ecb6f
am c2a3f75f: am 1ec7d05e: am ddb3d3aa: Merge "Remove network requests properly." into mnc-dev
...
* commit 'c2a3f75fb60a4a720f07791cfe0730f42cd8eb80':
Remove network requests properly.
2015-06-11 05:55:20 +00:00
Robert Greenwalt
ddb3d3aacc
Merge "Remove network requests properly." into mnc-dev
2015-06-11 02:19:17 +00:00
Robert Greenwalt
8d2cfc2253
Remove network requests properly.
...
We used to only remove requests that we'd acted on but that's
just wrong.
Also adds test case which exposed the problem but passes with the fix.
bug:20731384
Change-Id: I581a005560cc71167b857abf2452769399a9e1b7
2015-06-10 14:44:34 -07:00
Paul Jensen
29db31b5d3
am c05c31a4: am 0fac11a8: am 69f4bb15: Merge "Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs" into mnc-dev
...
* commit 'c05c31a4c684f15bacd1908737bf8148d0e6adb3':
Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs
2015-06-10 18:42:59 +00:00
Paul Jensen
69f4bb15a9
Merge "Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs" into mnc-dev
2015-06-10 17:59:54 +00:00
Lorenzo Colitti
2157940561
am bb2f798a: am 1f91eed0: am ccd85f3e: Merge "When no Internet access is detected, display a notification first." into mnc-dev
...
* commit 'bb2f798ae19cb7ef928274972ca9ad6c2c2c7eff':
When no Internet access is detected, display a notification first.
2015-06-10 17:13:22 +00:00
Paul Jensen
bd2f32f60b
Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs
...
Overlapping the NetIDs can cause the ConnectivityService instance under test
to inadvertently use real networks, for example when NetworkMonitor attempts
to validate a network. This fixes test hangs when run on devices with
active internet connections.
Change-Id: I5e1898953f0117b9f75beccac4a52ae2db173567
2015-06-10 11:30:26 -04:00
Lorenzo Colitti
ccd85f3e29
Merge "When no Internet access is detected, display a notification first." into mnc-dev
2015-06-10 15:25:31 +00:00
Lorenzo Colitti
74baf41e0f
When no Internet access is detected, display a notification first.
...
Previously, we displayed a dialog on top of whatever the user was
doing. Instead, display a notification that can take the user to
the dialog.
Because the notification is less intrusive, also enable it even
if the network without Internet access is already the system
default network. Previously we did not do this because in that
case the user might not have other useful options, and thus a
dialog would have been too intrusive.
Bug: 20081183
Bug: 20538448
Change-Id: I677be238d675c13a13dc0bae2dbb37cbe4f52cb6
2015-06-10 23:37:00 +09:00
Erik Kline
042d4af72b
am baad4077: am 69b0dcab: am 85a69cd4: Merge "initial revision of NetworkDiagnostics" into mnc-dev
...
* commit 'baad4077955905933b9b5a8cdd6e82349cc68c96':
initial revision of NetworkDiagnostics
2015-06-10 00:00:10 +00:00
Robin Lee
50c54c9921
am e26ae30e: am 9e46757d: am 54d152cd: Merge "Switch over to updated VPN warning strings" into mnc-dev
...
* commit 'e26ae30eeedd8145a021697e9b7e18bb740537c7':
Switch over to updated VPN warning strings
2015-06-09 23:40:57 +00:00
Erik Kline
7357a272b5
am 85a69cd4: Merge "initial revision of NetworkDiagnostics" into mnc-dev
...
* commit '85a69cd4a60c6341d85f73494f4cc4a345c9c00d':
initial revision of NetworkDiagnostics
2015-06-09 23:35:33 +00:00
Robin Lee
be11836f1d
am 54d152cd: Merge "Switch over to updated VPN warning strings" into mnc-dev
...
* commit '54d152cd123826f6001ed55814aff84593474f60':
Switch over to updated VPN warning strings
2015-06-09 23:25:07 +00:00
Erik Kline
85a69cd4a6
Merge "initial revision of NetworkDiagnostics" into mnc-dev
2015-06-09 23:23:03 +00:00
Robin Lee
54d152cd12
Merge "Switch over to updated VPN warning strings" into mnc-dev
2015-06-09 23:13:38 +00:00
Robin Lee
06c0fff375
Switch over to updated VPN warning strings
...
These are more consistent and have placeholders for the description of
whatever VPN apps are actually active.
Bug: 20516964
Bug: 17474682
Change-Id: I37ff287b795f10bbbb192540f09f8100bb27b1a0
2015-06-09 12:04:23 -07:00
Erik Kline
9647f3807b
initial revision of NetworkDiagnostics
...
Bug: 21449922
Change-Id: I6a66cfa98601d6ccfe38ff840b0dd49ed1538a41
2015-06-09 23:37:58 +09:00
Erik Kline
187415ae7c
am b3cc45a1: am b99a1ac6: am 1162744f: Merge "Make public Network#bindSocket(FileDescriptor)." into mnc-dev
...
* commit 'b3cc45a1f53a6a88a736004c553ce417596bb440':
Make public Network#bindSocket(FileDescriptor).
2015-06-09 13:17:03 +00:00
Erik Kline
3f67315e84
am 1162744f: Merge "Make public Network#bindSocket(FileDescriptor)." into mnc-dev
...
* commit '1162744fedbd35f3999221cc9abc4caa3204a4b2':
Make public Network#bindSocket(FileDescriptor).
2015-06-09 07:56:58 +00:00
Erik Kline
94fd615d1f
Make public Network#bindSocket(FileDescriptor).
...
Code that uses android.system.Os to create sockets as FileDescriptors
should be able to bind them to networks. Note that FileDescriptors
could already be marked as "protected from VPNs" via
NetworkUtils#protectFromVpn(), but heretofore were not easily bound
to any particular network.
Bug: 21449922
Change-Id: I4bb86db5d95d5a55bb2d7e245848d11eaa351e65
2015-06-09 16:19:24 +09:00
Lorenzo Colitti
2fefcbb64d
am 0172266b: am 1ad2c080: am 50e55480: Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev
...
* commit '0172266ba772c4b00f96bf40bf18cf245e35d8bc':
Remove "returning Blocked NetworkInfo" logspam.
2015-06-05 09:37:42 +00:00
Lorenzo Colitti
757bb68f54
am 50e55480: Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev
...
* commit '50e554808b1d8dde6e6c6aeb608551ce8a0d8180':
Remove "returning Blocked NetworkInfo" logspam.
2015-06-05 08:02:55 +00:00
Lorenzo Colitti
50e554808b
Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev
2015-06-05 07:50:44 +00:00
Lorenzo Colitti
f71cce4fb9
Remove "returning Blocked NetworkInfo" logspam.
...
Bug: 20006730
Change-Id: I2061127e3c7283c0a4899940d3fc224ca114f754
2015-06-05 10:58:17 +09:00
Feixiong Zhang
9531266775
am c58d411c: am bd9e049a: am 20ed3f97: Merge "Fix the empty reason field in connectivity change intent." into mnc-dev
...
* commit 'c58d411c379718231786cf7b3f3238aebd1ba8b5':
Fix the empty reason field in connectivity change intent.
2015-06-04 20:38:52 +00:00
Feixiong Zhang
8081f2df48
am 20ed3f97: Merge "Fix the empty reason field in connectivity change intent." into mnc-dev
...
* commit '20ed3f9768dbb2eba1d47a3eff53a17fdff8a77c':
Fix the empty reason field in connectivity change intent.
2015-06-04 19:07:34 +00:00
Feixiong Zhang
20ed3f9768
Merge "Fix the empty reason field in connectivity change intent." into mnc-dev
2015-06-04 18:54:49 +00:00
Feixiong Zhang
1f7f908de3
Fix the empty reason field in connectivity change intent.
...
The code set it to null instead of info.getReason.
Change-Id: I1b26ad040c23da7080dbfaeb5376181998115805
2015-06-04 11:38:41 -07:00