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

Commit 171bf041 authored by Kweku Adams's avatar Kweku Adams
Browse files

Partial revert "Wait for unlock to start jobs." 

This reverts commit e61cf512
but changes onUserUnlocking to onUserUnlocked.

Reason for revert: Direct-boot-aware jobs should be allowed to run when the user is locked

Bug: 201307089
Change-Id: Ic5a67a42590e171f0bfed8da0c138096031469d5
parent 629081a5

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

+12 −4
Original line number Diff line number Diff line
@@ -1075,13 +1075,21 @@ public class JobSchedulerService extends com.android.server.SystemService 
    }



    @Override

    public void onUserUnlocked(@NonNull TargetUser user) {

    public void onUserStarting(@NonNull TargetUser user) {

        synchronized (mLock) {

            // Note that the user has started after its unlocked instead of when the user

            // actually starts because the storage won't be decrypted until unlock.

            mStartedUsers = ArrayUtils.appendInt(mStartedUsers, user.getUserIdentifier());

        }

        // Let's kick any outstanding jobs for this user.

        // The user is starting but credential encrypted storage is still locked.

        // Only direct-boot-aware jobs can safely run.

        // Let's kick off any eligible jobs for this user.

        mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();

    }



    @Override

    public void onUserUnlocked(@NonNull TargetUser user) {

        // The user is fully unlocked and credential encrypted storage is now decrypted.

        // Direct-boot-UNaware jobs can now safely run.

        // Let's kick off any outstanding jobs for this user.

        mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();

    }