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

Commit cb78285b authored by Jeffrey Huang's avatar Jeffrey Huang
Browse files

Rename writeToProto to be dumpDebug 

We want to eventually migrate some of these APIs to be @SystemApi for mainline modules.
The #dumpDebug name is more appropriate than #writeToProto.

Bug: 142279786
Test: Manual
Change-Id: I60793e91cedf6b720d4ecef6a8484f4fed4ff30f
parent e880831d

apex/jobscheduler/framework/java/com/android/server/job/JobSchedulerInternal.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public interface JobSchedulerInternal { 
        /**

         * Write the persist stats to the specified field.

         */

        public void writeToProto(ProtoOutputStream proto, long fieldId) {

        public void dumpDebug(ProtoOutputStream proto, long fieldId) {

            final long token = proto.start(fieldId);



            final long flToken = proto.start(JobStorePersistStatsProto.FIRST_LOAD);

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+1 −1
Original line number Diff line number Diff line
@@ -3345,7 +3345,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
            mConcurrencyManager.dumpProtoLocked(proto,

                    JobSchedulerServiceDumpProto.CONCURRENCY_MANAGER, now, nowElapsed);



            mJobs.getPersistStats().writeToProto(proto, JobSchedulerServiceDumpProto.PERSIST_STATS);

            mJobs.getPersistStats().dumpDebug(proto, JobSchedulerServiceDumpProto.PERSIST_STATS);

        }



        proto.flush();

apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java

+2 −2
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ public final class ConnectivityController extends StateController implements 
        for (int i = 0; i < mAvailableNetworks.size(); i++) {

            Network network = mAvailableNetworks.valueAt(i);

            if (network != null) {

                network.writeToProto(proto,

                network.dumpDebug(proto,

                        StateControllerProto.ConnectivityController.AVAILABLE_NETWORKS);

            }

        }
@@ -658,7 +658,7 @@ public final class ConnectivityController extends StateController implements 
                        js.getSourceUid());

                NetworkRequest rn = js.getJob().getRequiredNetwork();

                if (rn != null) {

                    rn.writeToProto(proto,

                    rn.dumpDebug(proto,

                            StateControllerProto.ConnectivityController.TrackedJob

                                    .REQUIRED_NETWORK);

                }

apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java

+7 −7
Original line number Diff line number Diff line
@@ -1414,7 +1414,7 @@ public final class JobStatus { 
        proto.write(JobStatusDumpProto.JobWorkItem.WORK_ID, work.getWorkId());

        proto.write(JobStatusDumpProto.JobWorkItem.DELIVERY_COUNT, work.getDeliveryCount());

        if (work.getIntent() != null) {

            work.getIntent().writeToProto(proto, JobStatusDumpProto.JobWorkItem.INTENT);

            work.getIntent().dumpDebug(proto, JobStatusDumpProto.JobWorkItem.INTENT);

        }

        Object grants = work.getGrants();

        if (grants != null) {
@@ -1683,7 +1683,7 @@ public final class JobStatus { 
        if (full) {

            final long jiToken = proto.start(JobStatusDumpProto.JOB_INFO);



            job.getService().writeToProto(proto, JobStatusDumpProto.JobInfo.SERVICE);

            job.getService().dumpDebug(proto, JobStatusDumpProto.JobInfo.SERVICE);



            proto.write(JobStatusDumpProto.JobInfo.IS_PERIODIC, job.isPeriodic());

            proto.write(JobStatusDumpProto.JobInfo.PERIOD_INTERVAL_MS, job.getIntervalMillis());
@@ -1722,19 +1722,19 @@ public final class JobStatus { 
                }

            }

            if (job.getExtras() != null && !job.getExtras().maybeIsEmpty()) {

                job.getExtras().writeToProto(proto, JobStatusDumpProto.JobInfo.EXTRAS);

                job.getExtras().dumpDebug(proto, JobStatusDumpProto.JobInfo.EXTRAS);

            }

            if (job.getTransientExtras() != null && !job.getTransientExtras().maybeIsEmpty()) {

                job.getTransientExtras().writeToProto(proto, JobStatusDumpProto.JobInfo.TRANSIENT_EXTRAS);

                job.getTransientExtras().dumpDebug(proto, JobStatusDumpProto.JobInfo.TRANSIENT_EXTRAS);

            }

            if (job.getClipData() != null) {

                job.getClipData().writeToProto(proto, JobStatusDumpProto.JobInfo.CLIP_DATA);

                job.getClipData().dumpDebug(proto, JobStatusDumpProto.JobInfo.CLIP_DATA);

            }

            if (uriPerms != null) {

                uriPerms.dump(proto, JobStatusDumpProto.JobInfo.GRANTED_URI_PERMISSIONS);

            }

            if (job.getRequiredNetwork() != null) {

                job.getRequiredNetwork().writeToProto(proto, JobStatusDumpProto.JobInfo.REQUIRED_NETWORK);

                job.getRequiredNetwork().dumpDebug(proto, JobStatusDumpProto.JobInfo.REQUIRED_NETWORK);

            }

            if (mTotalNetworkDownloadBytes != JobInfo.NETWORK_BYTES_UNKNOWN) {

                proto.write(JobStatusDumpProto.JobInfo.TOTAL_NETWORK_DOWNLOAD_BYTES,
@@ -1822,7 +1822,7 @@ public final class JobStatus { 
        }



        if (network != null) {

            network.writeToProto(proto, JobStatusDumpProto.NETWORK);

            network.dumpDebug(proto, JobStatusDumpProto.NETWORK);

        }



        if (pendingWork != null) {

apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public final class QuotaController extends StateController { 
            return string(userId, packageName);

        }



        public void writeToProto(ProtoOutputStream proto, long fieldId) {

        public void dumpDebug(ProtoOutputStream proto, long fieldId) {

            final long token = proto.start(fieldId);



            proto.write(StateControllerProto.QuotaController.Package.USER_ID, userId);
@@ -1638,7 +1638,7 @@ public final class QuotaController extends StateController { 
        public void dump(ProtoOutputStream proto, long fieldId, Predicate<JobStatus> predicate) {

            final long token = proto.start(fieldId);



            mPkg.writeToProto(proto, StateControllerProto.QuotaController.Timer.PKG);

            mPkg.dumpDebug(proto, StateControllerProto.QuotaController.Timer.PKG);

            proto.write(StateControllerProto.QuotaController.Timer.IS_ACTIVE, isActive());

            proto.write(StateControllerProto.QuotaController.Timer.START_TIME_ELAPSED,

                    mStartTimeElapsed);