Browse Source

Merge pull request #3085 from nextcloud/wakeLockTag

Wakelock tag pattern follows PowerManager doc
Andy Scherzinger 6 years ago
parent
commit
b061b1a557

+ 1 - 1
scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 2 errors and 113 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 113 warnings</span>

+ 3 - 1
src/main/java/com/owncloud/android/jobs/FilesSyncJob.java

@@ -68,6 +68,7 @@ public class FilesSyncJob extends Job {
     public static final String TAG = "FilesSyncJob";
     public static final String SKIP_CUSTOM = "skipCustom";
     public static final String OVERRIDE_POWER_SAVING = "overridePowerSaving";
+    private static final String WAKELOCK_TAG_SEPARATION = ":";
 
     @NonNull
     @Override
@@ -77,7 +78,8 @@ public class FilesSyncJob extends Job {
 
         if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-            wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+            wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, MainApp.getAuthority() +
+                    WAKELOCK_TAG_SEPARATION + TAG);
             wakeLock.acquire();
         }
 

+ 3 - 1
src/main/java/com/owncloud/android/jobs/OfflineSyncJob.java

@@ -49,6 +49,7 @@ import java.util.Set;
 public class OfflineSyncJob extends Job {
     public static final String TAG = "OfflineSyncJob";
 
+    private static final String WAKELOCK_TAG_SEPARATION = ":";
     private List<OfflineFile> offlineFileList = new ArrayList<>();
 
     @NonNull
@@ -69,7 +70,8 @@ public class OfflineSyncJob extends Job {
 
             if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
                 PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-                wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+                wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, MainApp.getAuthority() +
+                        WAKELOCK_TAG_SEPARATION + TAG);
                 wakeLock.acquire();
             }