Commit Graph

14477 Commits

Author SHA1 Message Date
Dianne Hackborn
044ac6a1c8 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
dd62fef2a3 Remove extraneous logs.
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
2012-11-08 13:13:48 -08:00
The Android Open Source Project
f9fa705fd9 am 29df52f8: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '29df52f86c4f6683e4ed847bdbadf0a0bd240869':
2012-11-06 11:24:34 -08:00
The Android Open Source Project
29df52f86c Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I130963155d1be3ddd2b1868b2f2ff0aa55411a19
2012-11-06 11:20:11 -08:00
The Android Open Source Project
6a8553a668 Reconcile with jb-mr1-release - do not merge
Change-Id: Ib3edff1606fee3fd6dc4f66ed8588d8a5fab5e07
2012-10-31 09:15:29 -07:00
The Android Automerger
97351eb43d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 08:52:26 -07:00
Jake Hamby
391465682a am 566cad49: Fix race condition causing occasional CTS failures.
* commit '566cad494d504b60710640d931947cff6aade537':
  Fix race condition causing occasional CTS failures.
2012-10-29 14:31:29 -07:00
Jake Hamby
566cad494d Fix race condition causing occasional CTS failures.
WifiManagerTest was waiting for SUPPLICANT_STATE_CHANGED_ACTION
after enabling or disabling WiFi. Fix the code to check if the
WiFi state is already the desired state, and if not, to wait for
the WIFI_STATE_CHANGED_ACTION broadcast intent.

Bug: 7082455
Change-Id: Id1c2242c32311084f5587ea5403f6b227d1b8b04
2012-10-26 16:01:09 -07:00
The Android Automerger
c6fc53183e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-18 06:59:19 -07:00
Irfan Sheriff
e19be6022f am 54b4f235: Merge "Make packet count test more robust" into jb-mr1-dev
* commit '54b4f235779385a0286675b0a2b1491ff0ebd854':
  Make packet count test more robust
2012-10-17 16:51:22 -07:00
Irfan Sheriff
a0a19ea8aa Make packet count test more robust
Ensure the packet count test does not fail due to a single attempt.
Our goal is to just ensure the packet count API exists.

Bug: 7001746
Change-Id: I8c6604528946166969126cd5b085024f81790a77
2012-10-17 16:12:19 -07:00
Jeff Sharkey
b1ed51bc0e 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
5eccd9c147 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
621975ad96 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
9ee49b3917 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
3136c613e1 am b39f3f46: am 1c1c06fa: 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
1c1c06faeb 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
a0854aea07 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
42af268864 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
8727271fdd 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
b974e23410 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
2e617a7405 Captive check for both mobile and wifi
Bug: 7113195
Bug: 7102238
Bug: 7087564

Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
2012-09-20 12:13:06 -07:00
The Android Open Source Project
245483360b Reconcile with jb-mr1-release - do not merge
Change-Id: I8063d61628dd2822ab105f7f2f3d89fd0192b561
2012-09-20 10:34:59 -07:00
Jeff Sharkey
aab7d3b292 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
4126de53fc 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
The Android Automerger
f9a11c0923 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-18 06:59:26 -07:00
Jeff Sharkey
f56e2157be 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
Robert Greenwalt
f73614e0a0 am 2f5fb6dd: Merge "Fix NetworkInfo CTS test." into jb-mr1-dev
* commit '2f5fb6dde3c3209cbb124c6d989c3c4addc4e130':
  Fix NetworkInfo CTS test.
2012-09-17 09:53:17 -07:00
Robert Greenwalt
3de9654925 Fix NetworkInfo CTS test.
bug:7074876
Change-Id: I29cf9086fda62dda8078b42a1632f139ec65ee52
2012-09-16 17:11:52 -07:00
Jeff Sharkey
f58fbae956 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
e4e3c9dce2 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
5663b6e934 Restrict lockdown and firewall to AID_SYSTEM.
Bug: 7076289
Change-Id: Iafa3054335e8b1c3c8c3b8db2a4191d4ed4c8c41
2012-09-06 17:59:14 -07:00
Dianne Hackborn
cc4caf33a9 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
43fb9baa6c 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
b486a2054c am c25494a4: am 73e58381: 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
73e5838186 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
fab1f2400e 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
bc55bd1cf7 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
04327607d0 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
ba8388bf7a 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
03ca5c9f83 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
f2e722a507 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
31b50e628d 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
c2a8e40c7a 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
5c900a6685 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
02e14d9481 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
The Android Open Source Project
b8f80e58b2 Reconcile with jb-mr1-release - do not merge
Change-Id: I4ab99f1afaeb5abf8220704807cdd9d0fcd45f9d
2012-08-21 16:04:53 -07:00
The Android Automerger
da8aa37922 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-21 06:33:39 -07:00