Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename JobStore method and parameter."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-29 19:50:41 +00:00
committed by Android (Google) Code Review
parent 436a2fdbe9 66f8ae7061
commit 55bb763900
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
View File

@@ -1193,7 +1193,7 @@ public class JobSchedulerService extends com.android.server.SystemService
private void cancelJobsForNonExistentUsers() {
UserManagerInternal umi = LocalServices.getService(UserManagerInternal.class);
synchronized (mLock) {
mJobs.removeJobsOfNonUsers(umi.getUserIds());
mJobs.removeJobsOfUnlistedUsers(umi.getUserIds());
}
}

19
apex/jobscheduler/service/java/com/android/server/job/JobStore.java
View File

@@ -254,11 +254,11 @@ public final class JobStore {
}
/**
* Remove the jobs of users not specified in the whitelist.
* @param whitelist Array of User IDs whose jobs are not to be removed.
* Remove the jobs of users not specified in the keepUserIds.
* @param keepUserIds Array of User IDs whose jobs should be kept and not removed.
*/
public void removeJobsOfNonUsers(int[] whitelist) {
mJobSet.removeJobsOfNonUsers(whitelist);
public void removeJobsOfUnlistedUsers(int[] keepUserIds) {
mJobSet.removeJobsOfUnlistedUsers(keepUserIds);
}
@VisibleForTesting
@@ -1151,15 +1151,14 @@ public final class JobStore {
}
/**
* Removes the jobs of all users not specified by the whitelist of user ids.
* This will remove jobs scheduled *by* non-existent users as well as jobs scheduled *for*
* non-existent users
* Removes the jobs of all users not specified by the keepUserIds of user ids.
* This will remove jobs scheduled *by* and *for* any unlisted users.
*/
public void removeJobsOfNonUsers(final int[] whitelist) {
public void removeJobsOfUnlistedUsers(final int[] keepUserIds) {
final Predicate<JobStatus> noSourceUser =
job -> !ArrayUtils.contains(whitelist, job.getSourceUserId());
job -> !ArrayUtils.contains(keepUserIds, job.getSourceUserId());
final Predicate<JobStatus> noCallingUser =
job -> !ArrayUtils.contains(whitelist, job.getUserId());
job -> !ArrayUtils.contains(keepUserIds, job.getUserId());
removeAll(noSourceUser.or(noCallingUser));
}

4
services/tests/servicestests/src/com/android/server/job/JobSetTest.java
View File

@@ -97,9 +97,9 @@ public class JobSetTest {
mJobSet.remove(testJob1);
mJobSet.remove(testJob2);
assertHaveSameJobs(mJobSet.mJobsPerSourceUid, mJobSet.mJobs);
mJobSet.removeJobsOfNonUsers(new int[] {mContext.getUserId(), SECONDARY_USER_ID_1});
mJobSet.removeJobsOfUnlistedUsers(new int[] {mContext.getUserId(), SECONDARY_USER_ID_1});
assertHaveSameJobs(mJobSet.mJobsPerSourceUid, mJobSet.mJobs);
mJobSet.removeJobsOfNonUsers(new int[] {mContext.getUserId()});
mJobSet.removeJobsOfUnlistedUsers(new int[] {mContext.getUserId()});
assertTrue("mJobs should be empty", mJobSet.mJobs.size() == 0);
assertTrue("mJobsPerSourceUid should be empty", mJobSet.mJobsPerSourceUid.size() == 0);
}