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

Commit 3c53e4c8 authored by Junyu Lai's avatar Junyu Lai
Browse files

[MS19.1] Fix several hidden API dependencies 

This includes:
1. Use android.util.IndentingPrintWriter instead of the
   deprecated internal one.
2. Replace usages of IntArray with CollectionUtils and ArrayList.
3. Replace usages of ArrayUtils with CollectionUtils.
4. Refactor MathUtils.constrain functions into NetworkStatsUtils.
5. Replace Maps.newHashMap and Lists.newArrayList with public
   class constructors.
6. Replace Slog with Log.

Test: FrameworksNetTests NetworkStaticLibTests
Bug: 204830222
Change-Id: If009194ad5668a6d48dd341ea6d325028ce56d42
parent eccbcfc7

packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStats.java

+5 −3
Original line number Diff line number Diff line
@@ -24,13 +24,15 @@ import android.net.NetworkStatsHistory; 
import android.net.NetworkTemplate;

import android.net.TrafficStats;

import android.os.RemoteException;

import android.util.IntArray;

import android.util.Log;



import com.android.net.module.util.CollectionUtils;



import dalvik.system.CloseGuard;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;



/**

 * Class providing enumeration over buckets of network usage statistics. {@link NetworkStats} objects
@@ -568,7 +570,7 @@ public final class NetworkStats implements AutoCloseable { 
        //       the filtering logic below can be removed.

        int[] uids = mSession.getRelevantUids();

        // Filtering of uids with empty history.

        IntArray filteredUids = new IntArray(uids.length);

        final ArrayList<Integer> filteredUids = new ArrayList<>();

        for (int uid : uids) {

            try {

                NetworkStatsHistory history = mSession.getHistoryIntervalForUid(mTemplate, uid,
@@ -581,7 +583,7 @@ public final class NetworkStats implements AutoCloseable { 
                Log.w(TAG, "Error while getting history of uid " + uid, e);

            }

        }

        mUids = filteredUids.toArray();

        mUids = CollectionUtils.toIntArray(filteredUids);

        mUidOrUidIndex = -1;

        stepHistory();

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import android.os.SystemClock; 
import android.util.SparseBooleanArray;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.net.module.util.CollectionUtils;



import libcore.util.EmptyArray;
@@ -1185,7 +1185,7 @@ public final class NetworkStats implements Parcelable { 
     * @hide

     */

    public void removeUids(int[] uids) {

        filter(e -> !ArrayUtils.contains(uids, e.uid));

        filter(e -> !CollectionUtils.contains(uids, e.uid));

    }



    /**
@@ -1218,7 +1218,7 @@ public final class NetworkStats implements Parcelable { 
        filter(e -> (limitUid == UID_ALL || limitUid == e.uid)

                && (limitTag == TAG_ALL || limitTag == e.tag)

                && (limitIfaces == INTERFACES_ALL

                    || ArrayUtils.contains(limitIfaces, e.iface)));

                    || CollectionUtils.contains(limitIfaces, e.iface)));

    }



    /**

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

+15 −18
Original line number Diff line number Diff line
@@ -40,21 +40,17 @@ import android.telephony.SubscriptionPlan; 
import android.text.format.DateUtils;

import android.util.ArrayMap;

import android.util.AtomicFile;

import android.util.IntArray;

import android.util.MathUtils;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.Range;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FastDataInput;

import com.android.internal.util.FastDataOutput;

import com.android.internal.util.FileRotator;

import com.android.internal.util.IndentingPrintWriter;



import com.google.android.collect.Lists;

import com.google.android.collect.Maps;

import com.android.net.module.util.CollectionUtils;

import com.android.net.module.util.NetworkStatsUtils;



import libcore.io.IoUtils;
@@ -196,11 +192,11 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 


    public int[] getRelevantUids(@NetworkStatsAccess.Level int accessLevel,

                final int callerUid) {

        IntArray uids = new IntArray();

        final ArrayList<Integer> uids = new ArrayList<>();

        for (int i = 0; i < mStats.size(); i++) {

            final Key key = mStats.keyAt(i);

            if (NetworkStatsAccess.isAccessibleToUser(key.uid, callerUid, accessLevel)) {

                int j = uids.binarySearch(key.uid);

                int j = Collections.binarySearch(uids, new Integer(key.uid));



                if (j < 0) {

                    j = ~j;
@@ -208,7 +204,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 
                }

            }

        }

        return uids.toArray();

        return CollectionUtils.toIntArray(uids);

    }



    /**
@@ -225,7 +221,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 


        // 180 days of history should be enough for anyone; if we end up needing

        // more, we'll dynamically grow the history object.

        final int bucketEstimate = (int) MathUtils.constrain(((end - start) / mBucketDuration), 0,

        final int bucketEstimate = (int) NetworkStatsUtils.constrain(

                ((end - start) / mBucketDuration), 0,

                (180 * DateUtils.DAY_IN_MILLIS) / mBucketDuration);

        final NetworkStatsHistory combined = new NetworkStatsHistory(

                mBucketDuration, bucketEstimate, fields);
@@ -316,7 +313,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 


            final long deltaTotal = combined.getTotalBytes() - beforeTotal;

            if (deltaTotal != 0) {

                Slog.d(TAG, "Augmented network usage by " + deltaTotal + " bytes");

                Log.d(TAG, "Augmented network usage by " + deltaTotal + " bytes");

            }



            // Finally we can slice data as originally requested
@@ -489,11 +486,11 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 


    private void write(DataOutput out) throws IOException {

        // cluster key lists grouped by ident

        final HashMap<NetworkIdentitySet, ArrayList<Key>> keysByIdent = Maps.newHashMap();

        final HashMap<NetworkIdentitySet, ArrayList<Key>> keysByIdent = new HashMap<>();

        for (Key key : mStats.keySet()) {

            ArrayList<Key> keys = keysByIdent.get(key.ident);

            if (keys == null) {

                keys = Lists.newArrayList();

                keys = new ArrayList<>();

                keysByIdent.put(key.ident, keys);

            }

            keys.add(key);
@@ -640,12 +637,12 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 
     * {@link TrafficStats#UID_REMOVED}.

     */

    public void removeUids(int[] uids) {

        final ArrayList<Key> knownKeys = Lists.newArrayList();

        final ArrayList<Key> knownKeys = new ArrayList<>();

        knownKeys.addAll(mStats.keySet());



        // migrate all UID stats into special "removed" bucket

        for (Key key : knownKeys) {

            if (ArrayUtils.contains(uids, key.uid)) {

            if (CollectionUtils.contains(uids, key.uid)) {

                // only migrate combined TAG_NONE history

                if (key.tag == TAG_NONE) {

                    final NetworkStatsHistory uidHistory = mStats.get(key);
@@ -672,7 +669,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 
    }



    private ArrayList<Key> getSortedKeys() {

        final ArrayList<Key> keys = Lists.newArrayList();

        final ArrayList<Key> keys = new ArrayList<>();

        keys.addAll(mStats.keySet());

        Collections.sort(keys);

        return keys;

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

+13 −7
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static android.net.NetworkStatsHistory.ParcelUtils.readLongArray; 
import static android.net.NetworkStatsHistory.ParcelUtils.writeLongArray;

import static android.text.format.DateUtils.SECOND_IN_MILLIS;



import static com.android.internal.util.ArrayUtils.total;

import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRational;



import android.compat.annotation.UnsupportedAppUsage;
@@ -37,10 +36,11 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.service.NetworkStatsHistoryBucketProto;

import android.service.NetworkStatsHistoryProto;

import android.util.MathUtils;

import android.util.IndentingPrintWriter;

import android.util.proto.ProtoOutputStream;



import com.android.internal.util.IndentingPrintWriter;

import com.android.net.module.util.CollectionUtils;

import com.android.net.module.util.NetworkStatsUtils;



import libcore.util.EmptyArray;
@@ -174,7 +174,7 @@ public class NetworkStatsHistory implements Parcelable { 
                txPackets = new long[bucketStart.length];

                operations = new long[bucketStart.length];

                bucketCount = bucketStart.length;

                totalBytes = total(rxBytes) + total(txBytes);

                totalBytes = CollectionUtils.total(rxBytes) + CollectionUtils.total(txBytes);

                break;

            }

            case VERSION_ADD_PACKETS:
@@ -189,7 +189,7 @@ public class NetworkStatsHistory implements Parcelable { 
                txPackets = readVarLongArray(in);

                operations = readVarLongArray(in);

                bucketCount = bucketStart.length;

                totalBytes = total(rxBytes) + total(txBytes);

                totalBytes = CollectionUtils.total(rxBytes) + CollectionUtils.total(txBytes);

                break;

            }

            default: {
@@ -267,7 +267,7 @@ public class NetworkStatsHistory implements Parcelable { 
        } else {

            index -= 1;

        }

        return MathUtils.constrain(index, 0, bucketCount - 1);

        return NetworkStatsUtils.constrain(index, 0, bucketCount - 1);

    }



    /**
@@ -281,7 +281,7 @@ public class NetworkStatsHistory implements Parcelable { 
        } else {

            index += 1;

        }

        return MathUtils.constrain(index, 0, bucketCount - 1);

        return NetworkStatsUtils.constrain(index, 0, bucketCount - 1);

    }



    /**
@@ -349,6 +349,9 @@ public class NetworkStatsHistory implements Parcelable { 


        // create any buckets needed by this range

        ensureBuckets(start, end);

        // Return fast if there is still no entry. This would typically happen when the start,

        // end or duration are not valid values, e.g. start > end, negative duration value, etc.

        if (bucketCount == 0) return;



        // distribute data usage into buckets

        long duration = end - start;
@@ -560,6 +563,9 @@ public class NetworkStatsHistory implements Parcelable { 
        entry.txPackets = txPackets != null ? 0 : UNKNOWN;

        entry.operations = operations != null ? 0 : UNKNOWN;



        // Return fast if there is no entry.

        if (bucketCount == 0) return entry;



        final int startIndex = getIndexAfter(end);

        for (int i = startIndex; i >= 0; i--) {

            final long curStart = bucketStart[i];

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

+7 −7
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.util.ArraySet;



import com.android.internal.util.ArrayUtils;

import com.android.net.module.util.CollectionUtils;

import com.android.net.module.util.NetworkIdentityUtils;

import com.android.net.module.util.NetworkStatsUtils;
@@ -703,7 +703,7 @@ public final class NetworkTemplate implements Parcelable { 
     */

    public boolean matchesSubscriberId(@Nullable String subscriberId) {

        return mSubscriberIdMatchRule == NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_ALL

                || ArrayUtils.contains(mMatchSubscriberIds, subscriberId);

                || CollectionUtils.contains(mMatchSubscriberIds, subscriberId);

    }



    /**
@@ -723,8 +723,8 @@ public final class NetworkTemplate implements Parcelable { 
            // TODO: consider matching against WiMAX subscriber identity

            return true;

        } else {

            return ident.mType == TYPE_MOBILE && !ArrayUtils.isEmpty(mMatchSubscriberIds)

                    && ArrayUtils.contains(mMatchSubscriberIds, ident.mSubscriberId)

            return ident.mType == TYPE_MOBILE && !CollectionUtils.isEmpty(mMatchSubscriberIds)

                    && CollectionUtils.contains(mMatchSubscriberIds, ident.mSubscriberId)

                    && matchesCollapsedRatType(ident);

        }

    }
@@ -835,8 +835,8 @@ public final class NetworkTemplate implements Parcelable { 
     */

    private boolean matchesCarrier(NetworkIdentity ident) {

        return ident.mSubscriberId != null

                && !ArrayUtils.isEmpty(mMatchSubscriberIds)

                && ArrayUtils.contains(mMatchSubscriberIds, ident.mSubscriberId);

                && !CollectionUtils.isEmpty(mMatchSubscriberIds)

                && CollectionUtils.contains(mMatchSubscriberIds, ident.mSubscriberId);

    }



    private boolean matchesMobileWildcard(NetworkIdentity ident) {
@@ -953,7 +953,7 @@ public final class NetworkTemplate implements Parcelable { 
        if (template.mSubscriberId == null) return template;



        for (String[] merged : mergedList) {

            if (ArrayUtils.contains(merged, template.mSubscriberId)) {

            if (CollectionUtils.contains(merged, template.mSubscriberId)) {

                // Requested template subscriber is part of the merge group; return

                // a template that matches all merged subscribers.

                return new NetworkTemplate(template.mMatchRule, merged[0], merged,