Commit Graph

2078 Commits

Author SHA1 Message Date
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
Paul Jensen
81c7260a93 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
2015-05-19 15:09:17 -04:00
Paul Jensen
08f9dbbfa1 Add javadoc comments mentioning ConnectivityManager API permissions.
Also move permissions comments above @param and @return to fix indent.

bug:20499587
Change-Id: If82ff2367fdbce06e696e494439b31cb100d768f
2015-05-19 14:03:03 -04:00
Paul Jensen
1916861976 Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev 2015-05-19 17:58:11 +00:00
Lorenzo Colitti
8ccb6b171b Disable mDefaultDns to see if we can remove it.
Bug: 21146610
Change-Id: I385f1c8780acc97d955002f469a6c8ad65db1578
2015-05-20 00:35:25 +09:00
Lorenzo Colitti
1aa80c66de Add a hidden method to clear the capabilities of a NetworkRequest
Change-Id: I41d4f2229259d0bf9d68aa00f92f3bf4e2e71fbc
2015-05-20 00:35:24 +09:00
Lorenzo Colitti
fe0d1f1c74 am e5b49e8d: am f9118608: am a3a771b3: Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev
* commit 'e5b49e8d1c125dcfd8f58daa1cccb97030323ee6':
  Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen.
2015-05-19 11:00:58 +00:00
Robin Lee
ef86e5ab9d am 4f874010: am 855867b1: am 1281e50c: Merge "Support cross-user VPN calls (with permission)" into mnc-dev
* commit '4f874010a4638ead7e45bbb73478ef93dca2c7ce':
  Support cross-user VPN calls (with permission)
2015-05-19 10:48:31 +00:00
Lorenzo Colitti
a3a771b3d7 Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev 2015-05-19 10:29:48 +00:00
Robin Lee
1281e50c72 Merge "Support cross-user VPN calls (with permission)" into mnc-dev 2015-05-19 10:14:59 +00:00
Lorenzo Colitti
e97685a88f Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen.
1. Always keep ConnectivityService's validated bits current:
   - Apply the validated bit whenever a NetworkAgent updates its
     NetworkCapabilities.
   - Set or clear the validated bit whenever lastValidated changes.
2. Send callbacks when the validation state of a network changes.
3. Delete getNetworkCapabilitiesAndValidation, removing code
   duplication with getNetworkCapabilities.
4. Add the validated bit to NetworkCapabilities#toString.

