Commit graph android_packages_modules_Co.../services/java/com/android/server/ConnectivityService.java
Message SHA1
Merge "ConnectivityService: Implement VPN callbacks to update DNS servers."
Chia-chi Yeh   authored and   Android (Google) Code Review   commited 2011-07-20 12:28:04 -07:00
dee9654b9d
Merge "Start default connections on startup."
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-07-20 10:10:24 -07:00
3a2a215c97
ConnectivityService: Implement VPN callbacks to update DNS servers.
Change-Id: I7b5063f0344a2a5c2754600386982e870adc1161

Chia-chi Yeh   commited 2011-07-19 17:15:41 -07:00
cc844502e2
am 4dd0424d: am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
* commit '4dd0424da1':
  Fix FeatureUser leak in ConnectivityService

Wink Saville   authored and   Android Git Automerger   commited 2011-07-19 12:42:01 -07:00
8f3e3bca45
am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
* commit 'f679d4cb92b6d1c193a154abb5ae8fb3a786fc43':
  Fix FeatureUser leak in ConnectivityService

Wink Saville   authored and   Android Git Automerger   commited 2011-07-19 12:39:42 -07:00
4dd0424da1
Fix FeatureUser leak in ConnectivityService
In case infinite restoral timer is used for a network feature,
FeatureUser could be keep added but never released if a user
is keep calling "startUsingNetworkFeature".

This patch will add duplication check when adding a FeatureUser
into the list in case infinite restoral timer is used.

Bug: 5043513
Change-Id: I47e7076e217f201454fae33ce596ecdc63cf7908

Kazuhiro Ondo   authored and   Wink Saville   commited 2011-07-19 12:02:01 -07:00
cae18f1a8e
Start default connections on startup.
On devices with mobile data we were kind of doing this in Telephony.
Devices without could use this.

bug:5030831
Change-Id: I9940561e88e43917bc8e638f5c3b15fced3821ae

Robert Greenwalt   commited 2011-07-15 11:16:45 -07:00
497ff5e731
am 2ff2707d: am 57c83bb4: Small fix to 5008973 fix.
* commit '2ff2707df4':
  Small fix to 5008973 fix.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-15 11:03:52 -07:00
804e1eaec6
resolved conflicts for merge of d57579a4 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81

Robert Greenwalt   commited 2011-07-15 10:52:54 -07:00
3079c1666e
am 57c83bb4: Small fix to 5008973 fix.
* commit '57c83bb4e6':
  Small fix to 5008973 fix.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-15 10:20:48 -07:00
2ff2707df4
resolved conflicts for merge of e8d2a4a8 to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783

Robert Greenwalt   commited 2011-07-15 09:55:48 -07:00
d57579a4a4
Small fix to 5008973 fix.
Removed redundent log.
Cleaned some logic.
Will try to modify route even if recursive operation had an error.

bug: 5008973
Change-Id: Ie2ca51cc39cfac027a8a2e2eaddcb7d6c378c4da

Robert Greenwalt   commited 2011-07-15 09:45:08 -07:00
57c83bb4e6
Apply the dns and route diff which we get a change
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc

Robert Greenwalt   commited 2011-07-14 18:12:14 -07:00
e8d2a4a8a0
VPN: close the socket in protectVpn() to avoid leaking descriptors.
Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354

Chia-chi Yeh   commited 2011-07-14 16:19:19 -07:00
9e4ff6ef91
Fix build.
Changes in ConnectivityService in hc-LTE when merged with changes
happening in Master caused the build to break.

Change-Id: I92a0b782ae58e9789b1e950c94ef966234fa94af

Wink Saville   commited 2011-07-14 12:23:28 -07:00
dc5d1badd0
am 6b5e201d: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '6b5e201d47':
  Remove STOPSHIP but allow seamless Handoff when possible.

Wink Saville   authored and   Android Git Automerger   commited 2011-07-14 10:55:58 -07:00
d622c319ae
am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.

