Commit Graph

810 Commits

Author SHA1 Message Date
Robert Greenwalt
cd2778578b Support for dns domain.
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
2012-11-16 11:25:32 -08:00
Jeff Sharkey
90c9ee4c74 am 298d5f42: am b84f21c5: am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev
* commit '298d5f422e6af0d12499173c403d4ff8dda3aeda':
  Increase readability of connectivity event log.
2012-11-12 10:36:46 -08:00
Jeff Sharkey
876ddc9564 Increase readability of connectivity event log.
Bug: 6322766
Change-Id: I556759f5fc1466cdd4db6b4574084a8068dc9909
2012-11-09 15:57:02 -08:00
Robert Greenwalt
75261775dd Merge "Remove DhcpInfoInternal" 2012-11-09 09:51:21 -08:00
Robert Greenwalt
462e5705c8 Remove DhcpInfoInternal
First step in accepting a set of patches.
bug:6799630

Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
2012-11-09 09:46:32 -08:00
Dianne Hackborn
adfa5eb59f am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
* commit 'e0d454d2e86f4170bdab68d45696fb2eb9a87f9f':
  Remove extraneous logs.
2012-11-08 15:58:52 -08:00
Dianne Hackborn
dc456a66da Remove extraneous logs.
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
2012-11-08 13:13:48 -08:00
Jeff Sharkey
594ea872c8 am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev
* commit '65f4de101fa8d5752603c6e79536c3a17f585490':
  Migrate more Secure settings to Global.
2012-09-28 00:36:41 -07:00
Jeff Sharkey
8c87045d09 Migrate more Secure settings to Global.
Migrate networking, storage, battery, DropBox, and PackageManager
related Secure settings to Global table.

Bug: 7232014, 7231331, 7231198
Change-Id: I772c2a9586a2f708c9db95622477f235064b8f4d
2012-09-27 16:22:53 -07:00
Jeff Sharkey
e7e592df15 am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev
* commit 'f57fcddb61236c6e9c145d8f310bf1f4b1daafbb':
  First step towards cleaning up Global settings.
2012-09-26 20:23:07 -07:00
Jeff Sharkey
8b36157b58 First step towards cleaning up Global settings.
Remove all @Deprecated @hide settings, and clean up any stragglers.

Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
2012-09-26 17:18:49 -07:00
Ashish Sharma
5389aec62e am b39f3f46: am f605dcb8: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
* commit 'b39f3f4696bf473d986ecc45461754beec931174':
  Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
2012-09-26 13:53:01 -07:00
Ashish Sharma
f605dcb8ad Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev 2012-09-26 13:49:29 -07:00
Ashish Sharma
6c97dcf3c7 Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
Bug: 7189605
Change-Id: Id54b8d490d7849bf071c3fbfd8f7358ed873a4e8
2012-09-26 13:45:18 -07:00
Jeff Brown
0482f99ae4 am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev
* commit '876f95ed7f914b4d86634db552277f835d288805':
  Update references to migrated global settings.
  Handle user switched for settings changes.
2012-09-25 17:11:25 -07:00
Jeff Brown
c67cf56735 Update references to migrated global settings.
Fixed one setting that was migrated but not marked deprecated.

Removed a hidden setting that is no longer used by the new
power manager service.

Bug: 7231172
Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7
2012-09-25 15:27:51 -07:00
Irfan Sheriff
675a99bdb0 am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev
* commit '6c0fcc961e1650113947918dc105c2a459ebf40d':
  Captive check for both mobile and wifi
2012-09-20 13:39:30 -07:00
Irfan Sheriff
32bed2cc47 Captive check for both mobile and wifi
Bug: 7113195
Bug: 7102238
Bug: 7087564

Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
2012-09-20 12:13:06 -07:00
Jeff Sharkey
9064fe5e00 am 116e0ed0: am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev
* commit '116e0ed0ed1fee530f32932be7145d64316dce9b':
  Migrate network stats from removed users.
2012-09-20 06:17:38 -07:00
Jeff Sharkey
d53c789d44 Migrate network stats from removed users.
When a user is removed, migrate all network stats belonging to that
user into special UID_REMOVED bucket.  Also removes those stats from
kernel to avoid double-counting if another user is created.

Bug: 7194784
Change-Id: I03f1d660fe3754566326b7749cae8068fc224ea9
2012-09-19 14:54:05 -07:00
Jeff Sharkey
2ae72b424f am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
* commit '1e364acac6f4768672deb73485e93c32929e25fd':
  Actually move to Global settings.
