Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev (5ec65517) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ChooseLockGeneric.java

+26 −21

Original line number	Diff line number	Diff line
		@@ -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