Wink Saville   authored and   Android Git Automerger   commited 2011-07-13 14:19:12 -07:00
6b5e201d47
Remove STOPSHIP but allow seamless Handoff when possible.
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9

Wink Saville   commited 2011-07-13 13:44:13 -07:00
051a664b14
resolved conflicts for merge of a3b4b5ca to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12

Wink Saville   commited 2011-07-08 12:49:14 -07:00
620e1078ec
am c101c56e: Use resetConnections with resetMask.
* commit 'c101c56ecc':
  Use resetConnections with resetMask.

Wink Saville   authored and   Android Git Automerger   commited 2011-07-08 09:40:08 -07:00
a3b4b5ca19
Use resetConnections with resetMask.
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694

Wink Saville   commited 2011-07-07 16:17:06 -07:00
c101c56ecc
VPN: implement status report for legacy VPN.
Change-Id: I81c28dafd9588572df76cbc303b0d6a0f41f9bc6

Chia-chi Yeh   commited 2011-07-04 03:23:12 -07:00
bded3eb138
VPN: convert prepare() into a form which helps solve race conditions.
When someone tries to revoke packageA, it is possible that packageA is
already revoked by packageB. In this case packageB should not be revoked,
and the new prepare() can help solve this problem.

Change-Id: Iee056a191dd99467b8ad1b5379a17b02d404bad1

Chia-chi Yeh   commited 2011-07-03 17:03:27 -07:00
3e2e1da0a0
VPN: remove the old VpnService.
Now VPN is (kind of) integrated into ConnectivityService.

Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55

Chia-chi Yeh   commited 2011-07-02 20:21:09 -07:00
6c500a4c5a
VPN: export legacy VPN in IConnectivityManager.
Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1

Chia-chi Yeh   commited 2011-07-02 17:15:00 -07:00
7e026b38e9
VPN: Use List<String> instead for dnsServers and searchDomains.
Change-Id: I5d72c182ad47f59121a04b68ec6c2d164e2d00a8

Chia-chi Yeh   commited 2011-07-01 01:14:19 -07:00
d050d1c82c
am 3f2f58e9: am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
* commit '3f2f58e9d5':
  Temporary re-enabling iface name change handling on HO

Wink Saville   authored and   Android Git Automerger   commited 2011-06-27 14:14:45 -07:00
efaa396ae9
Merge "WifiWatchdogService - disable bad connections"
Irfan Sheriff   authored and   Android (Google) Code Review   commited 2011-06-25 11:20:54 -07:00
e7bfeb3d77
resolved conflicts for merge of 40717996 to master
Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada

Robert Greenwalt   commited 2011-06-24 16:10:06 -07:00
968330fae8
WifiWatchdogService - disable bad connections
Complete rewrite of WifiWatchdogService.java.  Checking for connectivity and managing wifi upon failure detection.

Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44

Isaac Levy   commited 2011-06-24 15:48:10 -07:00
5cdb9c934c
am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
* commit 'f49e4d3f182071081537dba3387db20cae27c427':
  Temporary re-enabling iface name change handling on HO

Wink Saville   authored and   Android Git Automerger   commited 2011-06-23 18:25:38 -07:00
3f2f58e9d5
Temporary re-enabling iface name change handling on HO
Temporary accept interface name change in ConnectivityService.
See bug/4455071.

Bug: 4903011
Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a

Kazuhiro Ondo   authored and   Wink Saville   commited 2011-06-23 14:58:50 -07:00
0768006559
am db32c8c5: Merge "Restrict access to protected networks." into honeycomb-LTE
* commit 'db32c8c540':
  Restrict access to protected networks.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-06-23 08:19:48 -07:00
7fb0b2856f
Restrict access to protected networks.
Some networks should only be brought up and controlled by system apps.

bug: 4585677
Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b

Robert Greenwalt   commited 2011-06-22 16:35:12 -07:00
6cac07422e
resolved conflicts for merge of 796539b1 to master
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f

Robert Greenwalt   commited 2011-06-22 13:20:14 -07:00
09d6cdf338
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713

