Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e51ed6a authored by Rubin Xu's avatar Rubin Xu
Browse files

Allow setting password during provisioning if FRP is not supported 

On devices without PersistentDataBlock support, we should
always allow setting up password during provisioning.

Bug: 157451551
Test: make RunSettingsRoboTests
      ROBOTEST_FILTER=com.android.settings.password
Test: On cuttlefish, file ACTION_SET_NET_PASSWORD before SUW completes
Change-Id: Ic7b5d99b38e6427750ce70fa7e38f7ef6054d4ad
parent 86b50342

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

+2 −1
Original line number Diff line number Diff line
@@ -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() {

tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java

+14 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import static org.robolectric.Shadows.shadowOf; 


import android.app.Activity;

import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.provider.Settings.Global;
@@ -48,7 +49,6 @@ import com.android.settings.biometrics.BiometricEnrollBase; 
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;

import com.android.settings.search.SearchFeatureProvider;

import com.android.settings.testutils.shadow.ShadowLockPatternUtils;

import com.android.settings.testutils.shadow.ShadowPersistentDataBlockManager;

import com.android.settings.testutils.shadow.ShadowStorageManager;

import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settings.testutils.shadow.ShadowUtils;
@@ -62,6 +62,8 @@ import org.junit.runner.RunWith; 
import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowApplication;

import org.robolectric.shadows.ShadowPersistentDataBlockManager;



@RunWith(RobolectricTestRunner.class)

@Config(
@@ -99,6 +101,17 @@ public class ChooseLockGenericTest { 
        assertThat(mActivity.isFinishing()).isTrue();

    }



    @Test

    public void onCreate_deviceNotProvisioned_persistentDataServiceNotAvailable_shouldNotFinish() {

        Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 0);

        ShadowPersistentDataBlockManager.setDataBlockSize(1000);

        ShadowApplication.getInstance().setSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE,

                null);



        initActivity(null);

        assertThat(mActivity.isFinishing()).isFalse();

    }



    @Test

    public void onActivityResult_nullIntentData_shouldNotCrash() {

        initActivity(null);

tests/robotests/src/com/android/settings/testutils/shadow/ShadowPersistentDataBlockManager.java

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.testutils.shadow;



import android.service.persistentdata.PersistentDataBlockManager;



import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

import org.robolectric.annotation.Resetter;



@Implements(PersistentDataBlockManager.class)

public class ShadowPersistentDataBlockManager {

    private static int sDataBlockSize = 0;



    @Resetter

    public static void reset() {

        sDataBlockSize = 0;

    }



    @Implementation

    protected int getDataBlockSize() {

        return sDataBlockSize;

    }



    public static void setDataBlockSize(int dataBlockSize) {

        sDataBlockSize = dataBlockSize;

    }

}