Commit graph

13,045 commits

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

Paul Jensen   commited 2014-09-19 11:14:12 -04:00
e801542935
merge in master-release history after reset to 1e860399b7d8480e4624b4da17668e507b79bb79
The Android Automerger   commited 2014-09-18 05:52:59 -07:00
d2930f5902
Merge "Use unified Tethering Permission Check" into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-09-18 00:02:16 +00:00
ab9254efd3
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

Robert Greenwalt   commited 2014-09-17 16:18:12 -07:00
b39204f207
Merge "NetworkStats always needs arrays." into lmp-dev
Jeff Sharkey   authored and   Android (Google) Code Review   commited 2014-09-17 19:01:13 +00:00
5cb93af020
NetworkStats always needs arrays.
Internal logic relies on Arrays.copyOf(), so always give ourselves
valid arrays, using shared empty objects to save overhead.

Bug: 17502649
Change-Id: I5dbb00545bdfe45bbd48144ab505ea08cc92cbcd

Jeff Sharkey   commited 2014-09-17 09:26:31 -07:00
8929f18dcd
merge in master-release history after reset to 313803d040b91e96fc4e9a209ca68a9778811a25
The Android Automerger   commited 2014-09-17 05:51:26 -07:00
c69f0ea397
Add NetworkAgent event for ExplicitlySelected
Lets Wifi tell us when the user selected this AP vs auto-connected.

bug:17396168
Change-Id: I6e067ab62ed49040629aa31fe07ff880d3d542f0

Robert Greenwalt   commited 2014-09-16 17:03:59 -07:00
cea86b065f
Merge "Report Network status to NetworkAgent." into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-09-16 22:59:33 +00:00
2035d5215b
merge in master-release history after reset to 313803d040b91e96fc4e9a209ca68a9778811a25
The Android Automerger   commited 2014-09-16 05:51:26 -07:00
f78184fdb9
Fix a typo in comment.
Change-Id: I23224b1adf946ebec0ec7a39686913189c9b8287

Ang Li   commited 2014-09-15 15:09:16 -07:00
5178814369
merge in master-release history after reset to 313803d040b91e96fc4e9a209ca68a9778811a25
The Android Automerger   commited 2014-09-15 05:51:39 -07:00
918ea12ef3
Report Network status to NetworkAgent.
Currently just valid/invalid based on NetworkMonitor findings.

Changed NetworkMonitor to start out in default state since starting in Offline causes
a spurious invalid report at creation time.

Added some logging.

bug:17395269
Change-Id: I9ae650b561834d8f8979033744d97df852e76df9

Robert Greenwalt   commited 2014-09-14 07:43:10 -07:00
135a724164
merge in master-release history after reset to 313803d040b91e96fc4e9a209ca68a9778811a25
The Android Automerger   commited 2014-09-14 05:51:11 -07:00
06f82086f6
merge in master-release history after reset to 313803d040b91e96fc4e9a209ca68a9778811a25
The Android Automerger   commited 2014-09-13 05:52:30 -07:00
3829f1474d
Update Inet state when NetworkMonitor re-evaluates a network.
Previously the Inet state (the little exclamation mark beside the WiFi
and Cellular bars) only transitioned from bad to good once.  With this
change it can transition back to bad (and later to good again) if a network
re-evaluation is triggered, say by ConnectivityManager.reportBadNetwork.
Also, avoid triggering re-evaluation in two unwanted cases.

bug:16214361
Change-Id: I7856724249ffcbb0945276dcf45019876231fdaf

Paul Jensen   authored and   Robert Greenwalt   commited 2014-09-12 23:02:28 +00:00
5877e73315
Better handling of unvalidated networks.
Give unvalidated networks penalized scores and allow them to satisfy
requests.

Previously unvalidated networks were never allowed to satisfy
NetworkRequests and so never caused CONNECTIVITY_ACTION broadcasts.
Previously if there were no other networks present an unvalidated
network would still be made the default.  This change formalizes
this behavior using our existing network score logic by assigning
unvalidated networks a highly penalized score.

bug:16358003
bug:17364306
Change-Id: I28fcd6f5ac4b52a4d1c234c472cfa8ba998bcc6f

Paul Jensen   commited 2014-09-12 13:32:00 -04:00
19d1d36ec0
Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-09-11 13:15:22 +00:00
80177f2122
merge in master-release history after reset to 08167683d9fe042acd85becce9feb6b19519e9d4
The Android Automerger   commited 2014-09-11 05:51:16 -07:00
34313c718e
Make Network.openConnection() share HttpHandlers not OkHttpClients.
HttpHandler and HttpsHandler classes have a lot of bug fixes baked into
them that the Network.openConnection() API should be using, for example
disabling SPDY support.

