396a10c5b028c5e969ff1aee127a108b1ac95570 - platform/frameworks/base

commit	396a10c5b028c5e969ff1aee127a108b1ac95570	[log] [tgz]
author	Amith Yamasani <yamasani@google.com>	Fri Jan 19 10:58:07 2018 -0800
committer	Amith Yamasani <yamasani@google.com>	Wed Jan 31 12:05:46 2018 +0000
tree	f6696ea7a3fbd525137f58ccb3bf4d85b333c571
parent	397c38d01711b1fb21882b41f5ced0ba98edab6e [diff]

Delay coming out of doze until keyguard dismissed

v2 (earlier attempt was reverted due to deadlock)

Don't come out of doze when screen is on, but
wait until the keyguard is dismissed as well.
Pass along the keyguard dismissed to DeviceIdle

Request exitIdle when notifications are clicked.

Bug: 63527576
Test: Manual:
       Turn off screen
       adb shell dumpsys battery unplug
       adb shell dumpsys deviceidle step x4
       Turn on screen, verify still in doze
       Unlock, verify out of doze

Change-Id: Ic5129611d4f098723b31d62a27db8f50860697d4

services/core/java/com/android/server/DeviceIdleController.java[diff]
services/core/java/com/android/server/notification/NotificationManagerService.java[diff]
services/tests/uiservicestests/AndroidManifest.xml[diff]

3 files changed

tree: f6696ea7a3fbd525137f58ccb3bf4d85b333c571