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

Commit 3e883dae authored by Antonio Cansado's avatar Antonio Cansado
Browse files

Fixing network tags. 

- History was not populating the tag, so all of them appeared as tag 0x0.

Bug: 28345240
Change-Id: I9c898695bbe8d18531f7ea432ebb8f02d72e5d27
parent 9ef0ce17

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

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

    private int mUidOrUidIndex;



    /**

     * Tag id in case if was specified in the query.

     */

    private int mTag = android.net.NetworkStats.TAG_NONE;



    /**

     * The session while the query requires it, null if all the stats have been collected or close()

     * has been called.
@@ -434,7 +439,7 @@ public final class NetworkStats implements AutoCloseable { 
            mHistory = mSession.getHistoryIntervalForUid(mTemplate, uid,

                    android.net.NetworkStats.SET_ALL, tag,

                    NetworkStatsHistory.FIELD_ALL, mStartTimeStamp, mEndTimeStamp);

            setSingleUid(uid);

            setSingleUidTag(uid, tag);

        } catch (RemoteException e) {

            Log.w(TAG, e);

            // Leaving mHistory null
@@ -538,6 +543,7 @@ public final class NetworkStats implements AutoCloseable { 
                mRecycledHistoryEntry = mHistory.getValues(mEnumerationIndex++,

                        mRecycledHistoryEntry);

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

                bucketOut.mTag = Bucket.convertTag(mTag);

                bucketOut.mState = Bucket.STATE_ALL;

                bucketOut.mRoaming = Bucket.ROAMING_ALL;

                bucketOut.mBeginTimeStamp = mRecycledHistoryEntry.bucketStart;
@@ -579,8 +585,9 @@ public final class NetworkStats implements AutoCloseable { 
        return mUidOrUidIndex;

    }



    private void setSingleUid(int uid) {

    private void setSingleUidTag(int uid, int tag) {

        mUidOrUidIndex = uid;

        mTag = tag;

    }



    private void stepUid() {