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

Commit 69088854 authored by Songchun Fan's avatar Songchun Fan
Browse files

[SettingsProvider] fix WriteFallbackSettingsFilesJobService holding wakelock 

onStartJob() should return false otherwise the job service will hold a long wakelock until it times out. writeFallBackSettingsFiles() is blocking, so when it returns we should finish the job.

BUG: 162438758
Test: manual
Change-Id: I3bfbcf5a7b21f142fd00130e1a57232bc02aedb6
parent 507092cf

packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java

+10 −12
Original line number Diff line number Diff line
@@ -35,8 +35,9 @@ import java.util.List; 
public class WriteFallbackSettingsFilesJobService extends JobService {

    @Override

    public boolean onStartJob(final JobParameters params) {

        switch (params.getJobId()) {

            case WRITE_FALLBACK_SETTINGS_FILES_JOB_ID:

        if (params.getJobId() != 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, ""));
@@ -44,11 +45,8 @@ public class WriteFallbackSettingsFilesJobService extends JobService { 
        settingsFiles.add(params.getExtras().getString(TABLE_SSAID, ""));

        settingsFiles.add(params.getExtras().getString(TABLE_CONFIG, ""));

        SettingsProvider.writeFallBackSettingsFiles(settingsFiles);

                return true;

            default:

        return false;

    }

    }



    @Override

    public boolean onStopJob(JobParameters params) {