OSDN Git Service

Merge "Notify keyguard of when power button is pressed." into oc-dev am: dd273de09e
authorAndrew Zeng <zenga@google.com>
Fri, 2 Jun 2017 22:12:14 +0000 (22:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Jun 2017 22:12:14 +0000 (22:12 +0000)
commit6a682a58a83204f8d9d82b3042d1f46853a53313
treea7cbdd2f3e898d71afaa26f7fdfe1fd071391d1b
parentaeb22da1bd57b0ae280d9492fab75f56a95cbe85
parent3793a4ee3af921e4e8b8ed67ee39369ad3895fa5
Merge "Notify keyguard of when power button is pressed." into oc-dev am: dd273de09e
am: 3793a4ee3a

Change-Id: Ifea8a9b93f0d8c1945f3b6c7b15159b08019b9f1
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
services/core/java/com/android/server/policy/PhoneWindowManager.java