Commit graph

13,045 commits

Message SHA1
Remove "returning Blocked NetworkInfo" logspam.
Bug: 20006730
Change-Id: I2061127e3c7283c0a4899940d3fc224ca114f754

Lorenzo Colitti   commited 2015-06-05 10:58:17 +09:00
28ad516437
am c58d411c: am bd9e049a: am bf546dc5: Merge "Fix the empty reason field in connectivity change intent." into mnc-dev
* commit 'c58d411c379718231786cf7b3f3238aebd1ba8b5':
  Fix the empty reason field in connectivity change intent.

Feixiong Zhang   authored and   Android Git Automerger   commited 2015-06-04 20:38:52 +00:00
04cb783d87
am bf546dc5: Merge "Fix the empty reason field in connectivity change intent." into mnc-dev
* commit 'bf546dc592':
  Fix the empty reason field in connectivity change intent.

Feixiong Zhang   authored and   Android Git Automerger   commited 2015-06-04 19:07:34 +00:00
06c983cc82
Merge "Fix the empty reason field in connectivity change intent." into mnc-dev
Feixiong Zhang   authored and   Android (Google) Code Review   commited 2015-06-04 18:54:49 +00:00
bf546dc592
Fix the empty reason field in connectivity change intent.
The code set it to null instead of info.getReason.

Change-Id: I1b26ad040c23da7080dbfaeb5376181998115805

Feixiong Zhang   commited 2015-06-04 11:38:41 -07:00
ac21bfa9c7
am 8d0f3976: am bc292eea: am 4371d961: Merge "Revive ConnectivityServiceTest and add some tests." into mnc-dev
* commit '8d0f3976a4a571c2e495c01a6334c99781817214':
  Revive ConnectivityServiceTest and add some tests.

Paul Jensen   authored and   Android Git Automerger   commited 2015-06-04 13:45:36 +00:00
1e1d28d704
am 4371d961: Merge "Revive ConnectivityServiceTest and add some tests." into mnc-dev
* commit '4371d961b1':
  Revive ConnectivityServiceTest and add some tests.

Paul Jensen   authored and   Android Git Automerger   commited 2015-06-04 13:20:56 +00:00
ea0efb8c3e
Merge "Revive ConnectivityServiceTest and add some tests." into mnc-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2015-06-04 13:11:34 +00:00
4371d961b1
Revive ConnectivityServiceTest and add some tests.
Change-Id: I44740a7b21cff18ac2a67d09c4d0e597add19ee0

Paul Jensen   commited 2015-06-04 09:09:36 -04:00
a871d06625
am 9d68fe46: am 74c720c9: am 33464fb6: Merge "Disable mDefaultDns to see if we can remove it." into mnc-dev
* commit '9d68fe46504ac2521fbcc8ad5e5d7e74dbffd89c':
  Disable mDefaultDns to see if we can remove it.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-06-04 06:06:26 +00:00
596c6710d3
am 33464fb6: Merge "Disable mDefaultDns to see if we can remove it." into mnc-dev
* commit '33464fb66c':
  Disable mDefaultDns to see if we can remove it.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-06-04 05:44:23 +00:00
4153c13825
Merge "Disable mDefaultDns to see if we can remove it." into mnc-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2015-06-04 05:31:59 +00:00
33464fb66c
am e0002169: am 6ac63c7d: am 783cc254: Delete unsed mDnsLock.
* commit 'e0002169bda4a74e654852885d1b1ba3a4e39f47':
  Delete unsed mDnsLock.

Erik Kline   authored and   Android Git Automerger   commited 2015-06-03 19:23:06 +00:00
4d3521688a
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.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-06-03 19:22:55 +00:00
dee503f197
am 783cc254: Delete unsed mDnsLock.
* commit '783cc254e3':
  Delete unsed mDnsLock.

Erik Kline   authored and   Android Git Automerger   commited 2015-06-03 08:08:13 +00:00
cd6e337f7b
Delete unsed mDnsLock.
Bug: 21449922
Change-Id: I0c9f95c30eaa170d809e86f6505379f34a0a7603

Erik Kline   commited 2015-06-03 16:10:08 +09:00
783cc254e3
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.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-06-03 06:16:41 +00:00
159ea70008
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

Lorenzo Colitti   commited 2015-06-03 11:29:41 +09:00
417c25c8cb
am c96a66dd: am 378c2cbf: am 493cca03: Network Reset should have a lockdown like Factory Reset.
* commit 'c96a66dd03b7928e0945dc7ff0ce961d7091fc7d':
  Network Reset should have a lockdown like Factory Reset.

Stuart Scott   authored and   Android Git Automerger   commited 2015-06-01 19:04:44 +00:00
74edfcc92d
am 493cca03: Network Reset should have a lockdown like Factory Reset.
* commit '493cca03f8':
  Network Reset should have a lockdown like Factory Reset.

Stuart Scott   authored and   Android Git Automerger   commited 2015-06-01 16:45:42 +00:00
1a0968ce20
Network Reset should have a lockdown like Factory Reset.
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb291431a7b39611d72f206b07e839891)

Stuart Scott   commited 2015-06-01 16:31:00 +00:00
493cca03f8
am 7a5a03cc: am 8164d4c3: am 71f59c5b: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
* commit '7a5a03ccce726a6c42ef48230e48a8b8232d027c':
  Add javadoc comments mentioning ConnectivityManager API permissions.

Paul Jensen   authored and   Android Git Automerger   commited 2015-05-26 18:18:35 +00:00
9b1f5ed253
am 2718f044: am a859b09f: am 7cebef82: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev
* commit '2718f044636255125943b0d860ba07ba99f5f00c':
  Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)

