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

Commit dac7ca07 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Let docs tool to list the newly-visible IntDef values" am: 47196d44... 

Merge "Let docs tool to list the newly-visible IntDef values" am: 47196d44 am: cb53eced am: deb05f1e am: 1692077a

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

Change-Id: I70176fee59c4c5bd2c084d2fa42e702c6fca7bb6
parents 20fa672a 1692077a

packages/ConnectivityT/framework-t/src/android/net/NetworkStats.java

+8 −17
Original line number Original line Diff line number Diff line
@@ -327,16 +327,11 @@ public final class NetworkStats implements Parcelable, Iterable<NetworkStats.Ent 
         * @param uid uid of this {@link Entry}. {@link #UID_TETHERING} if this {@link Entry} is

         * @param uid uid of this {@link Entry}. {@link #UID_TETHERING} if this {@link Entry} is

         *            for tethering. Or {@link #UID_ALL} if this {@link NetworkStats} is only

         *            for tethering. Or {@link #UID_ALL} if this {@link NetworkStats} is only

         *            counting iface stats.

         *            counting iface stats.

         * @param set usage state of this {@link Entry}. Should be one of the following

         * @param set usage state of this {@link Entry}.

         *            values: {@link #SET_DEFAULT}, {@link #SET_FOREGROUND}.

         * @param tag tag of this {@link Entry}.

         * @param tag tag of this {@link Entry}.

         * @param metered metered state of this {@link Entry}. Should be one of the following

         * @param metered metered state of this {@link Entry}.

         *                values: {link #METERED_YES}, {link #METERED_NO}.

         * @param roaming roaming state of this {@link Entry}.

         * @param roaming roaming state of this {@link Entry}. Should be one of the following

         * @param defaultNetwork default network status of this {@link Entry}.

         *                values: {link #ROAMING_YES}, {link #ROAMING_NO}.

         * @param defaultNetwork default network status of this {@link Entry}. Should be one

         *                       of the following values: {link #DEFAULT_NETWORK_YES},

         *                       {link #DEFAULT_NETWORK_NO}.

         * @param rxBytes Number of bytes received for this {@link Entry}. Statistics should

         * @param rxBytes Number of bytes received for this {@link Entry}. Statistics should

         *                represent the contents of IP packets, including IP headers.

         *                represent the contents of IP packets, including IP headers.

         * @param rxPackets Number of packets received for this {@link Entry}. Statistics should

         * @param rxPackets Number of packets received for this {@link Entry}. Statistics should
@@ -401,8 +396,7 @@ public final class NetworkStats implements Parcelable, Iterable<NetworkStats.Ent 
        }

        }





        /**

        /**

         * @return the set state of this entry. Should be one of the following

         * @return the set state of this entry.

         * values: {@link #SET_DEFAULT}, {@link #SET_FOREGROUND}.

         */

         */

        @State public int getSet() {

        @State public int getSet() {

            return set;

            return set;
@@ -416,24 +410,21 @@ public final class NetworkStats implements Parcelable, Iterable<NetworkStats.Ent 
        }

        }





        /**

        /**

         * @return the metered state. Should be one of the following

         * @return the metered state.

         * values: {link #METERED_YES}, {link #METERED_NO}.

         */

         */

        @Meteredness public int getMetered() {

        @Meteredness public int getMetered() {

            return metered;

            return metered;

        }

        }





        /**

        /**

         * @return the roaming state. Should be one of the following

         * @return the roaming state.

         * values: {link #ROAMING_YES}, {link #ROAMING_NO}.

         */

         */

        @Roaming public int getRoaming() {

        @Roaming public int getRoaming() {

            return roaming;

            return roaming;

        }

        }





        /**

        /**

         * @return the default network state. Should be one of the following

         * @return the default network state.

         * values: {link #DEFAULT_NETWORK_YES}, {link #DEFAULT_NETWORK_NO}.

         */

         */

        @DefaultNetwork public int getDefaultNetwork() {

        @DefaultNetwork public int getDefaultNetwork() {

            return defaultNetwork;

            return defaultNetwork;