Commit graph android_packages_modules_Co.../services/java/com/android/server
Message SHA1
Fix supplimentary network connections with VPNs
Enables the use of supplimentary mobile networks like MMS, and HIPRI
while VPNs are running.

Change-Id: I313f57a905b4e16bd4322c68687cbff1cfbe9d3e

Chad Brubaker   commited 2013-07-19 15:57:05 -07:00
78850f3081
resolved conflicts for merge of 64031ab2 to master
Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f

Robert Greenwalt   commited 2013-07-19 14:30:49 -07:00
00eb17fb05
resolved conflicts for merge of 248d8d2c to master
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3

Robert Greenwalt   commited 2013-07-19 14:09:30 -07:00
1bf31d7571
am d7aeae15: am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit 'd7aeae15a1':
  When a SIM is changed check mobile provisioning.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-19 13:42:36 -07:00
48f0c5a396
checkMobileProvisioning is not using sendNotification.
Change-Id: Ie5b98b462b29fe9339fcb8207d2d33e3028a155c

Wink Saville   commited 2013-07-19 09:27:56 -07:00
b56c4fd054
Make CS.isTetheringSupported dynamic
It used to be set at boot, but that was too quick to pick up carrier
specific resources.  With this change even if you switch sims subequent
checks get the new values.

bug:9865616
Change-Id: I8c270c6b02fc6bdd3c3d76ceea58172df25e058d

Robert Greenwalt   commited 2013-07-18 14:24:42 -07:00
81b0274875
Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-07-17 23:46:25 +00:00
1f905dede5
Add gservices updater for carrier provisioning url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1

Robert Greenwalt   commited 2013-07-17 14:05:33 -07:00
7ddc6c985d
When a SIM is changed check mobile provisioning.
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.

Bug: 9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21

Wink Saville   commited 2013-07-16 17:16:37 -07:00
9564f2b34f
Support routing sockets as another user
Add support for routing sockets as if they were another user's.
This is for services that handle delegated network tasks like MediaServer and DownloadManager.

Change-Id: Id20efc1f5c2cce6f8838d777762f6c0a703a9437

Chad Brubaker   commited 2013-07-15 12:14:10 -07:00
31de0b69b0
Add per user VPN support
VPNs are now per user instead of global. A VPN set by user A routes only
user A's traffic and no other user can access it.

Change-Id: Ia66463637b6bd088b05768076a1db897fe95c46c

Chad Brubaker   commited 2013-07-12 20:51:03 -07:00
ccae0d365b
am 7d8ad734: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '7d8ad734af':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-12 12:14:01 -07:00
c137d87017
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859

Wink Saville   commited 2013-07-10 23:00:07 -07:00
dfabd993a7
am ef5c31ae: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
* commit 'ef5c31ae3e':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-02 12:41:31 -07:00
b72702da1f
Fix NPE if mobile is not supported in checkMobileProvisioning.
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c

Wink Saville   commited 2013-07-02 10:55:14 -07:00
fdb84863b3
Merge commit '68513498' into fix-merge-conflict
* commit '68513498':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458

Wink Saville   commited 2013-07-01 16:12:31 -07:00
2e63bb7ef5
Add checkMobileProvisioning to ConnectivityService.
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec

Wink Saville   commited 2013-06-29 21:10:57 -07:00
690cb18254
464xlat: use a gatewayed route, not point-to-point
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.

Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:

default dev clat4  scope link

to:

default via 192.0.0.4 dev clat4  scope link
192.0.0.4 dev clat4  scope link

and those apps now work.

Bug: 9597256
Bug: 9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6

Lorenzo Colitti   commited 2013-06-29 00:14:43 +09:00
25f5af234f
Move battery stats call from SystemUI to system server.
The UPDATE_DEVICE_STATS permission is no longer required in sysui.

Change-Id: Icc3120b7873563e3727e56bed9f3b4767da0606d

John Spurlock   commited 2013-06-25 10:21:11 -04:00
4ba7e413e7
Fix parsing of global:http_proxy value.
This caused a runtime restart for ':' and did not disable the proxy for ""
before.

