Commit Graph

20843 Commits

Author SHA1 Message Date
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
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
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
John Spurlock
e35c9bf9ba Merge "Zen: Add events as a new config attribute." into lmp-dev 2014-09-22 21:09:39 +00:00
Michael Wright
98176ab5df am 41e487b6: am 508a8331: am 29c3c189: am 5dd936e7: Merge "Monitor MediaRouter for remote display connections." into lmp-dev
* commit '41e487b687fad22a2050bc1a2481858cccb2ddd6':
  Monitor MediaRouter for remote display connections.
2014-09-22 20:45:51 +00:00
John Spurlock
2dac62c2e9 Zen: Add events as a new config attribute.
Decouple events from alarms in the zen interception function,
and default the new allowEvents to true.

Bug:17580878
Change-Id: Iff10df385206ad73c3423ff118c79e94a10918d9
2014-09-22 16:44:37 -04:00
Dianne Hackborn
19c3b5d0d9 Merge "Work on issue #17581375: Nexus 5 getting low on RAM" into lmp-dev 2014-09-22 20:40:17 +00:00
Dianne Hackborn
c2f6f947b6 Fix issue #17609716: Frequent crash in system_server (RT restarts)
There was some code here locking on the lock object instead of
the main activity manager lock...!!!

Change-Id: Ic85151fbef915f6fb8fd5ce3c1a7e9b810412cb6
2014-09-22 13:36:42 -07:00
Michael Wright
3119b82c43 Merge "Monitor MediaRouter for remote display connections." into lmp-dev 2014-09-22 20:04:30 +00:00
Dianne Hackborn
d412563922 Work on issue #17581375: Nexus 5 getting low on RAM
Try to catch any cases where we remove a ProcessRecord from the LRU
list when it may still have a process associated with it, report
that this happened, and try to make sure the process is killed.

Change-Id: Icd74439caba5e1c283c01a49a46dae926a00ba71
2014-09-22 12:52:49 -07:00
Amith Yamasani
ae7034aaf0 Fix regression in launching CantAddAccountActivity for correct user
This activity should be launched for the user calling addAccount()

Bug: 17608124
Change-Id: I5d7e47bc625442494dc322ccafdc25f5f5c6aa7b
2014-09-22 12:46:50 -07:00
Yohei Yukawa
8712675cac am fb8bdc11: am 79a12ba6: am 8fe1ca2c: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev
* commit 'fb8bdc1183e304e62c089353cc8765aa7783f8ab':
  Work on issue #17506095: Plumb a new configuration to IMMS
2014-09-22 19:45:32 +00:00
Svetoslav
c616b3e2f1 Fix a bug in parsing app widget state XML.
When restoring app widget state from XML we read all providers,
hosts, and widgets and only after reading all hosts and providers
for all members of the group we hookup the widgets as they may
cross profile boundary. To esntablish the host-widget and provider-
widget relation we use a tag for the host and the provider that
are assigned before saving the state to XML. When restoring we
are using the tags to match widgets with hosts and providers. The
bug was that we were not clearing the tag of all hosts and providers
before reading from XML as we want the only tags that are defined
to be the ones we are reading. This resulted in wrong app widget
restore for a secondary user.

bug:17505027

Change-Id: I035d8f13142c6b9dbc9d658b82390f9cd8d75e0d
2014-09-22 12:31:04 -07:00
Yohei Yukawa
ca5e72c5ae Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 2014-09-22 18:02:12 +00:00
Lorenzo Colitti
5026279ce4 Add a throw route to the VPN endpoint.
Without this, legacy VPN types that don't send all traffic
through a tun or ppp interface, but instead have the kernel
apply IPsec transforms directly to the original packets, will
try to send traffic to the VPN endpoint through the VPN, which
will not work.

Bug: 17462989
Change-Id: I3ebf0cec726dd12b2c57ba5d66775f8c02b25b70
2014-09-22 13:10:15 +09:00
Lorenzo Colitti
4b0f8e6fb7 Support non-unicast route types: unreachable and throw.
Bug: 17462989
Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb
2014-09-22 13:10:15 +09:00
Yohei Yukawa
e63b5fae8d Work on issue #17506095: Plumb a new configuration to IMMS
This CL makes a plumbing from SystemConfig to IMMS.

Change-Id: Ia70b870723acf647e0c27f24aff91b40d6f85543
2014-09-21 10:34:35 +09:00
Nick Kralevich
4986a3875f resolved conflicts for merge of 4cbee7d2 to lmp-mr1-dev-plus-aosp
Change-Id: Ibed2d1ef98e13b7d50781020502665620ab15659
2014-09-20 11:15:50 -07:00
Jeff Brown
4df057c98b am 77e786ab: am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev
* commit '77e786abd5f2dcb74de3cc083c1cc64c884fac9d':
  Decouple turning screen on from waking up in policy.
2014-09-20 02:44:14 +00:00
Jeff Brown
6e58cb47fe am f11b919a: am 2da2e364: am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev
* commit 'f11b919a8e9ced3bd8eca4743a14e4bf18c451f3':
  Ensure that the screen on blocker is applied while dozing.
2014-09-20 02:44:00 +00:00
Dianne Hackborn
ae6865522e am 0eec7efe: am 423a1069: am cec64f46: am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev
* commit '0eec7efe935d3eeb9d5fe52eb5c7cf0ca2463b49':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
2014-09-20 01:53:58 +00:00
Christopher Ferris
4cbee7d24d am b7442bbc: Merge "Remove MALLOC_LEAK_CHECK references."
* commit 'b7442bbc8c27b0643b7235076ee151b8257bf28d':
  Remove MALLOC_LEAK_CHECK references.
2014-09-20 01:30:36 +00:00