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

Commit 00f0fd9d authored by Jahdiel Alvarez's avatar Jahdiel Alvarez
Browse files

Refactor JobScheduler to handle user switch via onUserSwitching method 

JobSchedulerService will handle SystemService's onUserSwitching method
in order to remove the previous user from its internal started users
array in the case the previous user is stopped during user switch.

With respect to the stopping previous user apps feature, this will
prevent JobSchedulerService from restarting packages that were early
killed during the user switch system event.

Test: Manually run user switch on device
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/job
Test: atest CtsJobSchedulerTestCases
Bug: 323200731
Flag: com.android.server.job.remove_user_during_user_switch
Change-Id: Ie2813482db061c8b2f21ce0731bbf5cf23897158
parent 7f23739f

apex/jobscheduler/service/aconfig/job.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -58,3 +58,10 @@ flag { 
       purpose: PURPOSE_BUGFIX

   }

}



flag {

   name: "remove_user_during_user_switch"

   namespace: "backstage_power"

   description: "Remove started user if user will be stopped due to user switch"

   bug: "321598070"

}

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+14 −0
Original line number Diff line number Diff line
@@ -1668,6 +1668,20 @@ public class JobSchedulerService extends com.android.server.SystemService 
        }

    }



    @Override

    public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {

        if (!Flags.removeUserDuringUserSwitch()

                || from == null

                || !mActivityManagerInternal.isEarlyPackageKillEnabledForUserSwitch(

                                                                from.getUserIdentifier(),

                                                                to.getUserIdentifier())) {

            return;

        }

        synchronized (mLock) {

            mStartedUsers = ArrayUtils.removeInt(mStartedUsers, from.getUserIdentifier());

        }

    }



    @Override

    public void onUserStopping(@NonNull TargetUser user) {

        synchronized (mLock) {