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)
committerHall Liu <hallliu@google.com>
Thu, 2 Jun 2016 19:58:01 +0000 (12:58 -0700)
commit209414015ccdcabedbcb7b7f54860b07ed7733c1
treebd25bf0ffdf579c043b022fe49ab53a1985e7327
parent54a62d5febc8771f65221db3dd5c6e08f3288eb8
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