Change-Id: Ib88b21e9eba5818a4968ae604abad8a3b3d1766f

Andreas Huber   commited 2013-05-28 15:17:37 -07:00
9df8955fe1
Use the old interface when resetting connections
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9

Robert Greenwalt   commited 2013-05-23 18:33:06 -07:00
ec8a9e6200
Merge "Support WiFi only device at runtime." into jb-mr2-dev
Wink Saville   authored and   Android (Google) Code Review   commited 2013-04-24 15:44:08 +00:00
d292caf445
Support WiFi only device at runtime.
To date WiFi only devices were defined by the list of networkAttributes
in config.xml overriden in on a per-device basis. This change is the
simplest change needed to determine this at runtime and therefore allowing
a single build to support the two different configurations.

Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91

Wink Saville   commited 2013-04-23 14:26:51 -07:00
23ee8db792
Listen for network disconnect.
VPN used to just watch the interface, but that is insufficient.  There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.

Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.

bug:8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a

Robert Greenwalt   commited 2013-04-22 14:13:51 -07:00
308b9acca1
Add new route.hasGateway() api
Fixes issues brought in by change to isHostRoute.  isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.

bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f

Robert Greenwalt   commited 2013-04-12 11:22:52 -07:00
24bc534c2e
Merge "Routing workaround." into jb-mr2-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-04-11 23:27:20 +00:00
10572edbba
Use CONNECTIVITY_INTERNAL for global proxy
The Global http proxy shouldn't be used by apps, but can be useful in certain
conditions.

bug:8264794
bug:8557674
Change-Id: Ia3cbe542e448d9e74d0492626a13e9fd34ad797a

Robert Greenwalt   commited 2013-04-10 15:32:18 -07:00
aa4677cfa0
Routing workaround.
Change our order of operations so that secondary route table
adds succeed.  Working to understand the why of this too.
bug:8361314

Change-Id: Ie25061eb38c62eaa5e60aa8a488496de49bdbd9d

Robert Greenwalt   commited 2013-04-09 11:22:56 -07:00
921bf3867d
Turn back on global proxy support.
This reverts 138626.

Bug:8557674
Change-Id: I7b117d313c424d75bdeeea507541a96342f256f0

Robert Greenwalt   commited 2013-04-08 16:31:26 -07:00
da77cb16c8
Merge "Stop clat if it's no longer in use." into jb-mr2-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-03-29 01:17:45 +00:00
d40130abbe
Stop clat if it's no longer in use.
Normally, clatd is stopped when a connection disconnects.
However, if the connection's LinkProperties change, or if the
disconnect somehow gets lost (e.g., because of bug 8486114),
then we need to stop it (and possibly restart it).

Bug: 8276725
Change-Id: Ib8ad0d653ed8d0cd70b7414bcaa8fdaef8ba5fcc

Lorenzo Colitti   commited 2013-03-28 14:45:36 +09:00
7e5624bb80
Add BT - DataTracker connection
Allows the external BT stack the means to communicate with
ConnectivityService during reverse tethering.

bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c

Robert Greenwalt   commited 2013-03-27 15:45:12 -07:00
030e1d3e9b
Reset connections on all stacked interfaces.
Bug: 8276725
Change-Id: I7fe99c6ea123037cef3e89e3c2c17ed43cc0b1ea

Lorenzo Colitti   commited 2013-03-20 19:22:58 +09:00
a546d7ef93
Merge "Framework changes for 464xlat." into jb-mr2-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-03-18 16:41:58 +00:00
82217ba580
Merge "Set routes from stacked links as well." into jb-mr2-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-03-15 17:14:43 +00:00
8c9e75757f
Framework changes for 464xlat.
1. Add a Nat464Xlat service that ConnectivityService can use
   to start and stop clat. When clat is started, the service
   waits for the clat interface to come up and then calls
   ConnectivityService to add the appropriate routes.
2. Make ConnectivityService start clat when an IPv6-only mobile
   interface is connected. We only support clat on mobile for
   now.
