OSDN Git Service

DO NOT MERGE Disable app pinning when emergency call button pressed
authorHall Liu <hallliu@google.com>
Thu, 2 Jun 2016 17:32:08 +0000 (10:32 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 24 Jun 2016 23:52:49 +0000 (16:52 -0700)
commit468651c86a8adb7aa56c708d2348e99022088af3
treed4221c2c7008d01adf3fa76d7860a0ea7764fb98
parenta75537b496e9df71c74c1d045ba5569631a16298
DO NOT MERGE Disable app pinning when emergency call button pressed

Also disables app pinning when the "return to call" button is pressed
and brings up the in-call screen when app pinning is stopped if there is
an existing call.

Combination of ag/1091397 and ag/1085584 adapted for MNC.

Bug: 28558307
Bug: 28761672
Change-Id: I82ec4042bff387c845ce571b197a4a86e1dd5ec8
packages/Keyguard/src/com/android/keyguard/EmergencyButton.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java