From 40386dfddcf607332c949c1f5bc4466eaba58422 Mon Sep 17 00:00:00 2001 From: Robert Berry Date: Mon, 22 Jan 2018 21:16:58 +0000 Subject: Only run KeySyncTask after a successful screen unlock Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner Change-Id: I7248587f555ad921c54097f13b128df40f9b3855 --- .../java/com/android/server/locksettings/LockSettingsService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 07ea51be4ba0..21a093321eaa 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -1586,8 +1586,10 @@ public class LockSettingsService extends ILockSettings.Stub { userId, progressCallback); // The user employs synthetic password based credential. if (response != null) { - mRecoverableKeyStoreManager.lockScreenSecretAvailable(credentialType, credential, - userId); + if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) { + mRecoverableKeyStoreManager.lockScreenSecretAvailable(credentialType, credential, + userId); + } return response; } -- cgit v1.2.3-59-g8ed1b