PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev

Browse Source 
am: 42cbbc3052

Change-Id: I736dcaa1c92c0557559719054f0177eb9cf1fc24
This commit is contained in:
Ricky Wai
2016-06-15 16:04:41 +00:00
committed by android-build-merger
parent 4904ba543e 42cbbc3052
commit 0f747c979d
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -655,8 +655,8 @@ public class ChooseLockGeneric extends SettingsActivity {
}
private void removeAllFingerprintForUserAndFinish(final int userId) {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
&& mFingerprintManager.hasEnrolledFingerprints(userId)) {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
if (mFingerprintManager.hasEnrolledFingerprints(userId)) {
mFingerprintManager.setActiveUser(userId);
// For the purposes of M and N, groupId is the same as userId.
final int groupId = userId;
@@ -679,6 +679,11 @@ public class ChooseLockGeneric extends SettingsActivity {
}
}
});
} else {
// No fingerprints in this user, we may also want to delete managed profile
// fingerprints
removeManagedProfileFingerprintsAndFinishIfNecessary(userId);
}
} else {
// The removal callback will call finish, once all fingerprints are removed.
// We need to wait for that to occur, otherwise, the UI will still show that