Merge "ChooseLockPattern: remove redundant setting of visible pattern default" into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
c680da15c3
@@ -872,7 +872,6 @@ public class ChooseLockPattern extends SettingsActivity {
|
|||||||
|
|
||||||
private LockscreenCredential mChosenPattern;
|
private LockscreenCredential mChosenPattern;
|
||||||
private LockscreenCredential mCurrentCredential;
|
private LockscreenCredential mCurrentCredential;
|
||||||
private boolean mLockVirgin;
|
|
||||||
|
|
||||||
public void start(LockPatternUtils utils, boolean requestGatekeeperPassword,
|
public void start(LockPatternUtils utils, boolean requestGatekeeperPassword,
|
||||||
LockscreenCredential chosenPattern, LockscreenCredential currentCredential,
|
LockscreenCredential chosenPattern, LockscreenCredential currentCredential,
|
||||||
@@ -884,8 +883,6 @@ public class ChooseLockPattern extends SettingsActivity {
|
|||||||
mChosenPattern = chosenPattern;
|
mChosenPattern = chosenPattern;
|
||||||
mUserId = userId;
|
mUserId = userId;
|
||||||
|
|
||||||
mLockVirgin = !mUtils.isPatternEverChosen(mUserId);
|
|
||||||
|
|
||||||
start();
|
start();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -916,14 +913,5 @@ public class ChooseLockPattern extends SettingsActivity {
|
|||||||
}
|
}
|
||||||
return Pair.create(success, result);
|
return Pair.create(success, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void finish(Intent resultData) {
|
|
||||||
if (mLockVirgin) {
|
|
||||||
mUtils.setVisiblePatternEnabled(true, mUserId);
|
|
||||||
}
|
|
||||||
|
|
||||||
super.finish(resultData);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user