From eda34e4d9687d1205d9491a33fdb62dbb7f27d07 Mon Sep 17 00:00:00 2001
From: Shreyas Basarge <snb@google.com>
Date: Tue, 26 Apr 2016 00:14:02 +0100
Subject: [PATCH] Account info on job wakelocks

Adds account information to wakelock
names for JobScheduler jobs.

Bug: 28321515
Change-Id: Ifaf289c2a9a11843769a3b40eea57d93dbd7d075
---
 .../com/android/server/content/SyncManager.java  |  2 +-
 .../server/job/controllers/JobStatus.java        | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
index 8af0af093ed7b..071f51096cb04 100644
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -1300,7 +1300,7 @@ public class SyncManager {
         }
 
         getJobScheduler().scheduleAsPackage(b.build(), syncOperation.owningPackage,
-                syncOperation.target.userId, "sync");
+                syncOperation.target.userId, syncOperation.wakeLockName());
     }
 
     /**
diff --git a/services/core/java/com/android/server/job/controllers/JobStatus.java b/services/core/java/com/android/server/job/controllers/JobStatus.java
index 39905d8e57e22..2d095242566f5 100644
--- a/services/core/java/com/android/server/job/controllers/JobStatus.java
+++ b/services/core/java/com/android/server/job/controllers/JobStatus.java
@@ -138,19 +138,9 @@ public final class JobStatus {
             this.sourceTag = tag;
         }
 
-        if (this.sourceTag != null) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(job.getService().getPackageName());
-            sb.append('/');
-            sb.append(this.sourceTag);
-            if (sourcePackageName != null) {
-                sb.append('/');
-                sb.append(this.sourcePackageName);
-            }
-            this.batteryName = sb.toString();
-        } else {
-            this.batteryName = job.getService().flattenToShortString();
-        }
+        this.batteryName = this.sourceTag != null
+                ? this.sourceTag + ":" + job.getService().getPackageName()
+                : job.getService().flattenToShortString();
         this.tag = "*job*/" + this.batteryName;
 
         this.earliestRunTimeElapsedMillis = earliestRunTimeElapsedMillis;