2012-09-17 11:10:16 -07:00
Jeff Sharkey
cf6ffaff69 Actually move to Global settings.
Also add better ConnectivityService logging.

Bug: 7157464
Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
2012-09-14 13:47:51 -07:00
Jeff Sharkey
61db689ddb am 52781414: am fa8d83d9: Merge "Restrict lockdown and firewall to AID_SYSTEM." into jb-mr1-dev
* commit '527814142037fe08934b4e9ef3961742ffbd5a20':
  Restrict lockdown and firewall to AID_SYSTEM.
2012-09-06 18:07:27 -07:00
Jeff Sharkey
69fc5f8bd1 Restrict lockdown and firewall to AID_SYSTEM.
Bug: 7076289
Change-Id: Iafa3054335e8b1c3c8c3b8db2a4191d4ed4c8c41
2012-09-06 17:59:14 -07:00
Dianne Hackborn
2cd86d8e53 am 623cc6b7: am bac6c129: Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev
* commit '623cc6b79d4b4dbfea686529e4d6c2e10fe131eb':
  Fix another issue #7097984 java.lang.SecurityException: Permission Denial:
2012-09-04 18:54:50 -07:00
Dianne Hackborn
e588ca1c19 Fix another issue #7097984 java.lang.SecurityException: Permission Denial:
broadcast asks to run as user -1 but is calling from user 0; this requires

Dupped bug of a different problem.

Change-Id: I15f4ab08b81f5f5746ba1cd183dee4f0b1281df5
2012-09-04 18:48:37 -07:00
Wink Saville
8f86658764 am c25494a4: am 756bc781: am 0e90f738: am cd2a20f2: am 5a2772e2: Merge "Fix code problem in writePidDns"
* commit 'c25494a4a125c4cade58c85eacce9c58a7b250c8':
  Fix code problem in writePidDns
2012-08-30 18:20:28 -07:00
Wink Saville
756bc781dd am 0e90f738: am cd2a20f2: am 5a2772e2: Merge "Fix code problem in writePidDns"
* commit '0e90f738aa82d9b30e6b4f43cd321e3f9cad2fc1':
  Fix code problem in writePidDns
2012-08-30 18:16:30 -07:00
Wink Saville
cd2a20f248 am 5a2772e2: Merge "Fix code problem in writePidDns"
* commit '5a2772e23b1dd2fb3840c10d4575bb06bb6f0026':
  Fix code problem in writePidDns
2012-08-30 18:11:30 -07:00
Wink Saville
5a2772e23b Merge "Fix code problem in writePidDns" 2012-08-30 17:36:06 -07:00
Dianne Hackborn
db245a4594 am f59dfc81: am 73365695: Merge "Improve multi-user broadcasts." into jb-mr1-dev
* commit 'f59dfc81f4d1e91aa436ed70d7f8372bce3d91e0':
  Improve multi-user broadcasts.
2012-08-30 15:01:28 -07:00
Dianne Hackborn
2298689dc1 Improve multi-user broadcasts.
You can now use ALL and CURRENT when sending broadcasts, to specify
where the broadcast goes.

Sticky broadcasts are now correctly separated per user, and registered
receivers are filtered based on the requested target user.

New Context APIs for more kinds of sending broadcasts as users.

Updating a bunch of system code that sends broadcasts to explicitly
specify which user the broadcast goes to.

Made a single version of the code for interpreting the requested
target user ID that all entries to activity manager (start activity,
send broadcast, start service) use.

Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
2012-08-30 14:33:22 -07:00
Irfan Sheriff
4720a8a5ab Merge commit '949dcad8' into manualmerge
Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: I02fee6839c2a8879fb6e885d8fc8483f17d655c2
2012-08-27 23:03:50 -07:00
Irfan Sheriff
0ad0d13d5a Captive portal handling
We now notify the user of a captive portal before switching to the network as default.
This allows background applications to continue to work until the user confirms he
wants to sign in to the captive portal.

Also, moved out captive portal handling out of wifi as a seperate component.

Change-Id: I7c7507481967e33a1afad0b4961688bd192f0d31
2012-08-27 22:27:06 -07:00
Jeff Sharkey
7084a2aa66 am f261d88f: am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev
* commit 'f261d88f818df20dfd033746bd3072bd42b705c9':
  Always-on VPN.
