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

Change-Id: I224b2f07f13ae988f2d4227bf14b5efb711dbc0e
2020-05-29 11:26:01 +00:00
parent ee4cdc174c 085509cb17
commit 8f68066459
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() {