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

Merge "Account info on job wakelocks" into nyc-dev

Browse Source
This commit is contained in:
Shreyas Basarge
2016-04-26 22:36:45 +00:00
committed by Android (Google) Code Review
parent f84b3e0e2f eda34e4d96
commit 8fcf6a6922
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/content/SyncManager.java
View File

@@ -1301,7 +1301,7 @@ public class SyncManager {
} }
getJobScheduler().scheduleAsPackage(b.build(), syncOperation.owningPackage, getJobScheduler().scheduleAsPackage(b.build(), syncOperation.owningPackage,
syncOperation.target.userId, "sync"); syncOperation.target.userId, syncOperation.wakeLockName());
} }
/** /**

16
services/core/java/com/android/server/job/controllers/JobStatus.java
View File

@@ -150,19 +150,9 @@ public final class JobStatus {
this.sourceTag = tag; this.sourceTag = tag;
} }
if (this.sourceTag != null) { this.batteryName = this.sourceTag != null
StringBuilder sb = new StringBuilder(); ? this.sourceTag + ":" + job.getService().getPackageName()
sb.append(job.getService().getPackageName()); : job.getService().flattenToShortString();
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.tag = "*job*/" + this.batteryName; this.tag = "*job*/" + this.batteryName;
this.earliestRunTimeElapsedMillis = earliestRunTimeElapsedMillis; this.earliestRunTimeElapsedMillis = earliestRunTimeElapsedMillis;