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

This commit is contained in:
TreeHugger Robot
2020-03-10 00:51:57 +00:00
committed by Android (Google) Code Review

View File

@@ -36,6 +36,7 @@ import com.android.server.appop.AppOpsService;
import com.android.server.testables.TestableDeviceConfig;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -267,9 +268,7 @@ public final class CachedAppOptimizerTest {
@Test
public void useFreeze_doesNotListenToDeviceConfigChanges() throws InterruptedException {
if (!mCachedAppOptimizerUnderTest.isFreezerSupported()) {
return;
}
Assume.assumeTrue(mCachedAppOptimizerUnderTest.isFreezerSupported());
assertThat(mCachedAppOptimizerUnderTest.useFreezer()).isEqualTo(
CachedAppOptimizer.DEFAULT_USE_FREEZER);