Commit graph

13,045 commits

Message SHA1
Deprecate more apache-http.
bug: 18067888

Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2

Narayan Kamath   commited 2014-10-23 17:43:05 +01:00
340882c665
Add an API to select a network for a DatagramSocket.
Mirrors the API that does this for Sockets.

Bug: 18076907
Change-Id: Ifa27b39e23797558546aab751fbfb3aed3b7dbcb

Sreeram Ramachandran   commited 2014-10-23 08:37:33 -07:00
2b5a213a5c
merge in master-release history after reset to 7adffa1cbc073507de25b65f0aa2501ea05c5a58
The Android Automerger   commited 2014-10-18 05:53:25 -07:00
3bc1595847
am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '28dcf0345b2857884c1f1639fadb720318445187':
  Propagate network state changes to the LockdownVpnTracker.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2014-10-16 09:23:17 +00:00
eeff8ca36f
Propagate network state changes to the LockdownVpnTracker.
Bug: 17695048
Change-Id: I10378df0ab545729a6a315fd1bc8870cd98f47b3

Lorenzo Colitti   commited 2014-10-16 01:16:50 +09:00
31c6a49c78
merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6
The Android Automerger   commited 2014-10-14 05:52:22 -07:00
19dc9b29d4
merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6
The Android Automerger   commited 2014-10-13 05:51:53 -07:00
c3e6d06177
merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6
The Android Automerger   commited 2014-10-12 05:51:34 -07:00
7052628368
merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6
The Android Automerger   commited 2014-10-11 05:51:57 -07:00
e70ed0ada6
merge in master-release history after reset to master
The Android Automerger   commited 2014-10-06 06:05:15 -07:00
c02c3e624d
merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f
The Android Automerger   commited 2014-10-05 05:51:14 -07:00
b1a3168d2e
merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f
The Android Automerger   commited 2014-10-04 05:51:27 -07:00
523c1d5df2
am f393e491: Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
* commit 'f393e4910b42b2c9fd4dd6f970455649e00902e5':
  Switch the NetworkInfo.mIsAvailable default

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-10-03 23:53:29 +00:00
b9f2f5bcd9
Switch the NetworkInfo.mIsAvailable default
The placeholder for disconnected networks was setting it to false, but
this technically means that we know an attempt to connect to that
network will fail (which we don't really now).  Some applications use
this an decide not to bother trying - an MMS app for example would
never send an MMS because it thinks the network is never available.

This is a L regression.

bug:17669247
Change-Id: Id6041f226da069c267c56418d42c55978c36c66f

Robert Greenwalt   commited 2014-10-03 16:05:36 -07:00
145bafa9a1
am 586413f3: Merge "Send callbacks for Net property changes" into lmp-dev
* commit '586413f351':
  Send callbacks for Net property changes

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-10-03 15:41:04 +00:00
cd66c1cd76
Merge "Send callbacks for Net property changes" into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-10-03 15:36:39 +00:00
586413f351
Send callbacks for Net property changes
LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f

Robert Greenwalt   commited 2014-10-02 21:05:44 -07:00
78ac81a8d1
am 1ee5fa8f: Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
* commit '1ee5fa8f7b':
  Send updated NetworkAgent score to NetworkFactories when validated.

Paul Jensen   authored and   Android Git Automerger   commited 2014-10-03 02:22:25 +00:00
1e9a9cf348
am 3b66397c: Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
* commit '3b66397c8c':
  Allow any unvalidated Network to satisfy NetworkRequests.

Paul Jensen   authored and   Android Git Automerger   commited 2014-10-03 02:22:21 +00:00
7e9be1fb76
Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-10-03 02:18:12 +00:00
1ee5fa8f7b
Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-10-03 02:16:44 +00:00
3b66397c8c
am 51900639: Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
* commit '519006395204ba3eab77ae420d20eb70ebb78af5':
  Synchronize on all sendProxyBroadcast calls

Jason Monk   authored and   Android Git Automerger   commited 2014-10-02 22:42:58 +00:00
2ce84c5ff6
Synchronize on all sendProxyBroadcast calls
To avoid race conditions.  Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf

Jason Monk   commited 2014-10-02 15:39:38 -04:00
f326ffef6f
Send updated NetworkAgent score to NetworkFactories when validated.
Previously the score was not sent out causing other NetworkFactories
to have the lower unvalidated score and to repeatedly try to bring
up a new Network only to have it torn down.
Also, avoid logging an error when tearing down a network with only
listening requests.

bug:17726566
Change-Id: I82ff7c9bd5ec962f62a50ad0042c278622953969

Paul Jensen   commited 2014-10-02 11:06:43 -04:00
ab9bdd51c9
Allow any unvalidated Network to satisfy NetworkRequests.
Explicitly selected Networks may never be validated (e.g. Chromecast)
but are still given a high score so they can explicitly become the
default Network.  Without this fix they do not become the default
Network if another Network is present.  This was an artifact of how
unvalidated Networks were handled, but now that unvalidated Networks
are properly handled, ala 50807d, we can freely rematch even
unvalidated Networks and NetworkRequests.
Also, never linger and teardown unvalidated Networks as the user
might be in the process of signing in.  This better matches prior
behavior when unvalidated networks didn't match NetworkRequests,
and thus were never lingered.
Also, don't disconnect networks that may be lingering.  The
disconnect logic in rematchNetworkAndReqeuests() is adjusted to only
fire when a network is newly validated.
It is incorrect to consider rematching uncreated Networks and
explicitly selecting created Networks, so this change logs error
messages in those cases.

bug:17647968
bug:17396616
Change-Id: Id6b8a350b8200f484d5bfd14ca0a8f64f08846a0

Paul Jensen   commited 2014-10-02 10:56:51 -04:00
d4e077c124
merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f
The Android Automerger   commited 2014-10-02 05:53:09 -07:00
af423b41da
am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.

Sreeram Ramachandran   authored and   Android Git Automerger   commited 2014-10-02 06:29:37 +00:00
783bea432d
Send app permissions to netd.
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02

Sreeram Ramachandran   commited 2014-10-01 20:22:34 -07:00
c5756e42a4
merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f
The Android Automerger   commited 2014-10-01 05:53:04 -07:00
15ce49eb72
am 0e2d3545: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
* commit '0e2d354589':
  Update LegacyTypeTracker state before sending connect broadcasts.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2014-10-01 00:52:34 +00:00
7667616845
Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-09-30 03:05:49 +00:00
0e2d354589
am 82c7e42f: Move mobile provisioning APN support into telephony.
* commit '82c7e42f84':
  Move mobile provisioning APN support into telephony.

Paul Jensen   authored and   Android Git Automerger   commited 2014-09-29 20:47:32 +00:00
736fe9e2dd
merge in master-release history after reset to 85316d155b469b1a26da61826a02801609571f90
The Android Automerger   commited 2014-09-29 05:52:24 -07:00
d4153039ed
Move mobile provisioning APN support into telephony.
Most of this logic is simply removed from ConnectivityService.
The captive portal detection is now done by the NetworkMonitor.
The notification logic is still left in ConnectivityService as
it's used by both the NetworkMonitor and telephony's mobile
provisioning logic.

bug:17324098

Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8

Paul Jensen   commited 2014-09-29 11:37:43 +00:00
82c7e42f84
Update LegacyTypeTracker state before sending connect broadcasts.
Currently, LegacyTypeTracker sends out connected broadcasts
before updating its internal lists of networks. This creates a
race condition where an app can query LegacyTypeTracker state
(e.g., via getActiveNetworkInfo) as soon as it gets the
broadcast, and get information that has not been updated.

Bug: 17540101
Change-Id: Iefd6d5e9fd0b427c5872166208831f70fcef8b6f

Lorenzo Colitti   commited 2014-09-29 20:15:33 +09:00
497b4b0d84
merge in master-release history after reset to fffcad067ab388f399e20a28d22bed31f76849d3
The Android Automerger   commited 2014-09-27 05:52:30 -07:00
2f2fa501f2
merge in master-release history after reset to 75b0ba6db2238cb14e5d1d162df0422631a3c8a5
The Android Automerger   commited 2014-09-25 05:51:59 -07:00
cd5a6e3f0b
merge in master-release history after reset to 75b0ba6db2238cb14e5d1d162df0422631a3c8a5
The Android Automerger   commited 2014-09-24 05:53:15 -07:00
310abfd406
am 895b6726: Merge "Only stop/start clatd if necessary." into lmp-dev
* commit '895b6726e13611a614d245bbd4232f9f0449727f':
  Only stop/start clatd if necessary.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2014-09-24 01:29:44 +00:00
3014bf8115
am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
* commit '6974f6a97028a42ce79b8e9e1869af0ebf5624f4':
  Block address families with routes, not NetworkAgent side channel

Lorenzo Colitti   authored and   Android Git Automerger   commited 2014-09-24 01:29:36 +00:00
b3f8f2d071
Merge "Only stop/start clatd if necessary." into lmp-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-09-24 01:21:17 +00:00
3e5e56df71
Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-09-24 01:21:06 +00:00
b30dbe08be
merge in master-release history after reset to 0712007298c42aecb133049455c86483578db64c
The Android Automerger   commited 2014-09-23 08:05:25 -07:00
83b54cd50e
Only stop/start clatd if necessary.
Previously we would restart clatd on every LinkProperties
change, which now happens every time we switch radio technology
(e.g., LTE to HSPA). We also would not stop it if the link got
an IPv4 address.

Bug: 15024258
Bug: 17186694
Bug: 17569702
Change-Id: I65cfcd5e7acec8ea1a12392a59dabd668c58490f

Lorenzo Colitti   commited 2014-09-24 00:03:23 +09:00
667da2828b
am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev
* commit '1c637c5fef678a82fd1f2c380d41ed6ebcb5bf2e':
  Remove needless locking of mRulesLock that caused deadlocks.

Paul Jensen   authored and   Android Git Automerger   commited 2014-09-23 12:08:22 +00:00
11c11a137f
Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-09-23 12:00:35 +00:00
099cbb0577
am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev
* commit 'bb17a717750c558ece69344ecd93d96d4fbc4aca':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2014-09-23 03:21:21 +00:00
7f4072ddc5
Block address families with routes, not NetworkAgent side channel
Now that we support unreachable routes, use those to block
address families on VPNs. This is a much more elegant solution.
Also update LinkProperties when IP addresses are added and
removed, fixing a TODO.

Bug: 17462989
Change-Id: Ib749d84710dca70d672350b9f129bb91419ec77e

Lorenzo Colitti   commited 2014-09-23 10:48:28 +09:00
d63379ab2e
Cleanup NetworkCapabilities.
Remove unused imports and variables.
Fix misspellings.
Added @Overrides.

Change-Id: I81f4adb0504e92d01c5465a0e14bc46d5ec3987e

Wink Saville   commited 2014-09-22 21:51:47 +00:00
039af9b696
Support non-unicast route types: unreachable and throw.
Bug: 17462989
Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb

Lorenzo Colitti   commited 2014-09-22 13:10:15 +09:00
8eac7b3a63