Commit graph

2,066 commits

Message SHA1
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
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
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
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
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
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

Lorenzo Colitti   commited 2015-05-19 18:29:02 +09:00
9809729e2f
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
  ...

Jorim Jaggi   authored and   Android Git Automerger   commited 2015-05-19 05:14:06 +00:00
9c78610b9c
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

Robin Lee   commited 2015-05-18 23:35:31 +01:00
5ff73b7b91
Query HTTP proxy for network via a new API to avoid permissions exceptions
Add @hidden ConnectivityManager.getProxyForNetwork() API.

Bug:20470604
Change-Id: I6a9bc4afc8273bc43b14cdeccfedbbf3ff66be40

Paul Jensen   commited 2015-05-18 17:05:51 +00:00
fdec88b48d
merge in mnc-release history after reset to mnc-dev
The Android Automerger   commited 2015-05-16 01:02:14 -07:00
4d5dd9a7dd
am ed9fa1cc: am 4eb901b6: am bdc8b6d2: Merge "Statically import NetworkCapabilities constants for brevity." into mnc-dev
* commit 'ed9fa1ccd8f655a5c7520511ff354443ad9444fe':
  Statically import NetworkCapabilities constants for brevity.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-05-15 16:57:19 +00:00
7f880a9434
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.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-05-14 21:23:52 +00:00
b78c70d3ed
Don't display the "no Internet access" prompt on captive portals.
Bug: 20081183
Bug: 21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586

Lorenzo Colitti   authored and   The Android Automerger   commited 2015-05-14 09:54:33 -07:00
4957bb7d59
Statically import NetworkCapabilities constants for brevity.
Bug: 18591282
Change-Id: I41c148951724136f31bc663fd81ca9f5de72818a

Lorenzo Colitti   commited 2015-05-14 23:46:17 +09:00
d21a526ac9
Don't display the "no Internet access" prompt on captive portals.
Bug: 20081183
Bug: 21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586

Lorenzo Colitti   commited 2015-05-14 23:46:16 +09:00
9bf1c31e6a
am 402b57fe: am ee15118b: am ae75d3c2: Merge "Fix a race when removing from LegacyTypeTracker." into mnc-dev
* commit '402b57fec8b3909cc261fecb10cc1acb09a32464':
  Fix a race when removing from LegacyTypeTracker.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-05-13 07:02:05 +00:00
c9806ceffe
Merge "Fix a race when removing from LegacyTypeTracker." into mnc-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2015-05-13 06:31:38 +00:00
ae75d3c22e
am 49979a37: am 3ce689a4: am 227afb8a: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneeded." into mnc-dev
* commit '49979a37216a001d30bc618d20583dccbf481ec9':
  Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.

Paul Jensen   authored and   Android Git Automerger   commited 2015-05-12 17:08:34 +00:00
8eefc53216
Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2015-05-12 16:32:29 +00:00
227afb8aff
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

Paul Jensen   commited 2015-05-12 10:36:56 -04:00
1c9f2e42b8
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

Lorenzo Colitti   commited 2015-05-12 16:48:30 +09:00
2e3a9705cf
am 3d85fcbf: am 15748d35: am a0698b61: Merge "Optionally add a default MOBILE request." into mnc-dev
* commit '3d85fcbfb01cc611697d79a18b91107ede563767':
  Optionally add a default MOBILE request.

Erik Kline   authored and   Android Git Automerger   commited 2015-05-08 16:58:21 +00:00
867cf94d07
Optionally add a default MOBILE request.
This enables persisting the mobile internet data connection, even
when Wi-Fi is enabled and serving as the default network (for faster
network switching).

Change-Id: I9d1512b3a8413c4f163c63d57e66bded017101e4

Erik Kline   commited 2015-05-08 15:22:37 +09:00
74d68efe72
am 2599c660: (-s ours) am cff23c2f: Merge commit \'9649b30d\' into manualmerge
* commit '2599c660bebc08d50b35f0b2bb46481610b8ebe0':
  DO NOT MERGE - Make sure to return network type after conversion
  DO NOT MERGE - Radio Access Family related fixes
  DO NOT MERGE - Multi-sim device would show 2 PLMN in status bar even if they are same.
  Add plumbing for merge failures and renable button. (3/4)
  Changed logging tag.
  Fixing issue where conference calls enable speaker phone.
  Add videoStateToString on videoProvider Class.
  Update the SmsMessage.createFromPdu() API call
  No Permission check for WiFi RTT
  add a parameter to carrier messaging calls to request delivery status
  Added parameter to avoid having a stream opened, and with that, file truncated on no-op.
  Make onlost/onfound APIs public
  IMS-VT: Enable video calls
  add injectSmsPdu with subId to ISms.aidl
  Fail SmsManager requests if SubId is not active.

Prerepa Viswanadham   authored and   Android Git Automerger   commited 2015-05-05 19:21:52 +00:00
a01869c505
am 0a5af5a2: am 7a80f122: am 784a3f4b: Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev
* commit '0a5af5a2a1d90ae773b26fc8350eee63362dc74b':
  Adding "Connected, no Internet" string in Wifi nw summary.

Sanket Padawe   authored and   Android Git Automerger   commited 2015-05-05 01:36:33 +00:00
490a036036
Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge

Prerepa Viswanadham   authored and   Android (Google) Code Review   commited 2015-05-05 01:06:38 +00:00
9649b30d09
Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev
Sanket Padawe   authored and   Android (Google) Code Review   commited 2015-05-04 20:44:52 +00:00
784a3f4b68
Adding "Connected, no Internet" string in Wifi nw summary.
Bug: 17380953
Change-Id: I9664bcbf33832fe722e7d2b3125939287ee98098

Sanket Padawe   commited 2015-05-01 16:55:00 -07:00
e453b72d39
am ad44d814: am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* commit 'ad44d81457971085a0b20fb42388010d76c79132':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-05-01 04:19:07 +00:00
9e3be4c550
Add a hidden method to clear NetworkCapabilities.
Change-Id: Icf7d67e24a09113340e9bff2c72526760914ef48

Lorenzo Colitti   commited 2015-05-01 12:36:29 +09:00
c0644de5ef
Fix javadoc error for requestNetwork.
The ConnectivityManager documentation uses {@link requestNetwork}
without specifying which version of that method it refers to.
This results in javadoc incorrectly linking to the version of the
method that takes a PendingIntent instead of the version that
takes a callback.

Change-Id: Ia914ec88005a6401b6391c5b4fc92f988baa3922

Lorenzo Colitti   commited 2015-05-01 12:36:29 +09:00
efd396e312
Simplify network callback handling code.
Change-Id: I2490ad754bf2a1282f27302c8556fb19983cc6b1

Lorenzo Colitti   commited 2015-05-01 12:36:28 +09:00
8db5f9a91d
Document and unhide CALLBACK_PRECHECK.
Bug: 20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f

Lorenzo Colitti   commited 2015-05-01 12:36:28 +09:00
ccf8210b9d
am 278886d5: am 3184b286: am fa4eda44: Merge "Remove network access for idle apps" into mnc-dev
* commit '278886d50a66689529320f9bd735177c068e210d':
  Remove network access for idle apps

Amith Yamasani   authored and   Android Git Automerger   commited 2015-04-29 23:04:50 +00:00
c486ae5e47