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

Commit 496594c5 authored by Kweku Adams's avatar Kweku Adams
Browse files

Ensure prediction can remove from RESTRICTED timeout. 

Prediction is supposed to be able to remove an app from the RESTRICTED
bucket if the app timed out into the bucket (but not for any other
reason). We were accidentally preventing that from happening. This also
fixes the test that wasn't asserting the behavior >.<

Bug: 151641467
Test: atest FrameworksServicesTests:AppIdleHistoryTests
Test: atest FrameworksServicesTests:AppStandbyControllerTests
Change-Id: I684c0bde586ed94e36e49bb47c8bd5cb9de1d664
parent 3bdd15fb

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+14 −10
Original line number Diff line number Diff line
@@ -1248,10 +1248,8 @@ public class AppStandbyController implements AppStandbyInternal { 
            // Don't allow changing bucket if higher than ACTIVE

            if (app.currentBucket < STANDBY_BUCKET_ACTIVE) return;



            // Don't allow prediction to change from/to NEVER or from RESTRICTED.

            if ((app.currentBucket == STANDBY_BUCKET_NEVER

                    || app.currentBucket == STANDBY_BUCKET_RESTRICTED

                    || newBucket == STANDBY_BUCKET_NEVER)

            // Don't allow prediction to change from/to NEVER.

            if ((app.currentBucket == STANDBY_BUCKET_NEVER || newBucket == STANDBY_BUCKET_NEVER)

                    && predicted) {

                return;

            }
@@ -1266,13 +1264,19 @@ public class AppStandbyController implements AppStandbyInternal { 
            final boolean isForcedByUser =

                    (reason & REASON_MAIN_MASK) == REASON_MAIN_FORCED_BY_USER;



            // If the current bucket is RESTRICTED, only user force or usage should bring it out,

            // unless the app was put into the bucket due to timing out.

            if (app.currentBucket == STANDBY_BUCKET_RESTRICTED && !isUserUsage(reason)

                    && !isForcedByUser

                    && (app.bucketingReason & REASON_MAIN_MASK) != REASON_MAIN_TIMEOUT) {

            if (app.currentBucket == STANDBY_BUCKET_RESTRICTED) {

                if ((app.bucketingReason & REASON_MAIN_MASK) == REASON_MAIN_TIMEOUT) {

                    if (predicted && newBucket >= STANDBY_BUCKET_RARE) {

                        // Predicting into RARE or below means we don't expect the user to use the

                        // app anytime soon, so don't elevate it from RESTRICTED.

                        return;

                    }

                } else if (!isUserUsage(reason) && !isForcedByUser) {

                    // If the current bucket is RESTRICTED, only user force or usage should bring

                    // it out, unless the app was put into the bucket due to timing out.

                    return;

                }

            }



            if (newBucket == STANDBY_BUCKET_RESTRICTED) {

                mAppIdleHistory

services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java

+19 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ public class AppStandbyControllerTests { 
    }



    @Test

    public void testPredictionRaiseFromRestrictedTimeout() {

    public void testPredictionRaiseFromRestrictedTimeout_highBucket() {

        reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1);



        // Way past all timeouts. App times out into RESTRICTED bucket.
@@ -823,6 +823,24 @@ public class AppStandbyControllerTests { 
        mInjector.mElapsedRealtime += RESTRICTED_THRESHOLD;

        mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_ACTIVE,

                REASON_MAIN_PREDICTED);

        assertBucket(STANDBY_BUCKET_ACTIVE);

    }



    @Test

    public void testPredictionRaiseFromRestrictedTimeout_lowBucket() {

        reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1);



        // Way past all timeouts. App times out into RESTRICTED bucket.

        mInjector.mElapsedRealtime += RESTRICTED_THRESHOLD * 4;

        mController.checkIdleStates(USER_ID);

        assertBucket(STANDBY_BUCKET_RESTRICTED);



        // Prediction into a low bucket means no expectation of the app being used, so we shouldn't

        // elevate the app from RESTRICTED.

        mInjector.mElapsedRealtime += RESTRICTED_THRESHOLD;

        mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_RARE,

                REASON_MAIN_PREDICTED);

        assertBucket(STANDBY_BUCKET_RESTRICTED);

    }



    @Test