2012-08-27 15:17:41 -07:00
Jeff Sharkey
ebcc7978c1 Always-on VPN.
Adds support for always-on VPN profiles, also called "lockdown." When
enabled, LockdownVpnTracker manages the netd firewall to prevent
unencrypted traffic from leaving the device. It creates narrow rules
to only allow traffic to the selected VPN server. When an egress
network becomes available, LockdownVpnTracker will try bringing up
the VPN connection, and will reconnect if disconnected.

ConnectivityService augments any NetworkInfo based on the lockdown
VPN status to help apps wait until the VPN is connected.

This feature requires that VPN profiles use an IP address for both
VPN server and DNS. It also blocks non-default APN access when
enabled. Waits for USER_PRESENT after boot to check KeyStore status.

Bug: 5756357
Change-Id: If615f206b1634000d78a8350a17e88bfcac8e0d0
2012-08-27 12:35:05 -07:00
Jeff Sharkey
d56a2242b8 am 33f94286: am 34f86312: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
* commit '33f942865c27a0af155ec2be2f1154fe7ece6072':
  Migrate legacy VPN arguments to system_server.
2012-08-24 11:37:58 -07:00
Jeff Sharkey
64d8b3be3a Migrate legacy VPN arguments to system_server.
Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.

Bug: 5756357
Change-Id: I42c1a644f6add477fe4222342640d7db15982cb8
2012-08-24 11:29:58 -07:00
Jeff Sharkey
4eded53f2a am 45a630e8: am d5fc86f0: Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev
* commit '45a630e87ecfa89682d1b8230dd5c6473284e4c1':
  Begin moving VPN to NetworkStateTracker pattern.
2012-08-23 16:52:05 -07:00
Jeff Sharkey
366e0b75b7 Begin moving VPN to NetworkStateTracker pattern.
Created base tracker that handles common bookkeeping, and move VPN
to become a tracker.  VPN status is now reflected in NetworkInfo, and
is mapped to LegacyVpnInfo.

Legacy VPN now "babysits" any init services it starts, watching for
when they stop unexpectedly.

Bug: 5756357
Change-Id: Iba7ec79da69469f6bd9a970cc39cf6b885b4c9c4
2012-08-23 16:41:06 -07:00
Robert Greenwalt
225812f88d am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev
* commit 'bb1d98473c737bff05e3ae11d8ec53195e04725a':
  Update TCP buffer size when switching network type
2012-08-20 12:57:28 -07:00
Robert Greenwalt
adb8bf98d9 Update TCP buffer size when switching network type
Import of non-merging change 41612 from AOSP

When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Ic44a557677ffe629e83ce1f522a9f058bee6e7b2
2012-08-20 12:28:51 -07:00
Robert Greenwalt
d17b08ed70 am 634f34af: am 70ccd5bf: am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '634f34af410ee181ef104260b2f31a87562eb4e0':
  Fix for updating TCP buffer size when switching network type
2012-08-17 13:49:52 -07:00
Robert Greenwalt
70ccd5bf80 am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '89ab67578e4e06c41f0e96d840de952d10895233':
  Fix for updating TCP buffer size when switching network type
2012-08-17 13:44:54 -07:00
Robert Greenwalt
89ab67578e am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '6626398a72ae592e3a9184c9b0868df0fc1f1724':
  Fix for updating TCP buffer size when switching network type
2012-08-17 13:28:25 -07:00
Magnus Strandberg
daa042513c Fix for updating TCP buffer size when switching network type
When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Iaa527c84f56cae108f4c7276bbed10552faaff6c
2012-08-17 11:38:44 +02:00
Ashish Sharma
e4ff15e728 am 35d875ad: am 77b25796: Merge "Setup idletimer for network interface." into jb-mr1-dev
* commit '35d875ade38abd8dba6b7756ca612167ce8bcad0':
  Setup idletimer for network interface.
2012-08-10 16:09:34 -07:00
Haoyu Bai
e246244e82 Setup idletimer for network interface.
Cherry-picked from commit 8ce570b0f3 in
master. DO NOT MERGE

Change-Id: I6101c7ae041b4cc1237ce7a9983753dbdfa301d3
2012-08-10 15:58:34 -07:00
Jeff Sharkey
696aeb4e78 resolved conflicts for merge of ab4e251a to master
Change-Id: I59ad9fe6e777c6677331f83d5e1de28b66f28af7
2012-08-08 16:39:00 -07:00
Jeff Sharkey
9844730f62 Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev 2012-08-08 16:25:41 -07:00