From f0962a49d2595b79ef7d2bd5e1bd4c1da7c70349 Mon Sep 17 00:00:00 2001
From: Marco Ballesio <balejs@google.com>
Date: Tue, 4 Feb 2020 17:38:04 -0800
Subject: [PATCH] Convert assumption to conditional in freezer test

remove the assumption from freezer test to let presubmit tests run smooth

Bug: 148899617
Test: presumbit tests
Change-Id: Ifd861c62de3f4b249b3ebb35fa6c877af7b610ad
---
 .../src/com/android/server/am/CachedAppOptimizerTest.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 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 e5ec1f76c5546..4722b39cc6528 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
@@ -36,7 +36,6 @@ 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;
@@ -268,7 +267,9 @@ public final class CachedAppOptimizerTest {
 
     @Test
     public void useFreeze_doesNotListenToDeviceConfigChanges() throws InterruptedException {
-        Assume.assumeTrue(mCachedAppOptimizerUnderTest.isFreezerSupported());
+        if (!mCachedAppOptimizerUnderTest.isFreezerSupported()) {
+            return;
+        }
 
         assertThat(mCachedAppOptimizerUnderTest.useFreezer()).isEqualTo(
                 CachedAppOptimizer.DEFAULT_USE_FREEZER);