Merge "Allow setting password during provisioning if FRP is not supported" into rvc-dev am: c3b12c3b00 am: 085509cb17 am: 8f68066459 am: ce931b51ce

Change-Id: I8759fb3ced62acc35e1b451224fd65636cc3e151
2020-05-29 11:51:01 +00:00
parent 65c715317b ce931b51ce
commit a522f85b8b
3 changed files with 16 additions and 44 deletions
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -297,7 +297,8 @@ public class ChooseLockGeneric extends SettingsActivity {
                    getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

            // Can only run during setup if factory reset protection has already been cleared
-            return (pdbm != null && pdbm.getDataBlockSize() == 0);
+            // or if the device does not support FRP.
+            return (pdbm == null || pdbm.getDataBlockSize() == 0);
        }

        protected Class<? extends ChooseLockGeneric.InternalActivity> getInternalActivityClass() {