Merge "ChooseLockPattern: remove redundant setting of visible pattern default" (d2b1d43a) · Commits · e / os / android_packages_apps_Settings

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -873,7 +873,6 @@ public class ChooseLockPattern extends SettingsActivity {

		private LockscreenCredential mChosenPattern;
		private LockscreenCredential mCurrentCredential;
		private boolean mLockVirgin;

		public void start(LockPatternUtils utils, boolean requestGatekeeperPassword,
		LockscreenCredential chosenPattern, LockscreenCredential currentCredential,
		@@ -885,8 +884,6 @@ public class ChooseLockPattern extends SettingsActivity {
		mChosenPattern = chosenPattern;
		mUserId = userId;

		mLockVirgin = !mUtils.isPatternEverChosen(mUserId);

		start();
		}

		@@ -917,14 +914,5 @@ public class ChooseLockPattern extends SettingsActivity {
		}
		return Pair.create(success, result);
		}

		@Override
		protected void finish(Intent resultData) {
		if (mLockVirgin) {
		mUtils.setVisiblePatternEnabled(true, mUserId);
		}

		super.finish(resultData);
		}
		}
		}