SetupWizard: always prompt the user to setup a lockscreen

Change-Id: I1a7eaaa7646d04c167b99b7cf9cea3bf7c812d69
Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it>

src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java

@@ -78,9 +78,8 @@ public class CMSetupWizardData extends AbstractSetupData {
         pages.add(new OtherSettingsPage(mContext, this).setHidden(!hasGMS));
         if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) {
             pages.add(new FingerprintSetupPage(mContext, this));
-        } else if (SetupWizardUtils.frpEnabled(mContext)) {
-            pages.add(new ScreenLockSetupPage(mContext, this));
         }
+        pages.add(new ScreenLockSetupPage(mContext, this));
         pages.add(new CyanogenSettingsPage(mContext, this));
         pages.add(new FinishPage(mContext, this));
         return new PageList(pages.toArray(new SetupPage[pages.size()]));