Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev (00885a8c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/password/SaveAndFinishWorker.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -107,9 +107,14 @@ public class SaveAndFinishWorker extends Fragment {
		@VisibleForTesting
		Pair<Boolean, Intent> saveAndVerifyInBackground() {
		final int userId = mUserId;
		try {
		if (!mUtils.setLockCredential(mChosenCredential, mCurrentCredential, userId)) {
		return Pair.create(false, null);
		}
		} catch (RuntimeException e) {
		Log.e(TAG, "Failed to set lockscreen credential", e);
		return Pair.create(false, null);
		}

		unifyProfileCredentialIfRequested();