Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,799 Commits 3 Branches 0 Tags
7fc93fa94474c19a511d0843295e1cd4c35d4b5a
Commit Graph

21569 Commits

Author SHA1 Message Date
Jorim Jaggi
267e1618ce am d270fa31: am 270265db: am dd7cabae: am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev 
* commit 'd270fa31e79ddc1b604f9ba039f6429ae43ab250':
  Only wait for relevant windows when turning on the screen
 2014-09-23 20:56:43 +00:00
Jorim Jaggi
722370275d am 270265db: am dd7cabae: am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev 
* commit '270265db8543f9e665c3bd16da56f73f5391f612':
  Only wait for relevant windows when turning on the screen
 2014-09-23 19:09:16 +00:00
Jeff Brown
7f0a933196 am 82b1767d: am 87c18cc6: am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit '82b1767d33a698e8be960b4bd84bbb8d26575dfb':
  Fix window manager policy state when waking from doze.
 2014-09-23 19:08:17 +00:00
Jorim Jaggi
5facc2f829 am f8704ea3: am 40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev 
* commit 'f8704ea3351907b7f6eb066e53f00b45406d529b':
  Only wait for relevant windows when turning on the screen
 2014-09-23 18:46:00 +00:00
Jorim Jaggi
2fb173a34b Merge "Only wait for relevant windows when turning on the screen" into lmp-dev 2014-09-23 18:26:09 +00:00
Jeff Brown
578628741b am 87c18cc6: am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit '87c18cc6d01fa553bc72e7d2b66f15f58863113a':
  Fix window manager policy state when waking from doze.
 2014-09-23 17:23:04 +00:00
Jeff Brown
45712f2e6d am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit 'c91bd121db79e5ea3c6ba6b333637f296992f11e':
  Fix window manager policy state when waking from doze.
 2014-09-23 17:00:06 +00:00
Jorim Jaggi
dc9ead4409 Only wait for relevant windows when turning on the screen 
Bug: 17536119
Change-Id: Ibe8da9fdd52a1a46eb856425b28ffc4f505b2697
 2014-09-23 18:55:46 +02:00
Jeff Brown
55fa020713 Merge "Fix window manager policy state when waking from doze." into lmp-dev 2014-09-23 16:42:52 +00:00
Jeff Brown
3ee549ca24 Fix window manager policy state when waking from doze. 
Once upon a time when the world was fresh and new, the heavens
had an easy rhythm.  Day and night.  Night and day.  In the day,
the pixel fairies would cavort and play in the bright gardens
with narry a mark of shadow or gloom.  In the night, they would
rest peacefully, dreaming no dreams and knowing no fear.

Then one night a fairy dreamed the first dream.  At first
the dream was peaceful, full of colors and delight, hopes and
memories.  Then all at once, jarringly, it awoke in bright
daylight.  The pixel fairy knew fear, for the world had changed
and it was unprepared.

Time passed and the pixel fairies grew accustomed to their
fate, day and night, night and day, sometimes dreaming, until
there came a night when a fairy did not sleep.  It roamed
the land in a dreamless doze, lost and afraid amid a grim haze
of grey and darkness.  The fairy despaired.  It wanted no
part of this place.  It pretended for a time to be awake but
the bright daylight would not come.  It pretended for a time to
be dreaming but the colors and memories would not come.
That is when the fairy wished for oblivion.  Then just as
suddenly, it awoke in the daylight.  It fell to the ground,
stunned as if it had forgotten how to walk in the too bright
daylight.

Though the world again grew softer and kinder in time, the pixel
fairies were never the same.  For the night is dark and full
of terrors.

---

It used to be easy.  Screen on and screen off could explain almost
everything about the state of the device but it's different now with
ambient display.  We need to be able to wait for all windows to be
drawn even in the case where the device is still nominally asleep.
In truth, the window manager policy which drives a lot of these
interactions is a thicket of outdated assumptions.

Added a new method to tell the window manager policy when the screen
is being turned off so that it can correctly account for changes
to the interactive state (wakeUp and goingToSleep) and screen state
(screenTurningOn and screenTurnedOff).  Now we can independently
poke keyguard during interactive state changes and we can apply
screen on blocking during screen state changes.

Moved the code which manages screen on blocking (which is what
ensures the UI has fully drawn before revealing screen contents)
from the power manager to the display manager since the display
manager is in a better position to accurately track the state of
the screen, particularly when the screen is being turned off.

Fixed a bunch of synchronization issues.  Previously some work
had been moved to a handler without considering what might
happen if it became reordered relative to other work happening
elsewhere.  Documented the desired behavior in the code to
prevent this from happening again.

There's still a bunch of stuff in here that isn't quite right,
particularly the assumption that there's only one screen, but
it's good enough for now.  Hopefully there aren't too many bugs.

Bug: 17605802
Change-Id: Ic7319e09948c8a3cda014d7e169c964a3ad86f14
 2014-09-23 09:38:05 -07:00
