Jeff Sharkey
ade6351b4f
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
34f8631258
Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
2012-08-24 11:33:00 -07:00
Jeff Sharkey
82f8521d38
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
e292216870
am a9baddac: am 96702ad6: Merge "Framework interface for netd firewall." into jb-mr1-dev
...
* commit 'a9baddacf57755f4158c822842adf23c5a9be13b':
Framework interface for netd firewall.
2012-08-24 11:12:49 -07:00
Jeff Sharkey
96702ad6d7
Merge "Framework interface for netd firewall." into jb-mr1-dev
2012-08-24 11:07:42 -07:00
Jeff Sharkey
c268f0b19e
Framework interface for netd firewall.
...
Bug: 5756357
Change-Id: If8b9f738fcea2cf16bd01682220718b57346c7cc
2012-08-24 11:00:28 -07:00
Craig Mautner
ab127d2462
am f4516a85: am fc6baa83: Merge "Fix unprotected variable access by serializing." into jb-mr1-dev
...
* commit 'f4516a8581a6a4de91ab7ed7ed12343759f834e1':
Fix unprotected variable access by serializing.
2012-08-23 16:52:13 -07:00
Jeff Sharkey
dd0c05a8d1
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
Craig Mautner
fc6baa8349
Merge "Fix unprotected variable access by serializing." into jb-mr1-dev
2012-08-23 16:47:50 -07:00
Jeff Sharkey
d5fc86f067
Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev
2012-08-23 16:47:50 -07:00
Jeff Sharkey
899223b97c
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
rich cannings
4e7e743e3a
am bf3f2858: am 7646c773: Merge "Allow verifiers to extend timeout" into jb-mr1-dev
...
* commit 'bf3f28583f9e1b78a4765472375a23abdf8a4513':
Allow verifiers to extend timeout
2012-08-23 16:01:46 -07:00
rich cannings
7646c773fa
Merge "Allow verifiers to extend timeout" into jb-mr1-dev
2012-08-23 15:56:04 -07:00
rich cannings
d9ef3e5495
Allow verifiers to extend timeout
...
Create a new verifier API to extend the timeout for a giving package,
including the resulting action (allow or deny) upon the timeout occuring.
Bug: 6901038
Change-Id: I351f7944327f863aff1d7dd1227be74652fa1511
2012-08-23 15:39:02 -07:00
Craig Mautner
5642a48fbb
Fix unprotected variable access by serializing.
...
The variables mKeyguardDisabled and mAllowDisableKeyguard were
being modified unprotected by mKeyguardTokenWatcher. Fix is to
serialize accesses to these variables by only referencing them
from the same Handler that mKeyguardTokenWatcher uses. Eliminates
synchronization blocks and mKeyguardDisabled variable.
Fixes bug 7045624.
Change-Id: I6355aa393507408296316bee61e178dc81e2a172
2012-08-23 14:25:34 -07:00
John Spurlock
3701425785
am 7dac3f0c: am 156c9cc2: Merge "Disable screensavers if below first battery warning level." into jb-mr1-dev
...
* commit '7dac3f0c3e9ba117ef05c64529915b4cb7fbd055':
Disable screensavers if below first battery warning level.
2012-08-23 13:38:42 -07:00
John Spurlock
10fb224623
Disable screensavers if below first battery warning level.
...
Don't activate on sleep if below the threshold, and quit any currently
running dream when the threshold is reached.
Bug:6999949
Change-Id: I961b350d24ee6f95e502228aaa57312b0ffbadc1
2012-08-23 16:23:18 -04:00
John Spurlock
38aea3a6a6
am d8351a48: am 21b53df7: Merge "Add framework support for multiple dreams." into jb-mr1-dev
...
* commit 'd8351a48b0836a43e8522d373cc43603c9f92e11':
Add framework support for multiple dreams.
2012-08-23 10:49:32 -07:00
John Spurlock
21b53df7c3
Merge "Add framework support for multiple dreams." into jb-mr1-dev
2012-08-23 10:44:05 -07:00
Craig Mautner
33f47a72bb
am dbc93bf2: am 6715d1ef: Merge "Clean up displayId and layerStack usage." into jb-mr1-dev
...
* commit 'dbc93bf2406f9af5303660b932c78ebd4b0d4737':
Clean up displayId and layerStack usage.
2012-08-23 08:49:11 -07:00
Craig Mautner
6715d1effa
Merge "Clean up displayId and layerStack usage." into jb-mr1-dev
2012-08-23 08:44:53 -07:00
Craig Mautner
b47bbc3d80
Clean up displayId and layerStack usage.
...
Make better use of Display object by saving it in DisplayContent.
Only use layerStack when referring to Surfaces. Get displayId from
default Display or default DisplayContent. Remove warnings.
Fixes bug 7038151.
Change-Id: Ie493f0f5e755dc9b91ee969ff561c2a098283ead
2012-08-23 08:43:54 -07:00
Amith Yamasani
a784e3fbe9
am b0363bec: am 2c1dfa29: Merge "Fix deadlock in removing a user" into jb-mr1-dev
...
* commit 'b0363bec92313bb82645a5bdaeb624aa666902cb':
Fix deadlock in removing a user
2012-08-22 18:25:11 -07:00
Jeff Sharkey
d0f673d020
am af29c279: am 3451dc90: Merge "Iteration on multi-user external storage." into jb-mr1-dev
...
* commit 'af29c2797634675280c3e695d8b68674c8490507':
Iteration on multi-user external storage.
2012-08-22 18:23:02 -07:00
Amith Yamasani
2c1dfa29b4
Merge "Fix deadlock in removing a user" into jb-mr1-dev
2012-08-22 18:19:20 -07:00
Jeff Sharkey
3451dc9064
Merge "Iteration on multi-user external storage." into jb-mr1-dev
2012-08-22 18:17:30 -07:00
Amith Yamasani
0cd867c83e
Fix deadlock in removing a user
...
Cleanup PackageManager settings after the package directories are removed.
Change-Id: I264bc95ea21da653a234d7c81df5b25d4de7aa9e
2012-08-22 16:45:47 -07:00
Craig Mautner
823fe040bc
am c91e00c8: am b9b56954: Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
...
* commit 'c91e00c8b4a223a022289b675cee4b3316122786':
Eliminate special battery calls by WindowManager
2012-08-22 14:19:55 -07:00
Craig Mautner
b9b56954ec
Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
2012-08-22 14:14:54 -07:00
Jeff Sharkey
2bca868361
Iteration on multi-user external storage.
...
Remove single-user bind mounts, since they need to remain as raw
mounts to correctly propagate when remounted. This means we're back
to using sdcard_r GID to enforce READ_EXTERNAL_STORAGE.
Bug: 6925012
Change-Id: I41b5d7ddc985a5df2e288632a0a80d4724089e00
2012-08-22 13:59:58 -07:00
John Spurlock
1a868b7981
Add framework support for multiple dreams.
...
Bug:7028665
Change-Id: I4fba6b8e39dc07af4490c621ac3bc7b3867371b2
2012-08-22 16:49:20 -04:00
Jeff Brown
4e41592545
am de053978: am 6cf3b925: Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev
...
* commit 'de0539781533c46c10b00d2f068766fcdd284394':
Fix auto-brightness adjustment sentinel value.
2012-08-22 13:35:10 -07:00
Jeff Brown
6cf3b925ca
Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev
2012-08-22 13:31:08 -07:00
Jeff Brown
5d03a53681
Fix auto-brightness adjustment sentinel value.
...
Change-Id: I1b0da4566eb350333d3c3b09a96266627260baa3
2012-08-22 13:22:02 -07:00
Jeff Brown
ed14002482
am 408471a2: am 6da92032: Merge "Fix NPE." into jb-mr1-dev
...
* commit '408471a28b7adce10d8235cb38ed861cbfe51fb7':
Fix NPE.
2012-08-22 13:21:13 -07:00
Jeff Brown
6da92032da
Merge "Fix NPE." into jb-mr1-dev
2012-08-22 13:17:22 -07:00
Jeff Brown
b5b710a485
Fix NPE.
...
Bug: 7034583
Change-Id: Ie6b436492d12b0dd6bbe1c25d9b7ac35b74095d3
2012-08-22 13:16:01 -07:00
Craig Mautner
259328c04c
Eliminate special battery calls by WindowManager
...
Previous to this change the WindowManager was notifying the
BatteryDtatsService about windows that keep the screen on. WM used a
custom WakeLock tag to indicate to PowerManagerService that it had
already notified the BatteryStatsService.
This change eliminates WindowManager notifying the BatteryStatsService
and lets PowerManagerService do the job.
Fixes bug 7030326.
Change-Id: I666dc6ef8f094b8d3d109fea6876be058e057b4f
2012-08-22 11:01:35 -07:00
Amith Yamasani
19256a7bb6
am 5ee6095e: am 98dddda7: Merge "Remove permission requirement for some UserManager calls" into jb-mr1-dev
...
* commit '5ee6095e25e314317196fd72ca405847e849f6b3':
Remove permission requirement for some UserManager calls
2012-08-22 10:35:15 -07:00
Amith Yamasani
98dddda791
Merge "Remove permission requirement for some UserManager calls" into jb-mr1-dev
2012-08-22 10:31:30 -07:00
Amith Yamasani
1952637425
Remove permission requirement for some UserManager calls
...
Update javadocs to be explicit about permissions.
Minor fixes in UserManagerService
Change-Id: I0d355e0a60e5dbdb49ed06091111d480ff249f3d
2012-08-22 10:28:56 -07:00
Jean-Baptiste Queru
03a55e9508
am 50c323ba: am 2bd65b61: am 29c6f24b: am 6ffe2594: Merge "restorecon /data/anr directory."
...
* commit '50c323bad2bb238f2d437efd8f5aa70515be8e2e':
restorecon /data/anr directory.
2012-08-22 07:52:19 -07:00
Jean-Baptiste Queru
2bd65b61ba
am 29c6f24b: am 6ffe2594: Merge "restorecon /data/anr directory."
...
* commit '29c6f24b254b4ea1a7d8448980e736355e4badf6':
restorecon /data/anr directory.
2012-08-22 07:49:03 -07:00
Jean-Baptiste Queru
29c6f24b25
am 6ffe2594: Merge "restorecon /data/anr directory."
...
* commit '6ffe2594674f250c16c5e3055aa69680efaa6f69':
restorecon /data/anr directory.
2012-08-22 07:46:41 -07:00
Jean-Baptiste Queru
6ffe259467
Merge "restorecon /data/anr directory."
2012-08-22 07:18:39 -07:00
Jeff Brown
39aff480ee
am b8ce29e4: am 00a8f4ff: Make the electron beam animation shorter.
...
* commit 'b8ce29e4b353bd5c83cf7b45dc5d9d577e4c4169':
Make the electron beam animation shorter.
2012-08-22 00:16:45 -07:00
Jeff Brown
6ff726da8f
am 7453b1d0: am aa202a6d: Add a mechanism to adjust auto-brightness at night.
...
* commit '7453b1d0a02524e3ef38db8cdb4c4da084b139b4':
Add a mechanism to adjust auto-brightness at night.
2012-08-22 00:12:56 -07:00
Jeff Brown
3d326f551c
am 8f1584af: am 2416e096: Extract the twilight detection into its own service.
...
* commit '8f1584aff3b442263008f5b972721214691c64f1':
Extract the twilight detection into its own service.
2012-08-22 00:11:15 -07:00
Jeff Brown
00a8f4ff62
Make the electron beam animation shorter.
...
Now using about the same duration as it used to have when
it was implemented in Surface Flinger.
Change-Id: I09b28222379f4b6583f1f7b34188cc36c50509e9
2012-08-22 00:06:09 -07:00
Jeff Brown
aa202a6dc3
Add a mechanism to adjust auto-brightness at night.
...
Uses the twilight service to determine the hours of
sunrise and sunset. Shortly after sunset or before sunrise
gradually start to apply a gamma correction factor to the
auto-brightness calculations to make the screen a little
dimmer at night.
The effect is relatively small and is mostly noticeable
in dark rooms. This is just a first pass at the algorithm,
we can tweak the adjustment later to ensure that it has even less
impact in moderate or bright environments.
Change-Id: Idf89022a5d0bb52975e04779352d53fa63371178
2012-08-22 00:02:41 -07:00