Dianne Hackborn
f584f11127
Merge "Fix issue #7353900 : Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
2012-10-22 10:29:10 -07:00
Amith Yamasani
0ad9356bdc
am 283d1409: am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
...
* commit '283d1409ddadd35cd41b5496659d3a24dc365fb0':
Fix crashes when quickly adding and removing users
2012-10-21 07:53:56 -07:00
Amith Yamasani
283d1409dd
am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
...
* commit 'f624d72cb0fe40fd5748d4f0d1a93bf267aa3ed8':
Fix crashes when quickly adding and removing users
2012-10-21 07:50:55 -07:00
Amith Yamasani
f624d72cb0
am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
...
* commit '8074e98b20ac04fdc032a1ed00dd6763b7e04147':
Fix crashes when quickly adding and removing users
2012-10-21 07:48:02 -07:00
Amith Yamasani
8074e98b20
Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
2012-10-21 07:44:46 -07:00
Jamie Gennis
7bbf8163fb
Set the secureness when creating displays
...
This change makes use of the new 'secure' argument to the
ISurfaceComposer::createDisplay method. In this change both the overlay and
wifi displays are hard-coded to be non-secure displays.
Bug: 7368436
Change-Id: Ib65312f2adab5104d8deefbfc32af9dc106a9129
2012-10-19 18:34:35 -07:00
Jeff Brown
32dafe25ac
Reduce screen on/off latency.
...
Reduce latency of screen on/off and improve how it is synchronized with
backlight changes. Screen state changes are no longer posted to vsync
which should save time. What's more, the state change occurs on a
separate thread so we no longer run the risk of blocking the Looper
for a long time while waiting for the screen to turn on or off.
Bug: 7382919
Bug: 7139924
Change-Id: I375950d1b07e22fcb94efb82892fd817e2f780dc
2012-10-19 18:04:27 -07:00
Kenny Root
a7fb9d907c
am 9396f183: resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp
...
* commit '9396f183c2db5d6167f39a8d5667fb4abcc96e5e':
Try to free cache before giving up on install
Robustly add symlink and add for non-primary users
2012-10-19 17:20:03 -07:00
Kenny Root
9396f183c2
resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp
...
Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8
2012-10-19 17:16:41 -07:00
Dianne Hackborn
7ad4438414
Fix issue #7353900 : Brief flash of home screen while dream starts on lock screen.
...
Not very clean, this has a special hack in the window manager to
redo layout when a dream window is shown. After MR1 we should clean
this up (and the various other special dream hacks).
Change-Id: Ic1a5a2b10a0a07b4a5dccdbf0736b614ec06dd4a
2012-10-19 16:40:13 -07:00
Kenny Root
a5d29b2c14
am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
...
* commit '9bef3294d3660a85442829a25c9777e25d3c3cc8':
Try to free cache before giving up on install
Robustly add symlink and add for non-primary users
2012-10-19 16:40:07 -07:00
Kenny Root
9bef3294d3
Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
...
* changes:
Try to free cache before giving up on install
Robustly add symlink and add for non-primary users
2012-10-19 16:37:55 -07:00
Amith Yamasani
db6a14cc85
Fix crashes when quickly adding and removing users
...
Make USER_REMOVED an ordered broadcast and send it before the user's
state is completely removed from the system. This gives services the
opportunity to clean up their state, while still having access to the
user's directory and UserInfo object (such as serial number).
Tell SyncManager to skip over dying/partially created users.
Improve UserManager tests, waiting for users to be removed fully.
Bug: 7382252
Change-Id: I93cfb39c9efe6f15087bf83c569a2d154ef27168
2012-10-19 16:23:30 -07:00
Svetoslav Ganov
5ce3b47fe1
am f46476cd: am 19f2b16c: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
...
* commit 'f46476cd154a4cf81c9d756a6dbc2330f04adf80':
Cannot pan in browser if magnification is enabled.
2012-10-19 14:55:55 -07:00
Svetoslav Ganov
f46476cd15
am 19f2b16c: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
...
* commit '19f2b16cb6b4f488b31861e1f572ec4f71ffd69e':
Cannot pan in browser if magnification is enabled.
2012-10-19 14:53:23 -07:00
Svetoslav Ganov
19f2b16cb6
am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
...
* commit '9823723d0f0bb47dfd3a6b251d7155dc1eb0918b':
Cannot pan in browser if magnification is enabled.
2012-10-19 14:50:02 -07:00
Svetoslav Ganov
9823723d0f
Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
2012-10-19 14:46:40 -07:00
John Spurlock
370e82eb20
am 01d2c64a: am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '01d2c64ab29c665a2799b1319dd6c35c5b921eec':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:07:12 -07:00
John Spurlock
01d2c64ab2
am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '7404f28b11e386a42b67ec8afcc9823f2bd03c2b':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:05:23 -07:00
John Spurlock
7404f28b11
am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '8c82025650fdbcb2a80be03f8be6dbff430b678c':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:02:40 -07:00
John Spurlock
8c82025650
Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
2012-10-19 11:00:00 -07:00
Craig Mautner
d8a9073a31
am 59a9cc18: am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '59a9cc18f30d2ba2aec952bcf3a65b1774986a40':
Allow getDisplayContentLocked to return null...
2012-10-19 09:34:35 -07:00
Craig Mautner
59a9cc18f3
am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '444354d2c62de37b65782f15c864af21086b4b04':
Allow getDisplayContentLocked to return null...
2012-10-19 09:32:19 -07:00
Craig Mautner
444354d2c6
am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '0ed07a0a30ef71053d0426956d3c198bb7540d4e':
Allow getDisplayContentLocked to return null...
2012-10-19 09:30:06 -07:00
Craig Mautner
0ed07a0a30
Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
2012-10-19 09:27:06 -07:00
Michael Jurka
6f57d5a6fb
am 20124e4d: am 9019335c: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
...
* commit '20124e4d5e3eae346be85d14017a90d38ebd1558':
Fixing wallpaper flash when going in/out of Recents
2012-10-19 09:14:50 -07:00
Michael Jurka
20124e4d5e
am 9019335c: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
...
* commit '9019335cd2daa896781f8d1ac67301f0f1b70ad9':
Fixing wallpaper flash when going in/out of Recents
2012-10-19 09:11:26 -07:00
Michael Jurka
9019335cd2
am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
...
* commit 'e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18':
Fixing wallpaper flash when going in/out of Recents
2012-10-19 09:09:06 -07:00
John Spurlock
ed108f3d12
Frameworks base: Promote dream setting defaults to config.
...
So that:
- the values can be shared (to fix assoc bug)
- the values can be customized in product overlays
Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
2012-10-19 11:32:03 -04:00
Michael Jurka
738cfc9105
Fixing wallpaper flash when going in/out of Recents
...
Bug: 7372516
Bug: 7216872
Change-Id: I2a2308a85caf9f2ad2d382c709e5f8867bd060be
2012-10-19 16:58:50 +02:00
Svetoslav Ganov
ff6c329f61
Cannot pan in browser if magnification is enabled.
...
1. We cache some events to see if the user wants to trigger magnification. If no
magnification is triggered we inject these events with adjusted time and down
time to prevent subsequent transformations being confused by stale events.
After the cached events, which always have a down, are injected we need to also
update the down time of all subsequent non cached events.
bug:7379388
Change-Id: I41d8b831cc1016a0ee8f9c5ef5f42eb60a6f64d9
2012-10-19 02:15:44 -07:00
Jeff Brown
6491065b05
am d2b36bc5: am fee1a210: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
...
* commit 'd2b36bc54010360c47673493a0f7c0013f96b690':
Reduce auto-brightness jitter.
2012-10-18 23:31:23 -07:00
Jeff Sharkey
b36d3e7614
am f1ad6d5b: am 93b17876: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
...
* commit 'f1ad6d5b79edc4d171700233edcb9b5cdf3937e1':
More migration to Global settings.
2012-10-18 23:31:20 -07:00
Jeff Brown
65d99a1036
am 0fab9247: am fba021ea: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
...
* commit '0fab9247c9edc6da297aad2e42d042979bf2f534':
Fix deadlock.
2012-10-18 23:31:12 -07:00
Jeff Brown
d2b36bc540
am fee1a210: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
...
* commit 'fee1a2109e846e4bb628a56ddc5b907df356e452':
Reduce auto-brightness jitter.
2012-10-18 23:28:29 -07:00
Jeff Sharkey
f1ad6d5b79
am 93b17876: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
...
* commit '93b17876d44f27141335295ee9ffd88bb9f23817':
More migration to Global settings.
2012-10-18 23:28:26 -07:00
Jeff Brown
0fab9247c9
am fba021ea: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
...
* commit 'fba021eaacfb2b44fc36f9fb74bac08b32a841e5':
Fix deadlock.
2012-10-18 23:28:22 -07:00
Jeff Brown
fee1a2109e
am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
...
* commit '1d2b445d7431420b7cfbd9ef3fe4e326e121eeae':
Reduce auto-brightness jitter.
2012-10-18 23:26:23 -07:00
Jeff Sharkey
93b17876d4
am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
...
* commit '5831159b8d4cf85fa46e2c4cb8e7d9f750014d6f':
More migration to Global settings.
2012-10-18 23:26:15 -07:00
Jeff Brown
fba021eaac
am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
...
* commit 'ce78b026179bc041bce9c9e2d8b63b79a97cbf67':
Fix deadlock.
2012-10-18 23:26:11 -07:00
Jeff Brown
1d2b445d74
Merge "Reduce auto-brightness jitter." into jb-mr1-dev
2012-10-18 23:23:57 -07:00
Jeff Sharkey
5831159b8d
Merge "More migration to Global settings." into jb-mr1-dev
2012-10-18 23:23:16 -07:00
Jeff Brown
ce78b02617
Merge "Fix deadlock." into jb-mr1-dev
2012-10-18 23:22:02 -07:00
Jeff Brown
4f0e969eab
Reduce auto-brightness jitter.
...
Apply additional hysteresis controls to prevent repeated brightness
changes within a short interval.
Bug: 7266090
Change-Id: I73122457f6f3200c80188d3716ce2baf38f6a0a6
2012-10-18 18:45:55 -07:00
Jeff Brown
6669250034
Fix deadlock.
...
The display manager must never call into the activity manager with
its lock held. Make it clear that the adapters are constructed
while holding the syncroot lock.
Bug: 7377631
Change-Id: I1557313cbb31dcad9b5a46919a88a5a1c1af3e9b
2012-10-18 17:37:39 -07:00
Kenny Root
cea3743499
Try to free cache before giving up on install
...
Try to get installd to free up cache before giving up when there is too
little space free.
Bug: 7232123
Change-Id: Ie3c8ca8dfc190abbb9a29a7baee31f32e9de7d69
2012-10-18 17:21:59 -07:00
Jeff Sharkey
8d9a1f66d9
More migration to Global settings.
...
Bug: 7375796
Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
2012-10-18 15:38:14 -07:00
Kenny Root
a3e90798b7
Robustly add symlink and add for non-primary users
...
Amazingly, some apps still don't use the nativeLibraryPath. So add a lib
symlink for non-primary users to fix that.
Also, there was an error when the symlink existed that it would give up.
This shouldn't really happen, but in that case, just remove it and
create a new one to be safe.
Also, move the downgrade code to the appropriate place. This downgrade
case triggered the above symlink existing bug.
Bug: 7318366
Bug: 7371571
Change-Id: Ia175b36d98f00bdc2f2433b909aafd524eb34d15
2012-10-18 15:12:09 -07:00
Svetoslav Ganov
3cfa3e8ee8
am 83c57b5c: am d7169b59: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
...
* commit '83c57b5c52cf3de2222219a7c47cfc4b3a650333':
Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
2012-10-18 15:08:00 -07:00
Svetoslav Ganov
83c57b5c52
am d7169b59: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
...
* commit 'd7169b5936721e8e985e6bf7f7e47095b8d6dcfa':
Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
2012-10-18 15:05:26 -07:00