OSDN Git Service

Use isKeyguardLocked to determine whether to resume.
authorBryce Lee <brycelee@google.com>
Mon, 12 Mar 2018 16:04:44 +0000 (09:04 -0700)
committerBryce Lee <brycelee@google.com>
Tue, 13 Mar 2018 01:42:13 +0000 (18:42 -0700)
commitd939cf04e52b4f8e635989374e3bc47c3936aedc
tree6d854e5c58a9fe7a7cedc1a3fc3b9cc9a2637c38
parent2b9620cc71112b4dc0025744ccb6b4f01f7b554b
Use isKeyguardLocked to determine whether to resume.

Previously, we used isKeyguardActive to determine whether we should
resume an activity. This does not account for the keyguard going
away, which can leads to a timing issue where we do not resume an
activity when coming out of sleep from fingerprint unlock.

This change also prevents us from pausing a stopped activity that is
is considered to be the resumed activity as it will be brought to
the resumed state.

Fixes: 73991496
Test: Open display settings, lock screen, fingerprint unlock, press
      back, verify main settings page is shown immediately.

Change-Id: I3a7a33f5359a41fc958e3d8e799c39f5193ecb56
services/core/java/com/android/server/am/ActivityRecord.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java
services/core/java/com/android/server/am/KeyguardController.java
services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java