OSDN Git Service

Merge changes from topic 'home-button-lock-nyc-mr1-dev' into nyc-mr1-dev
authorSelim Cinek <cinek@google.com>
Mon, 25 Jul 2016 18:49:48 +0000 (18:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 25 Jul 2016 18:49:49 +0000 (18:49 +0000)
commit52a11f7c64b6e3f94d4a2c35e3ee254a84b2a9f1
tree784fb59b868fb7e0b5f3603357d4435da89a6359
parent5c6f5afd1986a807c746d2206e2428290c8e1955
parent3127daf036337e047746f4b6bca56cc5ae18259c
Merge changes from topic 'home-button-lock-nyc-mr1-dev' into nyc-mr1-dev

* changes:
  Fixes a bug where the lockscreen would be frozen
  Allow home button to be tapped while a incoming call shows a HUN
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
services/core/java/com/android/server/policy/PhoneWindowManager.java