LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 77d6e7b0ba am: 9b87bcb32d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666841

Change-Id: Ie3d8de6a1df69231367c8d476a158070d21f7f91
This commit is contained in:
Aaron Huang
2021-04-08 03:00:27 +00:00
committed by Automerger Merge Worker
parent f0c991fa6f 9b87bcb32d
commit 85d1e0a6e1
3 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/src/android/net/Network.java
View File

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

29
framework/src/android/net/NetworkCapabilities.java
View File

@@ -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;
@@ -2060,34 +2059,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
*/ */

13
framework/src/android/net/NetworkRequest.java
View File

@@ -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;
@@ -680,18 +679,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;