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

Commit 108c4503 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge branch 'master' of... 

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
parents f06b3219 6cf2fb3f

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -6256,6 +6256,8 @@ package android.app.usage { 
  public static class NetworkStats.Bucket {

    ctor public NetworkStats.Bucket();

    method public long getEndTimeStamp();

    method public int getMetering();

    method public int getRoaming();

    method public long getRxBytes();

    method public long getRxPackets();

    method public long getStartTimeStamp();
@@ -6263,6 +6265,12 @@ package android.app.usage { 
    method public long getTxBytes();

    method public long getTxPackets();

    method public int getUid();

    field public static final int METERING_ALL = -1; // 0xffffffff

    field public static final int METERING_DEFAULT = 1; // 0x1

    field public static final int METERING_METERED = 2; // 0x2

    field public static final int ROAMING_ALL = -1; // 0xffffffff

    field public static final int ROAMING_DEFAULT = 1; // 0x1

    field public static final int ROAMING_ROAMING = 2; // 0x2

    field public static final int STATE_ALL = -1; // 0xffffffff

    field public static final int STATE_DEFAULT = 1; // 0x1

    field public static final int STATE_FOREGROUND = 2; // 0x2

api/system-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -6470,6 +6470,8 @@ package android.app.usage { 
  public static class NetworkStats.Bucket {

    ctor public NetworkStats.Bucket();

    method public long getEndTimeStamp();

    method public int getMetering();

    method public int getRoaming();

    method public long getRxBytes();

    method public long getRxPackets();

    method public long getStartTimeStamp();
@@ -6477,6 +6479,12 @@ package android.app.usage { 
    method public long getTxBytes();

    method public long getTxPackets();

    method public int getUid();

    field public static final int METERING_ALL = -1; // 0xffffffff

    field public static final int METERING_DEFAULT = 1; // 0x1

    field public static final int METERING_METERED = 2; // 0x2

    field public static final int ROAMING_ALL = -1; // 0xffffffff

    field public static final int ROAMING_DEFAULT = 1; // 0x1

    field public static final int ROAMING_ROAMING = 2; // 0x2

    field public static final int STATE_ALL = -1; // 0xffffffff

    field public static final int STATE_DEFAULT = 1; // 0x1

    field public static final int STATE_FOREGROUND = 2; // 0x2

api/test-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -6258,6 +6258,8 @@ package android.app.usage { 
  public static class NetworkStats.Bucket {

    ctor public NetworkStats.Bucket();

    method public long getEndTimeStamp();

    method public int getMetering();

    method public int getRoaming();

    method public long getRxBytes();

    method public long getRxPackets();

    method public long getStartTimeStamp();
@@ -6265,6 +6267,12 @@ package android.app.usage { 
    method public long getTxBytes();

    method public long getTxPackets();

    method public int getUid();

    field public static final int METERING_ALL = -1; // 0xffffffff

    field public static final int METERING_DEFAULT = 1; // 0x1

    field public static final int METERING_METERED = 2; // 0x2

    field public static final int ROAMING_ALL = -1; // 0xffffffff

    field public static final int ROAMING_DEFAULT = 1; // 0x1

    field public static final int ROAMING_ROAMING = 2; // 0x2

    field public static final int STATE_ALL = -1; // 0xffffffff

    field public static final int STATE_DEFAULT = 1; // 0x1

    field public static final int STATE_FOREGROUND = 2; // 0x2

core/java/android/app/usage/NetworkStats.java

+63 −2
Original line number Diff line number Diff line
@@ -121,12 +121,12 @@ public final class NetworkStats implements AutoCloseable { 
     */

    public static class Bucket {

        /**

         * Combined usage across all other states.

         * Combined usage across all states.

         */

        public static final int STATE_ALL = -1;



        /**

         * Usage not accounted in any other states.

         * Usage not accounted for in any other state.

         */

        public static final int STATE_DEFAULT = 0x1;
@@ -150,8 +150,40 @@ public final class NetworkStats implements AutoCloseable { 
         */

        public static final int UID_TETHERING = TrafficStats.UID_TETHERING;



        /**

         * Combined usage across all metering states.

         */

        public static final int METERING_ALL = -1;



        /**

         * Usage not accounted for in any other metering state.

         */

        public static final int METERING_DEFAULT = 0x1;



        /**

         * Metered usage.

         */

        public static final int METERING_METERED = 0x2;



        /**

         * Combined usage across all roaming states.

         */

        public static final int ROAMING_ALL = -1;



        /**

         * Usage not accounted for in any other roaming state.

         */

        public static final int ROAMING_DEFAULT = 0x1;



        /**

         * Roaming usage.

         */

        public static final int ROAMING_ROAMING = 0x2;



        private int mUid;

        private int mState;

        private int mMetering;

        private int mRoaming;

        private long mBeginTimeStamp;

        private long mEndTimeStamp;

        private long mRxBytes;
@@ -205,6 +237,30 @@ public final class NetworkStats implements AutoCloseable { 
            return mState;

        }



        /**

         * Metering state. One of the following values:<p/>

         * <ul>

         * <li>{@link #METERING_ALL}</li>

         * <li>{@link #METERING_DEFAULT}</li>

         * <li>{@link #METERING_METERED}</li>

         * </ul>

         */

        public int getMetering() {

            return mMetering;

        }



        /**

         * Roaming state. One of the following values:<p/>

         * <ul>

         * <li>{@link #ROAMING_ALL}</li>

         * <li>{@link #ROAMING_DEFAULT}</li>

         * <li>{@link #ROAMING_ROAMING}</li>

         * </ul>

         */

        public int getRoaming() {

            return mRoaming;

        }



        /**

         * Start timestamp of the bucket's time interval. Defined in terms of "Unix time", see

         * {@link java.lang.System#currentTimeMillis}.
@@ -398,6 +454,9 @@ public final class NetworkStats implements AutoCloseable { 
    private void fillBucketFromSummaryEntry(Bucket bucketOut) {

        bucketOut.mUid = Bucket.convertUid(mRecycledSummaryEntry.uid);

        bucketOut.mState = Bucket.convertState(mRecycledSummaryEntry.set);

        // TODO: Implement metering/roaming tracking.

        bucketOut.mMetering = Bucket.METERING_ALL;

        bucketOut.mRoaming = Bucket.ROAMING_ALL;

        bucketOut.mBeginTimeStamp = mStartTimeStamp;

        bucketOut.mEndTimeStamp = mEndTimeStamp;

        bucketOut.mRxBytes = mRecycledSummaryEntry.rxBytes;
@@ -444,6 +503,8 @@ public final class NetworkStats implements AutoCloseable { 
                        mRecycledHistoryEntry);

                bucketOut.mUid = Bucket.convertUid(getUid());

                bucketOut.mState = Bucket.STATE_ALL;

                bucketOut.mMetering = Bucket.METERING_ALL;

                bucketOut.mRoaming = Bucket.ROAMING_ALL;

                bucketOut.mBeginTimeStamp = mRecycledHistoryEntry.bucketStart;

                bucketOut.mEndTimeStamp = mRecycledHistoryEntry.bucketStart +

                        mRecycledHistoryEntry.bucketDuration;