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

Commit 5c067e27 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Revert "Convert assumption to conditional in freezer test"" into rvc-dev am: d6956d77 

Change-Id: I467e6b6980b2bd7f1731451d95a5cfcfdea8e15c
parents 27e865a3 d6956d77

services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.server.appop.AppOpsService; 
import com.android.server.testables.TestableDeviceConfig;

import com.android.server.testables.TestableDeviceConfig;





import org.junit.After;

import org.junit.After;

import org.junit.Assume;

import org.junit.Before;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;
@@ -267,9 +268,7 @@ public final class CachedAppOptimizerTest { 




    @Test

    @Test

    public void useFreeze_doesNotListenToDeviceConfigChanges() throws InterruptedException {

    public void useFreeze_doesNotListenToDeviceConfigChanges() throws InterruptedException {

        if (!mCachedAppOptimizerUnderTest.isFreezerSupported()) {

        Assume.assumeTrue(mCachedAppOptimizerUnderTest.isFreezerSupported());

            return;

        }





        assertThat(mCachedAppOptimizerUnderTest.useFreezer()).isEqualTo(

        assertThat(mCachedAppOptimizerUnderTest.useFreezer()).isEqualTo(

                CachedAppOptimizer.DEFAULT_USE_FREEZER);

                CachedAppOptimizer.DEFAULT_USE_FREEZER);