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
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
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
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
69f4bb15a9
Merge "Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs" into mnc-dev
2015-06-10 17:59:54 +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
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
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
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
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
Paul Jensen
936c612666
am c5e1878d: Merge "Revive ConnectivityServiceTest and add some tests." into mnc-dev
...
* commit 'c5e1878d9621cfad6ff663c25cba67995cb7ca3c':
Revive ConnectivityServiceTest and add some tests.
2015-06-04 13:20:56 +00:00
Paul Jensen
c5e1878d96
Merge "Revive ConnectivityServiceTest and add some tests." into mnc-dev
2015-06-04 13:11:34 +00:00
Paul Jensen
bb910e9bcd
Revive ConnectivityServiceTest and add some tests.
...
Change-Id: I44740a7b21cff18ac2a67d09c4d0e597add19ee0
2015-06-04 09:09:36 -04:00
Lorenzo Colitti
9e31124fc4
am a267d9c1: Merge "Disable mDefaultDns to see if we can remove it." into mnc-dev
...
* commit 'a267d9c1f938c132acb9651b8f9bb9682631f96d':
Disable mDefaultDns to see if we can remove it.
2015-06-04 05:44:23 +00:00
Lorenzo Colitti
a267d9c1f9
Merge "Disable mDefaultDns to see if we can remove it." into mnc-dev
2015-06-04 05:31:59 +00:00
Erik Kline
afa6bf513d
am 7cbc907b: Delete unsed mDnsLock.
...
* commit '7cbc907b6189e3740ef4c5c95b95f9803e102629':
Delete unsed mDnsLock.
2015-06-03 08:08:13 +00:00
Erik Kline
7cbc907b61
Delete unsed mDnsLock.
...
Bug: 21449922
Change-Id: I0c9f95c30eaa170d809e86f6505379f34a0a7603
2015-06-03 16:10:08 +09:00
Lorenzo Colitti
f70153bf28
am 0326f777: Merge changes I9b96cdcf,Ib4b29a7f into mnc-dev
...
* commit '0326f7772cad003b1bc6b3d7c39429bf53333eb8':
Remove the IPv4 address from the interface when DHCP fails.
Make the dumpsys connectivity shorter and easier to read.
2015-06-03 06:16:41 +00:00
Lorenzo Colitti
3b1ad969cf
Make the dumpsys connectivity shorter and easier to read.
...
- Print NetworkFactories on one line.
- Only print LegacyTypeTracker networks if they are connected,
and record supported network types on a separate summary line.
- Print all tethering upstreams on one line.
- Summarize the state of the transition wakelock on one line.
- Don't print Inet condition reports if there are none.
(Currently there can never be any.)
Bug: 21449922
Change-Id: Ib4b29a7fd882e6c105839a255fffecf4f346cf7e
2015-06-03 11:29:41 +09:00
Stuart Scott
25a36a9163
am d198fe19: Network Reset should have a lockdown like Factory Reset.
...
* commit 'd198fe197baf3cc72aba0ab6a2fe4f8602d97b0f':
Network Reset should have a lockdown like Factory Reset.
2015-06-01 16:45:42 +00:00
Stuart Scott
d198fe197b
Network Reset should have a lockdown like Factory Reset.
...
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb291431a7b39611d72f206b07e839891)
2015-06-01 16:31:00 +00:00
Paul Jensen
6179167225
am 16d8795d: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
...
* commit '16d8795df622e3af99156420b39803058cc36092':
Add javadoc comments mentioning ConnectivityManager API permissions.
2015-05-26 17:47:46 +00:00
Paul Jensen
a24c440802
am f66991ce: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev
...
* commit 'f66991ceafefd6b403bd0751cb2f514df9beb0fe':
Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)
2015-05-26 17:47:41 +00:00
Paul Jensen
16d8795df6
Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
2015-05-26 17:37:33 +00:00
Paul Jensen
f66991ceaf
Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev
2015-05-26 17:33:26 +00:00
Etan Cohen
9fc43c3fd9
Merge commit 'e391b13' into merge
2015-05-21 18:01:05 -07:00
Paul Jensen
6f94248ebf
Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)
...
Do this in ConnectivityService to prevent crashing framework.
Bug:21329396
Change-Id: Ifd9c970cd0da392d0bd5da9a9ae845fdf0b559b3
2015-05-21 08:15:08 -04:00
Erik Kline
04612b0692
LinkProperties function to compare provisioning and remove DNS servers
...
Adds:
- enum ProvisioningChange
- LinkProperties#compareProvisioning()
return a ProvisioningChange value describing the delta in
provisioning between two LinkProperties objects
- LinkProperties#removeDnsServer()
- make "@hide public" isIPv4Provisioned() and isIPv6Provisioned()
Bug: 18581716
Change-Id: I3df90b2b89617f693346f2dbe72e77c88ce91ffd
2015-05-21 20:43:47 +09:00
fenglu
c7830c6dcf
Merge "LCE feature enhancement" into mnc-dev
2015-05-20 21:09:09 +00:00