Bug: 18591282
Bug: 20081183
Change-Id: I6aa53b61c15cc137f203f9fc6bbd4c16894be750
2015-05-19 18:29:02 +09:00
Jorim Jaggi
436045987c am 0f9d3152: am 06ac707d: am c6767354: Merge "Add setting to disable assist data (1/2)" into mnc-dev
* commit '0f9d315217ebeb933f5f6b79d22e03b2c0c889ae': (30 commits)
  Add setting to disable assist data (1/2)
  Make all icon fields & extras sent to listeners backward-compatible.
  Revert "Fix IMMS#mInputShown state inconsistency."
  Fix bug with jobservice context giving wrong value
  camera2: Fix work-profile eviction handling.
  Fix missing break in Icon class
  Fix post dial for remote connections
  Fix build: udpate parser factory method
  Don't keep LayoutlibCallback reference.
  Adjust lockscreen style to spec
  [RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
  Change the location of Brandmaster statement file.
  Revert "Update IME focus when the active view is losing the focus."
  Revert "Icon support comes to Notification."
  Fix icon-related crash.
  Don't display the "no Internet access" prompt on captive portals.
  Rewriting should fail when any paths are null.
  Ignore abandon after install relinquished.
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
  Fix crash in setup wizard
  ...
2015-05-19 05:14:06 +00:00
Robin Lee
1e71fc8356 Support cross-user VPN calls (with permission)
Settings and SystemUI need to act on other users than USER_OWNER.

This is gated by INTERACT_ACROSS_USERS_FULL in addition to the existing
CONTROL_VPN checks, so the number of processes able to interfere with
other profiles' VPNs should be quite small.

Bug: 20692490
Bug: 20747154
Bug: 20872408
Change-Id: I6e5d7220f73435bec350719e7b4715935caf4e19
2015-05-18 23:35:31 +01:00
Paul Jensen
db93dd93c5 Query HTTP proxy for network via a new API to avoid permissions exceptions
Add @hidden ConnectivityManager.getProxyForNetwork() API.

Bug:20470604
Change-Id: I6a9bc4afc8273bc43b14cdeccfedbbf3ff66be40
2015-05-18 17:05:51 +00:00
The Android Automerger
527979bb76 merge in mnc-release history after reset to mnc-dev 2015-05-16 01:02:14 -07:00
Lorenzo Colitti
b2342ce9f0 am ed9fa1cc: am 4eb901b6: am bdc8b6d2: Merge "Statically import NetworkCapabilities constants for brevity." into mnc-dev
* commit 'ed9fa1ccd8f655a5c7520511ff354443ad9444fe':
  Statically import NetworkCapabilities constants for brevity.
2015-05-15 16:57:19 +00:00
Lorenzo Colitti
3baffe0dc2 am 4f1c9e37: am e0efd004: am 9e2d14be: Merge "Don\'t display the "no Internet access" prompt on captive portals." into mnc-dev
* commit '4f1c9e37a988b026d452580e7e3bdf0ca7f7ee87':
  Don't display the "no Internet access" prompt on captive portals.
2015-05-14 21:23:52 +00:00
Lorenzo Colitti
c2faedca3f Don't display the "no Internet access" prompt on captive portals.
Bug: 20081183
Bug: 21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586
2015-05-14 09:54:33 -07:00
Lorenzo Colitti
e14a622909 Statically import NetworkCapabilities constants for brevity.
Bug: 18591282
Change-Id: I41c148951724136f31bc663fd81ca9f5de72818a
2015-05-14 23:46:17 +09:00
Lorenzo Colitti
2c39d1313a Don't display the "no Internet access" prompt on captive portals.
Bug: 20081183
Bug: 21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586
2015-05-14 23:46:16 +09:00
Lorenzo Colitti
969d852fa5 am 402b57fe: am ee15118b: am 2943803f: Merge "Fix a race when removing from LegacyTypeTracker." into mnc-dev
* commit '402b57fec8b3909cc261fecb10cc1acb09a32464':
  Fix a race when removing from LegacyTypeTracker.
2015-05-13 07:02:05 +00:00
Lorenzo Colitti
2943803f73 Merge "Fix a race when removing from LegacyTypeTracker." into mnc-dev 2015-05-13 06:31:38 +00:00
Paul Jensen
8c2627a81e am 49979a37: am 3ce689a4: am 5696665e: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneeded." into mnc-dev
* commit '49979a37216a001d30bc618d20583dccbf481ec9':
  Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
2015-05-12 17:08:34 +00:00
Paul Jensen
5696665e2d Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev 2015-05-12 16:32:29 +00:00
Paul Jensen
bbb61094b2 Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
All ConnectivityManager APIs taking a network type have been
deprecated so there should be no need to validate a network type.

bug:20647016
Change-Id: I2dcf24f58016e94aa814dda38cfc848366cc461c
2015-05-12 10:36:56 -04:00
Lorenzo Colitti
4976772f9b Fix a race when removing from LegacyTypeTracker.
Because LegacyTypeTracker#remove can send broadcasts that cause
apps to refresh their view of network state, it needs to be
called only after network state has been updated. This requires
that callers determine whether the network was the default, and
updating state, before calling remove().

While I'm at it, fix maybeLogBroadcast's concept of whether the
network it's logging about is/was the default. This has never
been correct.

Bug: 20613953
Change-Id: Ia175ac454aa4e0a4c4f0151866314ebada681438
2015-05-12 16:48:30 +09:00
Erik Kline
e099298c11 am 3d85fcbf: am 15748d35: am a0698b61: Merge "Optionally add a default MOBILE request." into mnc-dev
* commit '3d85fcbfb01cc611697d79a18b91107ede563767':
  Optionally add a default MOBILE request.
2015-05-08 16:58:21 +00:00