Merge "Partial revert "Wait for unlock to start jobs."" am: 214a74b728
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852928 Change-Id: I7a7edfc0e461268dc7c25f504dc674100aeb8e9b
This commit is contained in:
@@ -1008,13 +1008,21 @@ public class JobSchedulerService extends com.android.server.SystemService
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onUserUnlocked(@NonNull TargetUser user) {
|
public void onUserStarting(@NonNull TargetUser user) {
|
||||||
synchronized (mLock) {
|
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());
|
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();
|
mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user