Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e8b4013 authored by Kevin Han's avatar Kevin Han
Browse files

Add hibernation NPE check and unhibernate only if hibernating 

Rather than depend strictly on "leaving" force-stop (i.e. stopped to not
stopped), we unhibernate when setting stopped to false and the app is
hibernating. This prevents situations where an app is not stopped but
hibernating and can never exit hibernation because the app never
"leaves" force-stop.

With this, we can add the NPE check without risk of putting the app into
a permanent hibernation state.

Bug: 205774141
Test: atest AppHibernationIntegrationTest
Test: atest PackageManagerServiceHibernationTests
Change-Id: Ia45d0c9236474841d0ba63b5265b3b835cf9f6f5
parent 81577a39

services/core/java/com/android/server/pm/PackageManagerService.java

+7 −7
Original line number Diff line number Diff line
@@ -6789,24 +6789,24 @@ public class PackageManagerService extends IPackageManager.Stub 
        }

        enforceCrossUserPermission(callingUid, userId, true /* requireFullPermission */,

                true /* checkShell */, "stop package");

        boolean shouldUnhibernate = false;

        // writer

        synchronized (mLock) {

            final PackageSetting ps = mSettings.getPackageLPr(packageName);

            if (ps != null && ps.getStopped(userId) && !stopped) {

                shouldUnhibernate = true;

            }

            if (!shouldFilterApplication(ps, callingUid, userId)

                    && mSettings.setPackageStoppedStateLPw(this, packageName, stopped, userId)) {

                scheduleWritePackageRestrictionsLocked(userId);

            }

        }

        if (shouldUnhibernate) {

        // If this would cause the app to leave force-stop, then also make sure to unhibernate the

        // app if needed.

        if (!stopped) {

            mHandler.post(() -> {

                AppHibernationManagerInternal ah =

                        mInjector.getLocalService(AppHibernationManagerInternal.class);

                if (ah != null && ah.isHibernatingForUser(packageName, userId)) {

                    ah.setHibernatingForUser(packageName, userId, false);

                    ah.setHibernatingGlobally(packageName, false);

                }

            });

        }

    }

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

+29 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 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

import org.junit.Assert.assertFalse

import org.junit.Assert.assertTrue

import org.junit.Before
@@ -36,7 +37,6 @@ import org.junit.Rule 
import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito

import org.mockito.Mockito.verify

import org.mockito.MockitoAnnotations
@@ -102,9 +102,10 @@ class PackageManagerServiceHibernationTests { 
        val pm = createPackageManagerService()

        rule.system().validateFinalState()



        pm.setPackageStoppedState(TEST_PACKAGE_NAME, true, TEST_USER_ID)

        TestableLooper.get(this).processAllMessages()

        Mockito.clearInvocations(appHibernationManager)



        whenever(appHibernationManager.isHibernatingForUser(TEST_PACKAGE_NAME, TEST_USER_ID))

            .thenReturn(true)



        pm.setPackageStoppedState(TEST_PACKAGE_NAME, false, TEST_USER_ID)
@@ -114,6 +115,31 @@ class PackageManagerServiceHibernationTests { 
        verify(appHibernationManager).setHibernatingGlobally(TEST_PACKAGE_NAME, false)

    }



    @Test

    fun testExitForceStop_nonExistingAppHibernationManager_doesNotThrowException() {

        whenever(rule.mocks().injector.getLocalService(AppHibernationManagerInternal::class.java))

            .thenReturn(null)



        rule.system().stageScanExistingPackage(

            TEST_PACKAGE_NAME,

            1L,

            rule.system().dataAppDirectory)

        val pm = createPackageManagerService()

        rule.system().validateFinalState()



        TestableLooper.get(this).processAllMessages()



        whenever(appHibernationManager.isHibernatingForUser(TEST_PACKAGE_NAME, TEST_USER_ID))

            .thenReturn(true)



        try {

            pm.setPackageStoppedState(TEST_PACKAGE_NAME, false, TEST_USER_ID)

            TestableLooper.get(this).processAllMessages()

        } catch (e: Exception) {

            Assert.fail("Method throws exception when AppHibernationManager is not ready.\n$e")

        }

    }



    @Test

    fun testGetOptimizablePackages_ExcludesGloballyHibernatingPackages() {

        rule.system().stageScanExistingPackage(