diff options
| author | 2021-04-20 11:24:09 +0000 | |
|---|---|---|
| committer | 2021-04-20 11:24:09 +0000 | |
| commit | 8c2273ef8f55b2e07762163b883d76d20daee48e (patch) | |
| tree | ac7dd906b932748688c31175e2dd2877fdd1a013 | |
| parent | eaf1d09c36e5817cdfebc588b1c37a0bd6e110f3 (diff) | |
| parent | 7e56f8dad437914da496e98f698a8f3b62ffef8e (diff) | |
Merge "Fix broken hibernation test" into sc-dev
2 files changed, 3 insertions, 1 deletions
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) |