Merge "Remove Network, NetworkRequest metrics from jobscheduler" into sc-dev am: 720ebdc401 (dc97be4c) · Commits · e / os / android_frameworks_base

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

+0 −13

Original line number	Diff line number	Diff line
		@@ -725,13 +725,6 @@ public final class ConnectivityController extends RestrictingController implemen
		StateControllerProto.ConnectivityController.REQUESTED_STANDBY_EXCEPTION_UIDS,
		mRequestedWhitelistJobs.keyAt(i));
		}
		for (int i = 0; i < mAvailableNetworks.size(); i++) {
		Network network = mAvailableNetworks.keyAt(i);
		if (network != null) {
		network.dumpDebug(proto,
		StateControllerProto.ConnectivityController.AVAILABLE_NETWORKS);
		}
		}
		for (int i = 0; i < mTrackedJobs.size(); i++) {
		final ArraySet<JobStatus> jobs = mTrackedJobs.valueAt(i);
		for (int j = 0; j < jobs.size(); j++) {
		@@ -745,12 +738,6 @@ public final class ConnectivityController extends RestrictingController implemen
		StateControllerProto.ConnectivityController.TrackedJob.INFO);
		proto.write(StateControllerProto.ConnectivityController.TrackedJob.SOURCE_UID,
		js.getSourceUid());
		NetworkRequest rn = js.getJob().getRequiredNetwork();
		if (rn != null) {
		rn.dumpDebug(proto,
		StateControllerProto.ConnectivityController.TrackedJob
		.REQUIRED_NETWORK);
		}
		proto.end(jsToken);
		}
		}

+0 −7

Original line number	Diff line number	Diff line
		@@ -2171,9 +2171,6 @@ public final class JobStatus {
		if (uriPerms != null) {
		uriPerms.dump(proto, JobStatusDumpProto.JobInfo.GRANTED_URI_PERMISSIONS);
		}
		if (job.getRequiredNetwork() != null) {
		job.getRequiredNetwork().dumpDebug(proto, JobStatusDumpProto.JobInfo.REQUIRED_NETWORK);
		}
		if (mTotalNetworkDownloadBytes != JobInfo.NETWORK_BYTES_UNKNOWN) {
		proto.write(JobStatusDumpProto.JobInfo.TOTAL_NETWORK_DOWNLOAD_BYTES,
		mTotalNetworkDownloadBytes);
		@@ -2262,10 +2259,6 @@ public final class JobStatus {
		}
		}

		if (network != null) {
		network.dumpDebug(proto, JobStatusDumpProto.NETWORK);
		}

		if (pendingWork != null) {
		for (int i = 0; i < pendingWork.size(); i++) {
		dumpJobWorkItem(proto, JobStatusDumpProto.PENDING_WORK, pendingWork.get(i));

+0 −8

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.os.Parcelable;
		import android.system.ErrnoException;
		import android.system.Os;
		import android.system.OsConstants;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.annotations.GuardedBy;

		@@ -526,11 +525,4 @@ public class Network implements Parcelable {
		public String toString() {
		return Integer.toString(netId);
		}

		/** @hide */
		public void dumpDebug(ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);
		proto.write(NetworkProto.NET_ID, netId);
		proto.end(token);
		}
		}

+0 −29

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.os.Process;
		import android.text.TextUtils;
		import android.util.ArraySet;
		import android.util.Range;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.net.module.util.CollectionUtils;
		@@ -2025,34 +2024,6 @@ public final class NetworkCapabilities implements Parcelable {
		}
		}

		/** @hide */
		public void dumpDebug(@NonNull ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);

		for (int transport : getTransportTypes()) {
		proto.write(NetworkCapabilitiesProto.TRANSPORTS, transport);
		}

		for (int capability : getCapabilities()) {
		proto.write(NetworkCapabilitiesProto.CAPABILITIES, capability);
		}

		proto.write(NetworkCapabilitiesProto.LINK_UP_BANDWIDTH_KBPS, mLinkUpBandwidthKbps);
		proto.write(NetworkCapabilitiesProto.LINK_DOWN_BANDWIDTH_KBPS, mLinkDownBandwidthKbps);

		if (mNetworkSpecifier != null) {
		proto.write(NetworkCapabilitiesProto.NETWORK_SPECIFIER, mNetworkSpecifier.toString());
		}
		if (mTransportInfo != null) {
		// TODO b/120653863: write transport-specific info to proto?
		}

		proto.write(NetworkCapabilitiesProto.CAN_REPORT_SIGNAL_STRENGTH, hasSignalStrength());
		proto.write(NetworkCapabilitiesProto.SIGNAL_STRENGTH, mSignalStrength);

		proto.end(token);
		}

		/**
		* @hide
		*/

+0 −13

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ import android.os.Parcelable;
		import android.os.Process;
		import android.text.TextUtils;
		import android.util.Range;
		import android.util.proto.ProtoOutputStream;

		import java.util.Arrays;
		import java.util.List;
		@@ -675,18 +674,6 @@ public class NetworkRequest implements Parcelable {
		}
		}

		/** @hide */
		public void dumpDebug(ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);

		proto.write(NetworkRequestProto.TYPE, typeToProtoEnum(type));
		proto.write(NetworkRequestProto.REQUEST_ID, requestId);
		proto.write(NetworkRequestProto.LEGACY_TYPE, legacyType);
		networkCapabilities.dumpDebug(proto, NetworkRequestProto.NETWORK_CAPABILITIES);

		proto.end(token);
		}

		public boolean equals(@Nullable Object obj) {
		if (obj instanceof NetworkRequest == false) return false;
		NetworkRequest that = (NetworkRequest)obj;