Commit Graph

2091 Commits

Author SHA1 Message Date
Lorenzo Colitti
35495fadb1 Propagate network state changes to the LockdownVpnTracker.
Bug: 17695048
Change-Id: I10378df0ab545729a6a315fd1bc8870cd98f47b3
2014-10-16 01:16:50 +09:00
The Android Automerger
f0b056e339 merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6 2014-10-14 05:52:22 -07:00
The Android Automerger
47fdc0dd7c merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6 2014-10-13 05:51:53 -07:00
The Android Automerger
ea84565278 merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6 2014-10-12 05:51:34 -07:00
The Android Automerger
ffb98bd483 merge in master-release history after reset to 06ef189fb664160d2545fa9a76910df0961924c6 2014-10-11 05:51:57 -07:00
The Android Automerger
1bd7d5a537 merge in master-release history after reset to master 2014-10-06 06:05:15 -07:00
The Android Automerger
357fd56d99 merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f 2014-10-05 05:51:14 -07:00
The Android Automerger
3c37cb4365 merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f 2014-10-04 05:51:27 -07:00
Robert Greenwalt
cd33c65aca am f393e491: Merge "Switch the NetworkInfo.mIsAvailable default" into lmp-dev
* commit 'f393e4910b42b2c9fd4dd6f970455649e00902e5':
  Switch the NetworkInfo.mIsAvailable default
2014-10-03 23:53:29 +00:00
Robert Greenwalt
458470fb16 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
2014-10-03 16:05:36 -07:00
Robert Greenwalt
db4908dc1c am 707d0288: Merge "Send callbacks for Net property changes" into lmp-dev
* commit '707d028804d968bec423f0b8b2c007c4a82ff222':
  Send callbacks for Net property changes
2014-10-03 15:41:04 +00:00
Robert Greenwalt
707d028804 Merge "Send callbacks for Net property changes" into lmp-dev 2014-10-03 15:36:39 +00:00
Robert Greenwalt
e525a0a7f7 Send callbacks for Net property changes
LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
2014-10-02 21:05:44 -07:00
Paul Jensen
577d5005fc am b2a1ae10: Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
* commit 'b2a1ae1042e6b40c1c8122ba77a96e06084068c0':
  Send updated NetworkAgent score to NetworkFactories when validated.
2014-10-03 02:22:25 +00:00
Paul Jensen
cdefb481da am a3c579e7: Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
* commit 'a3c579e781de16edade627fedf76adb2ff2aaf3f':
  Allow any unvalidated Network to satisfy NetworkRequests.
2014-10-03 02:22:21 +00:00
Paul Jensen
b2a1ae1042 Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev 2014-10-03 02:18:12 +00:00
Paul Jensen
a3c579e781 Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev 2014-10-03 02:16:44 +00:00
Jason Monk
cd7cb4df35 am 51900639: Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev
* commit '519006395204ba3eab77ae420d20eb70ebb78af5':
  Synchronize on all sendProxyBroadcast calls
2014-10-02 22:42:58 +00:00
Jason Monk
e3a7ae6118 Synchronize on all sendProxyBroadcast calls
To avoid race conditions.  Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf
2014-10-02 15:39:38 -04:00
Paul Jensen
af94b9855b 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
2014-10-02 11:06:43 -04:00
Paul Jensen
0fa1abf72d 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
2014-10-02 10:56:51 -04:00
The Android Automerger
c9af823264 merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f 2014-10-02 05:53:09 -07:00
Sreeram Ramachandran
4da0928822 am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.
2014-10-02 06:29:37 +00:00
Sreeram Ramachandran
ae6c5079a5 Send app permissions to netd.
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
2014-10-01 20:22:34 -07:00
The Android Automerger
9ae5c3e51e merge in master-release history after reset to 96d9b8943503c7dd3f0e6092efa425691c0e2b2f 2014-10-01 05:53:04 -07:00
Lorenzo Colitti
d58b52d695 am d4a26e96: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
* commit 'd4a26e96c2e7f53c5a4f842bd2d04b28242b6611':
  Update LegacyTypeTracker state before sending connect broadcasts.
2014-10-01 00:52:34 +00:00
Lorenzo Colitti
d4a26e96c2 Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 2014-09-30 03:05:49 +00:00
Paul Jensen
72426b6194 am ebeaecde: Move mobile provisioning APN support into telephony.
* commit 'ebeaecde71b34ba32a2cc602c09e4822b8ecbf97':
  Move mobile provisioning APN support into telephony.
