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

Commit 1a6bfba5 authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "Ensure PropertyInvalidatedCache test mode in all locksettings tests" into main

parents 8a2cfda9 bb996d4a

services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.app.NotificationManager; 
import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManagerInternal;

import android.app.admin.DeviceStateCache;

import android.app.test.PropertyInvalidatedCacheTestRule;

import android.app.trust.TrustManager;

import android.content.ComponentName;

import android.content.Context;
@@ -116,6 +117,9 @@ public abstract class BaseLockSettingsServiceTests { 
    @Rule

    public FakeSettingsProviderRule mSettingsRule = FakeSettingsProvider.rule();



    @Rule

    public PropertyInvalidatedCacheTestRule mCacheRule = new PropertyInvalidatedCacheTestRule();



    @Before

    public void setUp_baseServices() throws Exception {

        mResources = createMockResources();

services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceSwRateLimiterNotEnforcingTests.java

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



import android.app.PropertyInvalidatedCache;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;

import android.platform.test.flag.junit.SetFlagsRule;
@@ -46,7 +45,6 @@ public class LockSettingsServiceSwRateLimiterNotEnforcingTests 


    @Before

    public void setUp() {

        PropertyInvalidatedCache.disableForTestMode();

        mService.initializeSyntheticPassword(PRIMARY_USER_ID);

    }

services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import static org.mockito.Mockito.reset; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.PropertyInvalidatedCache;

import android.content.Intent;

import android.os.RemoteException;

import android.os.UserHandle;
@@ -75,7 +74,6 @@ public class LockSettingsServiceTests extends BaseLockSettingsServiceTests { 


    @Before

    public void setUp() {

        PropertyInvalidatedCache.disableForTestMode();

        mService.initializeSyntheticPassword(PRIMARY_USER_ID);

        mService.initializeSyntheticPassword(MANAGED_PROFILE_USER_ID);

    }

services/tests/servicestests/src/com/android/server/locksettings/LockscreenFrpTest.java

+0 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



import android.app.PropertyInvalidatedCache;

import android.app.admin.DevicePolicyManager;

import android.platform.test.annotations.Presubmit;
@@ -50,8 +49,6 @@ public class LockscreenFrpTest extends BaseLockSettingsServiceTests { 


    @Before

    public void setUp() throws Exception {

        PropertyInvalidatedCache.disableForTestMode();



        // FRP credential can only be verified prior to provisioning

        setDeviceProvisioned(false);

services/tests/servicestests/src/com/android/server/locksettings/LockscreenRepairModeTest.java

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertSame;



import android.app.PropertyInvalidatedCache;

import android.platform.test.annotations.Presubmit;

import android.provider.Settings;
@@ -46,7 +45,6 @@ public class LockscreenRepairModeTest extends BaseLockSettingsServiceTests { 


    @Before

    public void setUp() throws Exception {

        PropertyInvalidatedCache.disableForTestMode();

        mService.initializeSyntheticPassword(PRIMARY_USER_ID);

    }