Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix broken hibernation test" into sc-dev

Browse Source
This commit is contained in:
Vadim Caen
2021-04-20 11:24:09 +00:00
committed by Android (Google) Code Review
parent eaf1d09c36 7e56f8dad4
commit 8c2273ef8f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/apphibernation/AppHibernationService.java
View File

@@ -109,7 +109,7 @@ public final class AppHibernationService extends SystemService {
private final boolean mOatArtifactDeletionEnabled; private final boolean mOatArtifactDeletionEnabled;
@VisibleForTesting @VisibleForTesting
static boolean sIsServiceEnabled; public static boolean sIsServiceEnabled;
/** /**
* Initializes the system service. * Initializes the system service.

2
services/tests/mockingservicestests/src/com/android/server/pm/PackageManagerServiceHibernationTests.kt
View File

@@ -24,6 +24,7 @@ import android.testing.AndroidTestingRunner
import android.testing.TestableLooper import android.testing.TestableLooper
import android.testing.TestableLooper.RunWithLooper import android.testing.TestableLooper.RunWithLooper
import com.android.server.apphibernation.AppHibernationManagerInternal import com.android.server.apphibernation.AppHibernationManagerInternal
import com.android.server.apphibernation.AppHibernationService
import com.android.server.extendedtestutils.wheneverStatic import com.android.server.extendedtestutils.wheneverStatic
import com.android.server.testutils.whenever import com.android.server.testutils.whenever
import org.junit.Assert.assertFalse import org.junit.Assert.assertFalse
@@ -61,6 +62,7 @@ class PackageManagerServiceHibernationTests {
MockitoAnnotations.initMocks(this) MockitoAnnotations.initMocks(this)
wheneverStatic { DeviceConfig.getBoolean( wheneverStatic { DeviceConfig.getBoolean(
NAMESPACE_APP_HIBERNATION, KEY_APP_HIBERNATION_ENABLED, false) }.thenReturn(true) NAMESPACE_APP_HIBERNATION, KEY_APP_HIBERNATION_ENABLED, false) }.thenReturn(true)
AppHibernationService.sIsServiceEnabled = true
rule.system().stageNominalSystemState() rule.system().stageNominalSystemState()
whenever(rule.mocks().injector.getLocalService(AppHibernationManagerInternal::class.java)) whenever(rule.mocks().injector.getLocalService(AppHibernationManagerInternal::class.java))
.thenReturn(appHibernationManager) .thenReturn(appHibernationManager)