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

Commit d5cc0feb authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Add the defaultNetwork element to the netstats.proto. 

This is in its own commit because AOSP has diverged from internal
master.

Bug: 35142602
Test: builds, boots
Change-Id: I75fc85b961bc919e3d6c2adce6d6861c6f2c8379
parent 35c13e5b

core/java/android/net/NetworkIdentity.java

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
        proto.write(NetworkIdentityProto.NETWORK_ID, mNetworkId);

        proto.write(NetworkIdentityProto.ROAMING, mRoaming);

        proto.write(NetworkIdentityProto.METERED, mMetered);

        proto.write(NetworkIdentityProto.DEFAULT_NETWORK, mDefaultNetwork);



        proto.end(start);

    }

core/proto/android/service/netstats.proto

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ message NetworkIdentityProto { 
    optional bool roaming = 4;



    optional bool metered = 5;



    optional bool default_network = 6;

}



// Corresponds to NetworkStatsRecorder.