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

Merge "[SettingsProvider] fix WriteFallbackSettingsFilesJobService holding wakelock" into rvc-qpr-dev am: 1c687fa8ae

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12393455

Change-Id: I4f52ea71bc393e1757c776440520937a616378b6
This commit is contained in:
TreeHugger Robot
2020-08-25 04:42:36 +00:00
committed by Automerger Merge Worker
parent afa3bd9208 1c687fa8ae
commit bfb8bb6a5b
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java
View File

@@ -35,19 +35,17 @@ import java.util.List;
public class WriteFallbackSettingsFilesJobService extends JobService { public class WriteFallbackSettingsFilesJobService extends JobService {
@Override @Override
public boolean onStartJob(final JobParameters params) { public boolean onStartJob(final JobParameters params) {
switch (params.getJobId()) { if (params.getJobId() != WRITE_FALLBACK_SETTINGS_FILES_JOB_ID) {
case WRITE_FALLBACK_SETTINGS_FILES_JOB_ID: return false;
final List<String> settingsFiles = new ArrayList<>();
settingsFiles.add(params.getExtras().getString(TABLE_GLOBAL, ""));
settingsFiles.add(params.getExtras().getString(TABLE_SYSTEM, ""));
settingsFiles.add(params.getExtras().getString(TABLE_SECURE, ""));
settingsFiles.add(params.getExtras().getString(TABLE_SSAID, ""));
settingsFiles.add(params.getExtras().getString(TABLE_CONFIG, ""));
SettingsProvider.writeFallBackSettingsFiles(settingsFiles);
return true;
default:
return false;
} }
final List<String> settingsFiles = new ArrayList<>();
settingsFiles.add(params.getExtras().getString(TABLE_GLOBAL, ""));
settingsFiles.add(params.getExtras().getString(TABLE_SYSTEM, ""));
settingsFiles.add(params.getExtras().getString(TABLE_SECURE, ""));
settingsFiles.add(params.getExtras().getString(TABLE_SSAID, ""));
settingsFiles.add(params.getExtras().getString(TABLE_CONFIG, ""));
SettingsProvider.writeFallBackSettingsFiles(settingsFiles);
return false;
} }
@Override @Override