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
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
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
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
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
270e8d3d20
am 8d0f3976: am bc292eea: am c5e1878d: Merge "Revive ConnectivityServiceTest and add some tests." into mnc-dev
...
* commit '8d0f3976a4a571c2e495c01a6334c99781817214':
Revive ConnectivityServiceTest and add some tests.
2015-06-04 13:45:36 +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
2e5c4ee2ca
am 9d68fe46: am 74c720c9: am a267d9c1: Merge "Disable mDefaultDns to see if we can remove it." into mnc-dev
...
* commit '9d68fe46504ac2521fbcc8ad5e5d7e74dbffd89c':
Disable mDefaultDns to see if we can remove it.
2015-06-04 06:06:26 +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
e979fc9e4c
am e0002169: am 6ac63c7d: am 7cbc907b: Delete unsed mDnsLock.
...
* commit 'e0002169bda4a74e654852885d1b1ba3a4e39f47':
Delete unsed mDnsLock.
2015-06-03 19:23:06 +00:00
Lorenzo Colitti
aacd8eacce
am e3a96451: am d315f373: am 0326f777: Merge changes I9b96cdcf,Ib4b29a7f into mnc-dev
...
* commit 'e3a9645108fdbacfb0e0292aacb1e146efc215a3':
Remove the IPv4 address from the interface when DHCP fails.
Make the dumpsys connectivity shorter and easier to read.
2015-06-03 19:22:55 +00:00
Erik Kline
7cbc907b61
Delete unsed mDnsLock.
...
Bug: 21449922
Change-Id: I0c9f95c30eaa170d809e86f6505379f34a0a7603
2015-06-03 16:10:08 +09: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
c265f34fa0
am c96a66dd: am 378c2cbf: am d198fe19: Network Reset should have a lockdown like Factory Reset.
...
* commit 'c96a66dd03b7928e0945dc7ff0ce961d7091fc7d':
Network Reset should have a lockdown like Factory Reset.
2015-06-01 19:04:44 +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
d04d902ca3
am 7a5a03cc: am 8164d4c3: am 16d8795d: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
...
* commit '7a5a03ccce726a6c42ef48230e48a8b8232d027c':
Add javadoc comments mentioning ConnectivityManager API permissions.
2015-05-26 18:18:35 +00:00
Paul Jensen
162e92fdc3
am 2718f044: am a859b09f: am f66991ce: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev
...
* commit '2718f044636255125943b0d860ba07ba99f5f00c':
Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)
2015-05-26 18:18:29 +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
Stuart Scott
7c7cecec4a
Network Reset should have a lockdown like Factory Reset.
...
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
2015-05-22 11:29:28 -07:00
Erik Kline
73dc94036d
am f3c5a342: am 11b5ee05: am 04612b06: LinkProperties function to compare provisioning and remove DNS servers
...
* commit 'f3c5a3427ecfeea5e07649ab792bfc4af2c4b71a':
LinkProperties function to compare provisioning and remove DNS servers
2015-05-21 19:03:12 +00: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
9145d286ac
am bd5a0645: am ffb4b83a: am c7830c6d: Merge "LCE feature enhancement" into mnc-dev
...
* commit 'bd5a06452b0afa29f5f8afe63b043085b06b8be7':
LCE feature enhancement
2015-05-20 22:04:02 +00:00
fenglu
c7830c6dcf
Merge "LCE feature enhancement" into mnc-dev
2015-05-20 21:09:09 +00:00
Paul Jensen
e0fc37bcba
am d3a56eda: am 886ab256: am 60472854: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev
...
* commit 'd3a56eda9d3d4320721c8fe8c50c247e895a63a7':
Undeprecate android.net.ProxyInfo as it's still used.
2015-05-20 13:18:09 +00:00
Lorenzo Colitti
7255f3910d
am d59c3e95: am 485826b2: am 892a7e18: Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev
...
* commit 'd59c3e95310ffe6a5fdf03c245a092e6a120b9da':
Add a hidden method to clear the capabilities of a NetworkRequest
2015-05-20 13:17:19 +00:00
Paul Jensen
60472854d2
Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev
2015-05-20 10:49:04 +00:00
Lorenzo Colitti
892a7e1885
Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev
2015-05-20 05:49:03 +00:00
fenglu
fcc8c9b5f4
LCE feature enhancement
...
- space pollLceData calls every 500ms
- cluster multiple pending pollLceData calls into one
- cherry pick from mwd to mnc-dev
Bug: 21307957
Change-Id: I04513011db3ae29af02bd54fe91cb8e0d4ab9f12
2015-05-19 17:08:00 -07:00
Paul Jensen
212c96c0f9
am d6e54755: am 06c48119: am 19168619: Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev
...
* commit 'd6e54755ddce80d530f8486a1de456ca05d69c64':
Query HTTP proxy for network via a new API to avoid permissions exceptions
2015-05-19 23:04:06 +00:00