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

Merge "Remove temporary sync-as-ej allow-list." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-07 23:33:45 +00:00
committed by Android (Google) Code Review
parent f9af9bde4a 99170f0aa3
commit 5a268a95cb
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/content/SyncManager.java
View File

@@ -268,10 +268,6 @@ public class SyncManager {
private final SyncLogger mLogger; private final SyncLogger mLogger;
// NOTE: this is a temporary allow-list for testing purposes; it will be removed before release.
private final String[] mEjSyncAllowedPackages = new String[]{
"com.google.android.google", "com.android.frameworks.servicestests"};
private boolean isJobIdInUseLockedH(int jobId, List<JobInfo> pendingJobs) { private boolean isJobIdInUseLockedH(int jobId, List<JobInfo> pendingJobs) {
for (JobInfo job: pendingJobs) { for (JobInfo job: pendingJobs) {
if (job.getId() == jobId) { if (job.getId() == jobId) {
@@ -991,14 +987,6 @@ public class SyncManager {
} }
} }
final boolean scheduleAsEj =
extras.getBoolean(ContentResolver.SYNC_EXTRAS_SCHEDULE_AS_EXPEDITED_JOB, false);
// NOTE: this is a temporary check for internal testing - to be removed before release.
if (scheduleAsEj && !ArrayUtils.contains(mEjSyncAllowedPackages, callingPackage)) {
throw new IllegalArgumentException(
callingPackage + " is not allowed to schedule a sync as an EJ yet.");
}
for (AccountAndUser account : accounts) { for (AccountAndUser account : accounts) {
// If userId is specified, do not sync accounts of other users // If userId is specified, do not sync accounts of other users
if (userId >= UserHandle.USER_SYSTEM && account.userId >= UserHandle.USER_SYSTEM if (userId >= UserHandle.USER_SYSTEM && account.userId >= UserHandle.USER_SYSTEM