3. Make tethering use the interface that has the IPv4 default
   route insted of using the base interface of the
   LinkProperties. This allows us to tether to a stacked
   interface, which is needed for tethering with 464xlat.

Bug: 8276725
Change-Id: I24480af69ee280f504399062638af0836a56268e

Lorenzo Colitti   commited 2013-03-15 14:41:55 +09:00
5355abd565
Set routes from stacked links as well.
Currently, ConnectivityService adds and removes routes to/from
the routing table only based on the LinkProperties's routes.
Make it update routes based on the stacked links as well.

Bug: 8276725
Change-Id: I9a2adf537af5a04de0aaab3780afbcc3bb5c6acb

Lorenzo Colitti   commited 2013-03-15 14:35:38 +09:00
f5a77d8373
Revert "Fail fast if somebody is adding default routes"
This reverts commit f2f0430d40

Mako wouldn't boot for me, reverting for now.

Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7

Wink Saville   authored and   Android (Google) Code Review   commited 2013-03-15 05:07:04 +00:00
4235ce5640
Fail fast if somebody is adding default routes
bug:2655011
Change-Id: I25da940e024825bc6e1d1ac5fe7b0d951609c1c1

Robert Greenwalt   commited 2013-03-14 13:16:04 -07:00
f2f0430d40
Remove redundant parameter to modifyRoute
modifyRoute takes both an interface name and a LinkProperties.
This is redundant because all callers get the interface name
from the LinkProperties. Make modifyRoute get the interface
name from the LinkProperties instead.

Change-Id: I41ba8e0a10241c2f1107204fcaca2be74556042b

Lorenzo Colitti   commited 2013-03-12 07:39:59 +09:00
f7020e29fe
Always specify an interface for host routes.
Change-Id: I05b4d87e7d7e8237c6f4a70f1fedae00f416f581

Lorenzo Colitti   commited 2013-03-08 16:41:25 -08:00
697e1c0748
Allow loopback traffic in lockdown mode.
Bug: 8245184
Change-Id: If993e3d6f5c7ce5970bfe701074c85b9245aa2aa

Jeff Sharkey   commited 2013-02-28 16:57:58 -08:00
b103b2578b
Remove two new permission checks
These checks while technically reasonable are a hard to swallow API change
that may break existing apps and pragmatically serves no purpose:  the protected
data is available in publicly readable java VM properties.

Change-Id: I522c493c2604a33e28d99e2be31054326c9a8323

Robert Greenwalt   commited 2013-02-22 15:36:33 -08:00
dc55f48d64
Improve ConnectivityManager docs
Also fix some permission problems.
bug:5738328

Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf

Robert Greenwalt   commited 2013-02-22 10:39:20 -08:00
26744a5f52
Migrate to using Mockito directly.
Change-Id: I1fcc5d1a780f5831bd6685f0735d4c0c6d245735

Jeff Sharkey   commited 2013-02-19 15:28:19 -08:00
c8a2687705
am dc7b3e3b: am 79a80652: Merge "KeyStore: stop using state()"
# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
  KeyStore: stop using state()

Kenny Root   authored and   Android Git Automerger   commited 2013-02-14 12:50:34 -08:00
9a51314973
KeyStore: stop using state()
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752

Kenny Root   commited 2013-02-14 12:06:51 -08:00
e3a37b21ca
Fix a permissions probem in ConnectivityManager
stopUsingNetworkFeature fails because of new permissions checks in netd.

Change-Id: I04cb10d955c9dd9977c460c6c1db0d1910a863ce

Robert Greenwalt   commited 2013-02-12 17:18:25 -08:00
1790009c36
Reintroduce the net.dns system properties <TEMP>
Removing these properties broke video playback as they used
a custom dns resolver.  We'll work together to resolve our
resolver issues in the future, but this was the easy fix to
get things working again.

bug:8173236
Change-Id: I687dae59eda4fc449efc34eed11c3dc88a110ad0

Robert Greenwalt   commited 2013-02-11 15:25:10 -08:00
d44340d0ec
Merge "Second pass tying into dns cache per interface"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-02-07 19:02:47 +00:00
75c17e5f38