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

Commit 8aeeb338 authored by Aaron Huang's avatar Aaron Huang
Browse files

Remove Network, NetworkRequest metrics from jobscheduler 

These metrics are deprecated so remove them from jobscheduler.
Also remove dumpDebug method from Network, NetworkRequest and
NetworkCapabilities because there's no caller anymore.

This change also for connectivity mainline module. These
three classes are inculded in framework-connectivity so
external module cannot have dependencies on its hidden API.
With this change, the dependencies can be removed.

Bug: 178777253
Test: FrameworksNetTests
      JobStoreTest
      adb shell dumpsys jobscheduler --proto
      CtsIncidentHostTestCases:JobSchedulerIncidentTest
Change-Id: Ie0c540303ba06b8fba029d2b98ae753afb08c963
parent 1fe4cb3e

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

+0 −13
Original line number Original line Diff line number Diff line
@@ -716,13 +716,6 @@ public final class ConnectivityController extends RestrictingController implemen 
                    StateControllerProto.ConnectivityController.REQUESTED_STANDBY_EXCEPTION_UIDS,

                    StateControllerProto.ConnectivityController.REQUESTED_STANDBY_EXCEPTION_UIDS,

                    mRequestedWhitelistJobs.keyAt(i));

                    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++) {

        for (int i = 0; i < mTrackedJobs.size(); i++) {

            final ArraySet<JobStatus> jobs = mTrackedJobs.valueAt(i);

            final ArraySet<JobStatus> jobs = mTrackedJobs.valueAt(i);

            for (int j = 0; j < jobs.size(); j++) {

            for (int j = 0; j < jobs.size(); j++) {
@@ -736,12 +729,6 @@ public final class ConnectivityController extends RestrictingController implemen 
                        StateControllerProto.ConnectivityController.TrackedJob.INFO);

                        StateControllerProto.ConnectivityController.TrackedJob.INFO);

                proto.write(StateControllerProto.ConnectivityController.TrackedJob.SOURCE_UID,

                proto.write(StateControllerProto.ConnectivityController.TrackedJob.SOURCE_UID,

                        js.getSourceUid());

                        js.getSourceUid());

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

                if (rn != null) {

                    rn.dumpDebug(proto,

                            StateControllerProto.ConnectivityController.TrackedJob

                                    .REQUIRED_NETWORK);

                }

                proto.end(jsToken);

                proto.end(jsToken);

            }

            }

        }

        }

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

+0 −7
Original line number Original line Diff line number Diff line
@@ -2065,9 +2065,6 @@ public final class JobStatus { 
            if (uriPerms != null) {

            if (uriPerms != null) {

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

                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) {

            if (mTotalNetworkDownloadBytes != JobInfo.NETWORK_BYTES_UNKNOWN) {

                proto.write(JobStatusDumpProto.JobInfo.TOTAL_NETWORK_DOWNLOAD_BYTES,

                proto.write(JobStatusDumpProto.JobInfo.TOTAL_NETWORK_DOWNLOAD_BYTES,

                        mTotalNetworkDownloadBytes);

                        mTotalNetworkDownloadBytes);
@@ -2156,10 +2153,6 @@ public final class JobStatus { 
            }

            }

        }

        }





        if (network != null) {

            network.dumpDebug(proto, JobStatusDumpProto.NETWORK);

        }



        if (pendingWork != null) {

        if (pendingWork != null) {

            for (int i = 0; i < pendingWork.size(); i++) {

            for (int i = 0; i < pendingWork.size(); i++) {

                dumpJobWorkItem(proto, JobStatusDumpProto.PENDING_WORK, pendingWork.get(i));

                dumpJobWorkItem(proto, JobStatusDumpProto.PENDING_WORK, pendingWork.get(i));

packages/Connectivity/framework/src/android/net/Network.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ import android.os.Parcelable; 
import android.system.ErrnoException;

import android.system.ErrnoException;

import android.system.Os;

import android.system.Os;

import android.system.OsConstants;

import android.system.OsConstants;

import android.util.proto.ProtoOutputStream;





import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.GuardedBy;
@@ -526,11 +525,4 @@ public class Network implements Parcelable { 
    public String toString() {

    public String toString() {

        return Integer.toString(netId);

        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);

    }

}
 
}

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+0 −29
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ import android.os.Process; 
import android.text.TextUtils;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Range;

import android.util.Range;

import android.util.proto.ProtoOutputStream;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.net.module.util.CollectionUtils;

import com.android.net.module.util.CollectionUtils;
@@ -2068,34 +2067,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

     * @hide

     */

     */

packages/Connectivity/framework/src/android/net/NetworkRequest.java

+0 −13
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ import android.os.Parcelable; 
import android.os.Process;

import android.os.Process;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Range;

import android.util.Range;

import android.util.proto.ProtoOutputStream;





import java.util.Arrays;

import java.util.Arrays;

import java.util.List;

import java.util.List;
@@ -647,18 +646,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) {

    public boolean equals(@Nullable Object obj) {

        if (obj instanceof NetworkRequest == false) return false;

        if (obj instanceof NetworkRequest == false) return false;

        NetworkRequest that = (NetworkRequest)obj;

        NetworkRequest that = (NetworkRequest)obj;