Robert Greenwalt   commited 2011-06-20 12:15:24 -07:00
796539b12a
Fix tethering upstream determination.
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:4530116

Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71

Robert Greenwalt   commited 2011-06-20 11:09:23 -07:00
33cdcdf2fa
Notify policy listeners about metered ifaces.
Currently, kernel definition of metered networks is applied at the
interface level.  This change maintain list of those metered ifaces
and notifies policy listeners, like ConnectivityService.  (This gives
us a consistent picture of when a network would be blocked.)

Bug: 4601393
Change-Id: I277d5ca96ab967a1c1c3f1da8f9587557cd6d74c

Jeff Sharkey   commited 2011-06-17 16:49:21 -07:00
a47d7a1a70
Merge "DownloadManager flags for network policy."
Jeff Sharkey   authored and   Android (Google) Code Review   commited 2011-06-16 13:39:02 -07:00
29fc3322d5
DownloadManager flags for network policy.
Handful of DownloadManager flags to record when a download was paused
because of NetworkPolicyManager rules.

Change-Id: I99fc47f529cb6c8a42dbeca049e0cd0f1556eac4

Jeff Sharkey   commited 2011-06-16 13:04:34 -07:00
4434b0b55b
am 00ca322d: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '00ca322d5d':
  Reset connections AFTER we take down the network.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-06-16 12:50:46 -07:00
9d145fde31
am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
  Reset connections AFTER we take down the network.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-06-16 12:42:15 -07:00
00ca322d5d
Reset connections AFTER we take down the network.
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.

bug: 3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8

Robert Greenwalt   commited 2011-06-16 11:26:54 -07:00
36ea869426
VPN: migrate from generic Bundle to our own Parcelable VpnConfig.
Note that VpnConfig is for internal use only.
Also remove hidden methods from ConnectivityManager.

Change-Id: Ic298c4dc9a2c6c452bd8f4be6fa84e7ac489c0c4

Chia-chi Yeh   commited 2011-06-15 17:08:58 -07:00
75cacd5525
The service part of the user space VPN support.
The dialogs will be in another change.

Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc

Chia-chi Yeh   commited 2011-06-08 14:16:42 -07:00
9a4ad7d52c
Map network identity using ConnectivityService.
Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService.  Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates.  Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91

Jeff Sharkey   commited 2011-06-07 23:09:25 -07:00
21062e7c7e
Merge "Do not register the callbacks in the constructor."
Chia-chi Yeh   authored and   Android (Google) Code Review   commited 2011-06-07 18:18:56 -07:00
ab2c05370e
Policy and rules work for ConnectivityManager.
Teach ConnectivityManager about UID-specific rules derived from policy,
such as rejecting network traffic on "paid" interfaces.  Calls that
return NetworkInfo now filter based on any REJECT rules in effect for
the calling UID.  (Added uid parameter if callers that still want all
interfaces.)

Changed NetworkPolicyManager to derive rules based on current policy
combined with PowerManager and ActivityManager status, which it passes
to ConnectivityService for eventual enforcement through netd.  When
rules change the usability of a NetworkInfo for a specific UID, it also
dispatches CONNECTIVITY_ACTION broadcasts to that UID.  Combined paid
and background policy together to match current working definition.

Change-Id: I797ea49439fcc487cfe2cbc16703d4b91ceb9af6

Jeff Sharkey   commited 2011-06-01 17:00:42 -07:00
921ebf2ee5
Move stringToFile utility from ConnectivityService to FileUtils
Change-Id: I59a2dc649d59677f6b5e7ade252587c7c151ec06
Signed-off-by: Mike Lockwood <lockwood@android.com>

Mike Lockwood   commited 2011-05-28 13:28:12 -04:00
0d5916c21e
Do not register the callbacks in the constructor.
Change-Id: Ic7509c35cfb17b022a2af3cc14170942d6510e2d

Chia-chi Yeh   commited 2011-05-23 15:08:29 -07:00
f3204aad8e