Paul Jensen
f1af7ff0da am 0858a297: am 4d8b2f76: am b3322d8a: am f1980965: am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit '0858a29704cd2384f4e65a78abb9062dce04ba3d':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 16:22:25 +00:00
Lorenzo Colitti
3cf006a0ce am 1b3c16a0: am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit '1b3c16a06a43e98de8341535003b4d8fba2ba08a':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 16:22:01 +00:00
Amith Yamasani
b880cf2331 am bdb522de: am a9d87e8d: am dc8079ac: am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit 'bdb522de6556209d31659e586e1d134ff8d67d11':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 16:21:56 +00:00
Dianne Hackborn
5754687448 am ac28c60d: am 5e956370: am 77b6a9bf: am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit 'ac28c60df74a459dbc8ae1251037bc5461e88b79':
  I am such an idiot.
 2014-09-23 16:21:51 +00:00
Yuncheol Heo
962d45035b am 1cd85452: am 5f024c13: am 8705586c: Merge "Fix the hotplug behaviors in TV." into lmp-mr1-dev 
* commit '1cd85452ca3e6cc0996f857f64c9c1dcbcc2898f':
  Fix the hotplug behaviors in TV.
 2014-09-23 16:21:46 +00:00
xinhe
2f7926be45 am c1a7454d: am cad7b8cd: am ec6b28c3: am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'c1a7454da647e65df04fdfee2e024383259f9b67':
  Fix for empty RSSI triangle after boot
 2014-09-23 16:21:32 +00:00
Adam Lesinski
8622dc4604 am bc8def2d: am 6b746c15: am 6c7ca6f5: am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 
* commit 'bc8def2d7897109be198d0facfff1f25b68f5c11':
  Revert behavior of Lockscreen Activity Launch to KK
 2014-09-23 16:21:08 +00:00
Dianne Hackborn
2351584634 am 42090723: am fbd5acbf: am 42540aed: am d2e6afcb: am bb9b4e06: Merge "Fix issue #17609716: Frequent crash in system_server (RT restarts)" into lmp-dev 
* commit '42090723ad34b6260edd8c8331a997d85b7d4b68':
  Fix issue #17609716: Frequent crash in system_server (RT restarts)
 2014-09-23 16:20:53 +00:00
Svetoslav
49d88bbd80 am bfc04881: am f813b27b: am 68c883a5: am 02b80bea: am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev 
* commit 'bfc04881491b3d3de9d0f8f890a0fb081e179c97':
  Fix a bug in parsing app widget state XML.
 2014-09-23 16:20:38 +00:00
John Spurlock
8f2cf915a7 am 3b828d21: am 91c77f04: am fbe1df94: am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev 
* commit '3b828d215f7acaf9d5f12826f58e9c7caa2055f0':
  Zen: Add events as a new config attribute.
 2014-09-23 16:19:53 +00:00
Dianne Hackborn
649283777a am a133ed41: am 03e06c07: am 2806bd99: am c65a5f33: am f01169a6: Merge "Work on issue #17581375: Nexus 5 getting low on RAM" into lmp-dev 
* commit 'a133ed41914c5e434c71e273f2cdfdd894467684':
  Work on issue #17581375: Nexus 5 getting low on RAM
 2014-09-23 16:19:40 +00:00
Michael Wright
560e020857 am c6c3e871: am 41e487b6: am 508a8331: am 29c3c189: am 5dd936e7: Merge "Monitor MediaRouter for remote display connections." into lmp-dev 
* commit 'c6c3e8715b4711b3a74cc27ddff6855eb460e96a':
  Monitor MediaRouter for remote display connections.
 2014-09-23 16:19:19 +00:00
Yohei Yukawa
b78013f247 am df82c72f: am fb8bdc11: am 79a12ba6: am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit 'df82c72ff1e4f97abed37f7d65dda146f23e0ff0':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-23 16:16:56 +00:00
Paul Jensen
32bcf376ad am 4d8b2f76: am b3322d8a: am f1980965: am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit '4d8b2f76b3a144de3656001a3d42cf08c6e39bc3':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 15:53:12 +00:00
Lorenzo Colitti
11ebb69d50 am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'd0d59156e69d9f33eea68e783b2835867bdaa67f':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 15:51:32 +00:00
Amith Yamasani
02f6a62d44 am a9d87e8d: am dc8079ac: am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit 'a9d87e8d1f869099a0b9cf75ecfc1e7dfe2982b1':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 15:51:26 +00:00
Dianne Hackborn
3e094bd9cf am 5e956370: am 77b6a9bf: am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit '5e956370a5aea436bd18c490f6c3ac8061d62e89':
  I am such an idiot.
 2014-09-23 15:51:19 +00:00
Yuncheol Heo
51f0290a42 am 5f024c13: am 8705586c: Merge "Fix the hotplug behaviors in TV." into lmp-mr1-dev 
* commit '5f024c135ea8ccd93f5201a9d47bb4407cb51475':
  Fix the hotplug behaviors in TV.
 2014-09-23 15:51:13 +00:00
xinhe
f7d75f26f4 am cad7b8cd: am ec6b28c3: am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'cad7b8cd31e936337a63f9309c2934607d7493d2':
  Fix for empty RSSI triangle after boot
 2014-09-23 15:50:37 +00:00
