OSDN Git Service

Merge "Delay coming out of doze until keyguard dismissed"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sat, 27 Jan 2018 01:47:05 +0000 (01:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 27 Jan 2018 01:47:05 +0000 (01:47 +0000)
commite263cf9d465b78a44fb0f1f99750614ab1d41be0
tree7e53b65f1c1d5fd1c51ba617231465a284a59fe6
parent4a24b57f0e25286eb04c86461d80dcf2bda56950
parent77ee6507962576e8ddc41ee0209158a799e79519
Merge "Delay coming out of doze until keyguard dismissed"
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/notification/NotificationManagerService.java