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

Merge "Rename writeToProto to be dumpDebug"

Browse Source
This commit is contained in:
Jeffrey Huang
2019-12-06 18:53:15 +00:00
committed by Android (Google) Code Review
parent 57f8ed7867 3d97148418
commit ff20677c23
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/Network.java
View File

@@ -502,7 +502,7 @@ public class Network implements Parcelable {
} }
/** @hide */ /** @hide */
public void writeToProto(ProtoOutputStream proto, long fieldId) { public void dumpDebug(ProtoOutputStream proto, long fieldId) {
final long token = proto.start(fieldId); final long token = proto.start(fieldId);
proto.write(NetworkProto.NET_ID, netId); proto.write(NetworkProto.NET_ID, netId);
proto.end(token); proto.end(token);

2
core/java/android/net/NetworkCapabilities.java
View File

@@ -1602,7 +1602,7 @@ public final class NetworkCapabilities implements Parcelable {
} }
/** @hide */ /** @hide */
public void writeToProto(@NonNull ProtoOutputStream proto, long fieldId) { public void dumpDebug(@NonNull ProtoOutputStream proto, long fieldId) {
final long token = proto.start(fieldId); final long token = proto.start(fieldId);
for (int transport : getTransportTypes()) { for (int transport : getTransportTypes()) {

4
core/java/android/net/NetworkRequest.java
View File

@@ -485,13 +485,13 @@ public class NetworkRequest implements Parcelable {
} }
/** @hide */ /** @hide */
public void writeToProto(ProtoOutputStream proto, long fieldId) { public void dumpDebug(ProtoOutputStream proto, long fieldId) {
final long token = proto.start(fieldId); final long token = proto.start(fieldId);
proto.write(NetworkRequestProto.TYPE, typeToProtoEnum(type)); proto.write(NetworkRequestProto.TYPE, typeToProtoEnum(type));
proto.write(NetworkRequestProto.REQUEST_ID, requestId); proto.write(NetworkRequestProto.REQUEST_ID, requestId);
proto.write(NetworkRequestProto.LEGACY_TYPE, legacyType); proto.write(NetworkRequestProto.LEGACY_TYPE, legacyType);
networkCapabilities.writeToProto(proto, NetworkRequestProto.NETWORK_CAPABILITIES); networkCapabilities.dumpDebug(proto, NetworkRequestProto.NETWORK_CAPABILITIES);
proto.end(token); proto.end(token);
} }