bug:17420465
Change-Id: I9f1472753a542d1dd6bffde3a60c37a9145098aa

Paul Jensen   commited 2014-09-11 00:25:50 +00:00
26a0dc0c21
Merge "Don't accept score below 0." into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-09-10 19:30:22 +00:00
6df9633596
Flush HTTP socket pools and DNS cache when binding process to a Network.
Future HTTP requests could use an old socket that's bound to a different Network
causing unexpected results.  DNS results could also not be appropriate.

bug:17283566
bug:17432215
Change-Id: I88b40b723c7b442000cafe8ce8b9d989d8995991

Paul Jensen   commited 2014-09-10 18:26:25 +00:00
99c366637d
Don't accept score below 0.
Network Factories are allowed to go below, but networks need to be
constrained.  Allowing the network to go below 0 meant that -1 could
sometimes leak through and foul the logic.

The core of 17361330 will be fixed when we stop sending scores for
listens to NetworkFactories, but it exposed this issue too.  Summary:

1 - add a network listener.  This isn't  a request so it's not sent
to networks.
2 - alter your score (ethernet sets score to -1 when the link goes
down) (16:07:39.782)
3 - a bug in ConnectivityService causes score changes to get sent for
all network requests and network listeners causing NetworkFactories
to no see 2 entities.  This bug will be fixed by a pending change
(https://googleplex-android-review.googlesource.com/#/c/540840/).
This causes the ethernet NetworkFactory to see two entities, both
served by networks of score -1.  (16:07:39.989)
4 - disconnect Ethernet - this only sends 0 scores for known
requests, not network listeners.  Had it been sent for both entities
they both would have evaluated that the networkfactory score (-1)
was lower than the request score (0) and both released their
refcount. (16:08:03.147)
5 - this means the listener is tracked by the EthernetNetworkFactory
with a score of -1 while the factory itself has a score of -1 so the
network release isn't called.

bug:17361330
Change-Id: Ife34ca0f9c233dd3c3df80f6fea580af43afcdeb

Robert Greenwalt   commited 2014-09-10 10:39:37 -07:00
4a4ecd2c5f
merge in master-release history after reset to 08167683d9fe042acd85becce9feb6b19519e9d4
The Android Automerger   commited 2014-09-10 05:53:12 -07:00
274ba003c5
Merge "Stop logging false error when lingering completes." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-09-09 10:59:42 +00:00
a826bcd428
Merge "Don't send listening NetworkRequests to NetworkFactories." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-09-09 10:59:20 +00:00
57250f0cae
Merge "Implement ConnectivityManager.reportBadNetwork() to trigger network validation." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-09-09 10:58:59 +00:00
49fe68628d
Stop logging false error when lingering completes.
When lingering completes ConnectivityService would log an error message
saying the Network still had NetworkRequests.  Fixed by ignoring
listening NetworkRequests which aren't a problem.

Change-Id: Ie78a1f91c47b012eae28a377dd77bee2cfcbde3b

Paul Jensen   commited 2014-09-07 13:16:03 -04:00
4fd960b44e
Don't send listening NetworkRequests to NetworkFactories.
We were doing this when a NetworkAgent updated its score.

bug:17393458
Change-Id: Id19ffc36b942b7112da70dfadd6abd57fcd128bd

Paul Jensen   commited 2014-09-07 13:10:07 -04:00
e252f4e0a0
merge in master-release history after reset to d80f2d1cdf46f1a8e8b03255b37f0700ee6d9892
The Android Automerger   commited 2014-09-06 05:52:39 -07:00
1b3e3f2d59
Reserve NetIds 1..50 for OEM use.
Also reserve 51..100 for our use.

Bug: 17303534
Change-Id: Id082368b493dc3c5b5c479e51d273458d80ec6aa

Sreeram Ramachandran   commited 2014-09-05 16:24:51 -07:00
0fde0bec00
Fix networking API per scripting checks.
bug:17389242
Change-Id: I6017f559788ee16a1721b387796e5bda5e07280d

Robert Greenwalt   commited 2014-09-04 16:50:29 -07:00
2e4731fd9c
Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-09-04 21:08:11 +00:00
3013fe6212
Proxy fixes from API review feedback
Bug: 17389383
Change-Id: Ib5e40f55d02687ee917ba30773123cf3e4c2a97d

Jason Monk   commited 2014-09-04 15:39:56 -04:00
265a548f16
Implement ConnectivityManager.reportBadNetwork() to trigger network validation.
Network traffic used to perform the network validation is billed to the UID of
the caller of reportBadNetwork.  This change does not change the actions taken
upon validation failing or succeeding:  NetworkMonitor will show the sign-in
notification if a captive portal is found.  NetworkMonitor will inform
ConnectivityService if a network tests functional.  NetworkMonitor will not
take action if a network lacks any connectivity.
Also, remove an unused Thread that was confusing bandwidth billing.

bug:17326268
Change-Id: I7fea23480af54211004a0a1c535a71c2793f21bb

Paul Jensen   commited 2014-09-04 12:02:52 -04:00
57d231cfaa
merge in master-release history after reset to 55a86718c0fc2661a5522de08a1ab79ac0267c7d
The Android Automerger   commited 2014-09-04 05:52:45 -07:00
d8ad616061
Catch creation of NetworkRequest without NetCap
Using reflection you could do this and it would crash the system.
Thanks, ServiceFuzzer!

bug:17379629
Change-Id: I8b470bda78a69761ccd92496746f5d295b5d07f2

Robert Greenwalt   commited 2014-09-03 20:57:41 -07:00
77550b8ee7
merge in master-release history after reset to eebaf6c4eceb7c906531dfa46fc093886fb1b3c5
The Android Automerger   commited 2014-09-01 05:51:25 -07:00
5a9378466f
merge in master-release history after reset to eebaf6c4eceb7c906531dfa46fc093886fb1b3c5
The Android Automerger   commited 2014-08-31 05:51:14 -07:00
3cf00d8846
merge in master-release history after reset to eebaf6c4eceb7c906531dfa46fc093886fb1b3c5
The Android Automerger   commited 2014-08-30 05:52:47 -07:00
d3c8be398f
Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
This constructor does nothing, including doing nothing with its
only argument. This causes it to return a NetworkInfo for
TYPE_MOBILE no matter what was passed in.

Bug: 16610051
Change-Id: I4ccd5ec050f7824fb06496c00fcd7901defeb7bd

Lorenzo Colitti   commited 2014-08-29 18:34:49 -07:00
786ae5df7d
Use per-Network connection pools for openConnection.
If we don't do this, per-network HTTP requests will go over the
wrong network if any previous HTTP request was made by the same
app on another network.

Bug: 17300006
Change-Id: I1854c16dee6adb9e81fb12b097577439d69a644e

Lorenzo Colitti   commited 2014-08-29 18:13:19 -07:00
535cfe9aab
Pass the socket mark for DNS queries to dnsmasq.
This makes tethered clients use the correct DNS servers when
tethering to non-default networks like the DUN APN.

Bug: 16357676
Change-Id: I8933b6de198a92c2aaf0291931ace8966ddba275

Lorenzo Colitti   commited 2014-08-29 10:21:58 -07:00
2b2d73c7fd
Change TelephonyManager method name to accurately reflect functionality.
Bug: 17163860
Change-Id: I4390d79c49831454146a42b89520a16984c5f260

Diego Pontoriero   commited 2014-08-28 13:50:36 -07:00
4546d44570
Merge "Clean up Connectivity Logging." into lmp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-08-28 16:29:55 +00:00
64c07932e3
merge in master-release history after reset to cd23a9be61a10881833404eb8d032cdad2cc10ae
The Android Automerger   commited 2014-08-28 05:52:32 -07:00
7077b89fe7
Clean up Connectivity Logging.
bug:17285109
Change-Id: I61b98aa636996f8d4915fd954d49a22c20cfe9ab

Robert Greenwalt   commited 2014-08-27 14:49:14 -07:00
721f237014
merge in master-release history after reset to 36bd80025a23f363c1a3b281eebd573073700d5d
The Android Automerger   commited 2014-08-27 05:52:35 -07:00
783082d4d9
Merge "Fix to allow removing sign-in notification when network removed." into lmp-dev
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-08-26 23:58:40 +00:00
276d444af9
Fix to allow removing sign-in notification when network removed.
When the NetworkMonitor is told a network disconnected and a sign-in
notification has been shown to the user, the NetworkMonitor requests
the notification be removed.  This request goes to the
ConnectivityService who may have already removed the NetworkAgentInfo
from mNetworkForNetId so we cannot look up the NetID in there.
There is no harm in allowing notification hiding for networks that
are disconnected as the notification logic does not effect the
Network state (like the validation message that caused the addition
of the Network liveness check).

bug:17261757
Change-Id: Id0a299e230ae37e641ac2faeebc45550e27c1fa4

Paul Jensen   commited 2014-08-25 22:45:39 -04:00
c3deb11f7b