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

Commit 8fcf6a69 authored by Shreyas Basarge's avatar Shreyas Basarge Committed by Android (Google) Code Review
Browse files

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

parents f84b3e0e eda34e4d

services/core/java/com/android/server/content/SyncManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1301,7 +1301,7 @@ public class SyncManager { 
        }



        getJobScheduler().scheduleAsPackage(b.build(), syncOperation.owningPackage,

                syncOperation.target.userId, "sync");

                syncOperation.target.userId, syncOperation.wakeLockName());

    }



    /**

services/core/java/com/android/server/job/controllers/JobStatus.java

+3 −13
Original line number Diff line number Diff line
@@ -150,19 +150,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;