From a9219716ed9c20fb5f4e7a4433ba5c51dd524649 Mon Sep 17 00:00:00 2001
From: Marco Ballesio <balejs@google.com>
Date: Mon, 9 Mar 2020 09:39:41 -0700
Subject: [PATCH] Revert "Convert assumption to conditional in freezer test"

Now that http://b/148899617 is fixed, and after leaving test
infrastructure some time to update to ag/10254650, it's time to revert
this workaround.

Bug: 148899617
Test: atest com.android.server.am.CachedAppOptimizerTest
Test: atest FrameworksMockingServicesTests:StaticMockFixtureRuleTest
This reverts commit f0962a49d2595b79ef7d2bd5e1bd4c1da7c70349.
---
 .../src/com/android/server/am/CachedAppOptimizerTest.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java b/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
index 4722b39cc6528..e5ec1f76c5546 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
@@ -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);