Adam Lesinski
467475bab8 am 6b746c15: am 6c7ca6f5: am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 
* commit '6b746c150c7ec6ca41346224a0bc4a4d4910a472':
  Revert behavior of Lockscreen Activity Launch to KK
 2014-09-23 15:49:54 +00:00
Dianne Hackborn
7367ed9aa9 am fbd5acbf: am 42540aed: am d2e6afcb: am bb9b4e06: Merge "Fix issue #17609716: Frequent crash in system_server (RT restarts)" into lmp-dev 
* commit 'fbd5acbff186b5f585b9506490c9039ceecc3326':
  Fix issue #17609716: Frequent crash in system_server (RT restarts)
 2014-09-23 15:49:18 +00:00
Svetoslav
95ba851d64 am f813b27b: am 68c883a5: am 02b80bea: am 3e3bbe7a: Merge "Fix a bug in parsing app widget state XML." into lmp-dev 
* commit 'f813b27b71e6f7be8f04b4b95f73e38760ef86d5':
  Fix a bug in parsing app widget state XML.
 2014-09-23 15:48:46 +00:00
Paul Jensen
337553071a am f1980965: am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit 'f19809653a6601459c5a9167396bb461a6d2ee52':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 12:18:46 +00:00
Paul Jensen
74971c75dc Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 2014-09-23 12:00:35 +00:00
Lorenzo Colitti
a8aeb61508 am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit '5570a0d024a83bba723b3847a95128c222607203':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 03:37:58 +00:00
Amith Yamasani
4872bdd74e am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit '92ab28b14b820888737fce7ff76b503e3f20f0b6':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 03:37:54 +00:00
Dianne Hackborn
babf33608a am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit '2b2e213c7c78cd773bd1cfd756e6f24390e4e28a':
  I am such an idiot.
 2014-09-23 02:48:39 +00:00
Lorenzo Colitti
1e2b63d91d Merge changes I3ebf0cec,I8635472c into lmp-dev 
* changes:
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 01:46:48 +00:00
Yuncheol Heo
f0f7f1b33d Merge "Fix the hotplug behaviors in TV." into lmp-mr1-dev 2014-09-23 01:44:11 +00:00
Amith Yamasani
fee7ad1619 Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 2014-09-23 01:09:11 +00:00
Dianne Hackborn
c7437dd7c0 Merge "I am such an idiot." into lmp-dev 2014-09-23 00:57:28 +00:00
Dianne Hackborn
4a1ef0b171 I am such an idiot. 
Seriously, don't look at this.  It is so dumb.

Brought up by issue #17307700: retarget a relinquished
task is not working

Change-Id: I947438d3502f75510e2974211bb78d31008eaa90
 2014-09-22 17:39:07 -07:00
xinhe
abbc202431 Merge "Fix for empty RSSI triangle after boot" into lmp-dev 2014-09-23 00:13:22 +00:00
Yuncheol Heo
b8d62e70bf Fix the hotplug behaviors in TV. 
- Don't run the local address allocation in the case of TV and the removed event.
- Let isTvDevice() return the value based on mLocalDevices, since tv() is
  unstable during the intialization period.

Bug: 17601460
Change-Id: Ic5701f1f86f51171960033bd97e169270a0021bf
 2014-09-23 08:28:23 +09:00
Adam Lesinski
2e51cc6842 Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 2014-09-22 23:17:47 +00:00
Adam Lesinski
246a8bcadd Revert behavior of Lockscreen Activity Launch to KK 
There exists a lifecycle regression where launching an
app from the lockscreen (camera, etc.) causes a series
of onResume, onPause, onRestart, onStart, onResume.

This CL reverts the behavior to what it was in KK, which
is to say that the Launcher is first resumed/paused, then
the Activity being launched has a simple onRestart,onStart, onResume
lifecycle.

Bug:17459745
Change-Id: I04091d2f86a929ee972c8d6debc1beb033c135a8
 2014-09-22 16:04:32 -07:00
Dianne Hackborn
5d47a09352 Merge "Fix issue #17609716: Frequent crash in system_server (RT restarts)" into lmp-dev 2014-09-22 22:46:54 +00:00
John Spurlock
04b64cd0a4 am 91c77f04: am fbe1df94: am f8580a4c: am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev 
* commit '91c77f044b07df9c84529296c9bd01b374e894f9':
  Zen: Add events as a new config attribute.
 2014-09-22 21:51:13 +00:00
Svetoslav
ab4fbefe66 Merge "Fix a bug in parsing app widget state XML." into lmp-dev 2014-09-22 21:39:49 +00:00
Dianne Hackborn
1753f99f11 am 03e06c07: am 2806bd99: am c65a5f33: am f01169a6: Merge "Work on issue #17581375: Nexus 5 getting low on RAM" into lmp-dev 
* commit '03e06c071f7744ea8d4154115e5739723b95a7ea':
  Work on issue #17581375: Nexus 5 getting low on RAM
 2014-09-22 21:26:14 +00:00