OSDN Git Service

Only disable trust agents after lockout am: 9d6fc9246b am: 73b2f5981e
authorAdrian Roos <roosa@google.com>
Thu, 11 Aug 2016 02:51:07 +0000 (02:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Aug 2016 02:51:07 +0000 (02:51 +0000)
commit367e0761c5af88b3b82ffd1c62bad374f40514e0
tree26fba074e261893c43bdfb5d02e44190ffaa7792
parentc62b7f0f8d089f9460581338e3cdf19795237194
parentbbf52f2e85c9d0fe43d667e4eeaab1c017dcf83e
Only disable trust agents after lockout am: 9d6fc9246b am: 73b2f5981e
am: bbf52f2e85

Change-Id: I4606854b24313cc8231aaa0ce3ea33ea909f68b0
core/java/com/android/internal/widget/LockPatternUtils.java
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
services/core/java/com/android/server/trust/TrustManagerService.java