Paul Jensen   authored and   Android Git Automerger   commited 2015-05-26 18:18:29 +00:00
8f04208e70
am 71f59c5b: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
* commit '71f59c5bb3':
  Add javadoc comments mentioning ConnectivityManager API permissions.

Paul Jensen   authored and   Android Git Automerger   commited 2015-05-26 17:47:46 +00:00
04f3f94697
am 7cebef82: Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev
* commit '7cebef821e':
  Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)

Paul Jensen   authored and   Android Git Automerger   commited 2015-05-26 17:47:41 +00:00
32e3e5a1ad
Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2015-05-26 17:37:33 +00:00
71f59c5bb3
Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2015-05-26 17:33:26 +00:00
7cebef821e
Network Reset should have a lockdown like Factory Reset.
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb

Stuart Scott   commited 2015-05-22 11:29:28 -07:00
2e49a29034
Merge commit 'e391b13' into merge
Etan Cohen   commited 2015-05-21 18:01:05 -07:00
bf247910f9
am f3c5a342: am 11b5ee05: am 0e801367: LinkProperties function to compare provisioning and remove DNS servers
* commit 'f3c5a3427ecfeea5e07649ab792bfc4af2c4b71a':
  LinkProperties function to compare provisioning and remove DNS servers

Erik Kline   authored and   Android Git Automerger   commited 2015-05-21 19:03:12 +00:00
8f9bb52d5a
Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)
Do this in ConnectivityService to prevent crashing framework.

Bug:21329396
Change-Id: Ifd9c970cd0da392d0bd5da9a9ae845fdf0b559b3

Paul Jensen   commited 2015-05-21 08:15:08 -04:00
cdc9384d58
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

Erik Kline   commited 2015-05-21 20:43:47 +09:00
0e80136703
am bd5a0645: am ffb4b83a: am edee9557: Merge "LCE feature enhancement" into mnc-dev
* commit 'bd5a06452b0afa29f5f8afe63b043085b06b8be7':
  LCE feature enhancement

fenglu   authored and   Android Git Automerger   commited 2015-05-20 22:04:02 +00:00
5f0e909d9f
Merge "LCE feature enhancement" into mnc-dev
fenglu   authored and   Android (Google) Code Review   commited 2015-05-20 21:09:09 +00:00
edee95576c
am d3a56eda: am 886ab256: am 868f6996: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev
* commit 'd3a56eda9d3d4320721c8fe8c50c247e895a63a7':
  Undeprecate android.net.ProxyInfo as it's still used.

Paul Jensen   authored and   Android Git Automerger   commited 2015-05-20 13:18:09 +00:00
8d62f80c22
am d59c3e95: am 485826b2: am c13cead4: 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

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-05-20 13:17:19 +00:00
7a717a1cd9
Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2015-05-20 10:49:04 +00:00
868f6996c9
Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2015-05-20 05:49:03 +00:00
c13cead4e3
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

fenglu   commited 2015-05-19 17:08:00 -07:00
6cf1cb020d
am d6e54755: am 06c48119: am 71c05810: 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

Paul Jensen   authored and   Android Git Automerger   commited 2015-05-19 23:04:06 +00:00
85f1f2e072
Undeprecate android.net.ProxyInfo as it's still used.
It was deprecated as part of the Apache deprecation, however it is used
by ConnectivityManager.getLinkProperties() and .getDefaultProxy().
The alternatives (e.g. java.net.Proxy) do not offer a complete
replacement as they lack certain fields (e.g. PAC URL).

Bug:21274137
Change-Id: I99163a2611a738f337fb9907349ef6255dbed6d6

Paul Jensen   commited 2015-05-19 15:09:17 -04:00
6761da21ed
Add javadoc comments mentioning ConnectivityManager API permissions.
Also move permissions comments above @param and @return to fix indent.

bug:20499587
Change-Id: If82ff2367fdbce06e696e494439b31cb100d768f

Paul Jensen   commited 2015-05-19 14:03:03 -04:00
19b3ee73ff
Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2015-05-19 17:58:11 +00:00
71c05810c2
LCE feature enhancement
- space pollLceData calls every 500ms
- cluster multiple pending pollLceData calls into one

Change-Id: I04513011db3ae29af02bd54fe91cb8e0d4ab9f12

fenglu   commited 2015-05-19 10:39:01 -07:00
59f1f4e9ee
Disable mDefaultDns to see if we can remove it.
Bug: 21146610
Change-Id: I385f1c8780acc97d955002f469a6c8ad65db1578

Lorenzo Colitti   commited 2015-05-20 00:35:25 +09:00
2c57c17908
Add a hidden method to clear the capabilities of a NetworkRequest
Change-Id: I41d4f2229259d0bf9d68aa00f92f3bf4e2e71fbc

Lorenzo Colitti   commited 2015-05-20 00:35:24 +09:00
5b47cce9a1
am e5b49e8d: am f9118608: am afe4a812: Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev
* commit 'e5b49e8d1c125dcfd8f58daa1cccb97030323ee6':
  Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-05-19 11:00:58 +00:00
63c75fd9d5
am 4f874010: am 855867b1: am c5bd6cc9: Merge "Support cross-user VPN calls (with permission)" into mnc-dev
* commit '4f874010a4638ead7e45bbb73478ef93dca2c7ce':
  Support cross-user VPN calls (with permission)

Robin Lee   authored and   Android Git Automerger   commited 2015-05-19 10:48:31 +00:00
3b213b0395
Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2015-05-19 10:29:48 +00:00
afe4a812a9
Merge "Support cross-user VPN calls (with permission)" into mnc-dev
Robin Lee   authored and   Android (Google) Code Review   commited 2015-05-19 10:14:59 +00:00
c5bd6cc964