From 7e56f8dad437914da496e98f698a8f3b62ffef8e Mon Sep 17 00:00:00 2001 From: Kevin Han Date: Mon, 19 Apr 2021 14:26:11 -0700 Subject: Fix broken hibernation test ag/14203210 made isAppHibernationEnabled use a cached value rather than query device config every time. This happened to break a test that relied on mocking the DeviceConfig value. We update the static value directly to ensure the feature is enabled in the test. Bug: 185730191 Test: atest PackageManagerServiceHibernationTests Change-Id: Icf7d5bedba69cc5af7df2d38bf5088cb08b5cfb6 --- .../java/com/android/server/apphibernation/AppHibernationService.java | 2 +- .../src/com/android/server/pm/PackageManagerServiceHibernationTests.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/apphibernation/AppHibernationService.java b/services/core/java/com/android/server/apphibernation/AppHibernationService.java index fd829fae5759..aa51800fb134 100644 --- a/services/core/java/com/android/server/apphibernation/AppHibernationService.java +++ b/services/core/java/com/android/server/apphibernation/AppHibernationService.java @@ -109,7 +109,7 @@ public final class AppHibernationService extends SystemService { private final boolean mOatArtifactDeletionEnabled; @VisibleForTesting - static boolean sIsServiceEnabled; + public static boolean sIsServiceEnabled; /** * Initializes the system service. diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt b/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt index 411c31c97120..72bc77ebb9ef 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt @@ -24,6 +24,7 @@ import android.testing.AndroidTestingRunner import android.testing.TestableLooper import android.testing.TestableLooper.RunWithLooper import com.android.server.apphibernation.AppHibernationManagerInternal +import com.android.server.apphibernation.AppHibernationService import com.android.server.extendedtestutils.wheneverStatic import com.android.server.testutils.whenever import org.junit.Assert.assertFalse @@ -61,6 +62,7 @@ class PackageManagerServiceHibernationTests { MockitoAnnotations.initMocks(this) wheneverStatic { DeviceConfig.getBoolean( NAMESPACE_APP_HIBERNATION, KEY_APP_HIBERNATION_ENABLED, false) }.thenReturn(true) + AppHibernationService.sIsServiceEnabled = true rule.system().stageNominalSystemState() whenever(rule.mocks().injector.getLocalService(AppHibernationManagerInternal::class.java)) .thenReturn(appHibernationManager) -- cgit v1.2.3-59-g8ed1b