2014-09-29 20:47:32 +00:00
The Android Automerger
a2d9afec1f merge in master-release history after reset to 85316d155b469b1a26da61826a02801609571f90 2014-09-29 05:52:24 -07:00
Paul Jensen
ebeaecde71 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
2014-09-29 11:37:43 +00:00
Lorenzo Colitti
4b584064d2 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
2014-09-29 20:15:33 +09:00
The Android Automerger
dcd437c5f2 merge in master-release history after reset to fffcad067ab388f399e20a28d22bed31f76849d3 2014-09-27 05:52:30 -07:00
The Android Automerger
49b7794fcf merge in master-release history after reset to 75b0ba6db2238cb14e5d1d162df0422631a3c8a5 2014-09-25 05:51:59 -07:00
The Android Automerger
0bca184a06 merge in master-release history after reset to 75b0ba6db2238cb14e5d1d162df0422631a3c8a5 2014-09-24 05:53:15 -07:00
Lorenzo Colitti
fdd7f4e99a am 895b6726: Merge "Only stop/start clatd if necessary." into lmp-dev
* commit '895b6726e13611a614d245bbd4232f9f0449727f':
  Only stop/start clatd if necessary.
2014-09-24 01:29:44 +00:00
Lorenzo Colitti
6240ff578c 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
2014-09-24 01:29:36 +00:00
Lorenzo Colitti
aa584b9631 Merge "Only stop/start clatd if necessary." into lmp-dev 2014-09-24 01:21:17 +00:00
Lorenzo Colitti
1ba96545b3 Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev 2014-09-24 01:21:06 +00:00
The Android Automerger
66f9176027 merge in master-release history after reset to 0712007298c42aecb133049455c86483578db64c 2014-09-23 08:05:25 -07:00
Lorenzo Colitti
cef8aecacf 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
2014-09-24 00:03:23 +09:00
Paul Jensen
f9e3dcf9e0 am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev
* commit '1c637c5fef678a82fd1f2c380d41ed6ebcb5bf2e':
  Remove needless locking of mRulesLock that caused deadlocks.
2014-09-23 12:08:22 +00:00
Paul Jensen
4a8196d434 Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 2014-09-23 12:00:35 +00:00
Lorenzo Colitti
885024dd7d 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.
2014-09-23 03:21:21 +00:00
Lorenzo Colitti
83d12dbbb7 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
2014-09-23 10:48:28 +09:00
Wink Saville
b0f0792383 Cleanup NetworkCapabilities.
Remove unused imports and variables.
Fix misspellings.
Added @Overrides.

Change-Id: I81f4adb0504e92d01c5465a0e14bc46d5ec3987e
2014-09-22 21:51:47 +00:00
Lorenzo Colitti
2129034e25 Support non-unicast route types: unreachable and throw.
Bug: 17462989
Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb
2014-09-22 13:10:15 +09:00
Paul Jensen
42aba3e38a Remove needless locking of mRulesLock that caused deadlocks.
The locks were added in c006f1 when underlying functions weren't performing
locking.  In 21062e7 the underlying functions were changed to perform locking
but the higher level locking wasn't removed.  The higher level locking can
now cause deadlocks with the new NetworkAgentInfo locking.  This change
removes the needless higher level locking.  Now all mRulesLock locking
only guards simple accesses to the appropriate two data strucures so there is
no chance of a deadlock.  I verified that all accesses to the appropriate
two data structures are guarded by mRulesLock locking.

bug:17569997
Change-Id: Id9f4e3d19d6895876925ae32f12460db30359368
2014-09-19 11:14:12 -04:00
The Android Automerger
d3939974d3 merge in master-release history after reset to 1e860399b7d8480e4624b4da17668e507b79bb79 2014-09-18 05:52:59 -07:00
Robert Greenwalt
61b67c71c5 Merge "Use unified Tethering Permission Check" into lmp-dev 2014-09-18 00:02:16 +00:00
Robert Greenwalt
3c5dee0a26 Use unified Tethering Permission Check
The BT and Wifi mechanisms for enabling Tethering did their own
permission checks.  This set of changes unifies the check into
a ConnectivityManager function so they can be kept in sync.

bug:17435527
Change-Id: I8c157a5acf56ffbddd349cb6a45160ae7be8541b
2014-09-17 16:18:12 -07:00