commit 69e604fdb9ffc5e13a545e89c523b0edd391b7ad
author Songchun Fan <schfan@google.com> Wed Jul 29 12:55:11 2020 -0700
committer Songchun Fan <schfan@google.com> Thu Aug 20 04:34:31 2020 +0000
tree 8288e3c7608e7975bb6d1b17a98e34679af21b30
parent d951edaa48002013c73ea05c7a419f18a2dcdcbb

[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
(cherry picked from commit 690888547af30bb18809505dd22eb6d76641c711)
Merged-In: I3bfbcf5a7b21f142fd00130e1a57232bc02aedb6

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

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java b/packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java
index 6e5b8890..66aa7ba 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/WriteFallbackSettingsFilesJobService.java
@@ -35,19 +35,17 @@
 public class WriteFallbackSettingsFilesJobService extends JobService {
     @Override
     public boolean onStartJob(final JobParameters params) {
-        switch (params.getJobId()) {
-            case WRITE_FALLBACK_SETTINGS_FILES_JOB_ID:
-                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;
+        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, ""));
+        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