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

Commit af72a5bd authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d am:... 

Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d am: f0b03b17 am: 582c0420 am: 91d89b48

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id486e7ef1392ee79badacc23d48d64f204f6179e
parents 26101984 91d89b48

core/java/android/app/usage/NetworkStatsManager.java

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.content.Context; 
import android.net.ConnectivityManager;

import android.net.DataUsageRequest;

import android.net.INetworkStatsService;

import android.net.NetworkIdentity;

import android.net.NetworkStack;

import android.net.NetworkTemplate;

import android.net.netstats.provider.INetworkStatsProviderCallback;
@@ -47,6 +46,7 @@ import android.util.DataUnit; 
import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

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



import java.util.Objects;
@@ -628,7 +628,7 @@ public class NetworkStatsManager { 
            default:

                throw new IllegalArgumentException("Cannot create template for network type "

                        + networkType + ", subscriberId '"

                        + NetworkIdentity.scrubSubscriberId(subscriberId) + "'.");

                        + NetworkIdentityUtils.scrubSubscriberId(subscriberId) + "'.");

        }

        return template;

    }

core/java/android/net/NetworkIdentity.java

+6 −29
Original line number Diff line number Diff line
@@ -22,11 +22,12 @@ import android.annotation.Nullable; 
import android.content.Context;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.os.Build;

import android.service.NetworkIdentityProto;

import android.telephony.Annotation.NetworkType;

import android.util.proto.ProtoOutputStream;



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



import java.util.Objects;



/**
@@ -90,7 +91,8 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
            builder.append(mSubType);

        }

        if (mSubscriberId != null) {

            builder.append(", subscriberId=").append(scrubSubscriberId(mSubscriberId));

            builder.append(", subscriberId=")

                    .append(NetworkIdentityUtils.scrubSubscriberId(mSubscriberId));

        }

        if (mNetworkId != null) {

            builder.append(", networkId=").append(mNetworkId);
@@ -111,7 +113,8 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
        // Not dumping mSubType, subtypes are no longer supported.



        if (mSubscriberId != null) {

            proto.write(NetworkIdentityProto.SUBSCRIBER_ID, scrubSubscriberId(mSubscriberId));

            proto.write(NetworkIdentityProto.SUBSCRIBER_ID,

                    NetworkIdentityUtils.scrubSubscriberId(mSubscriberId));

        }

        proto.write(NetworkIdentityProto.NETWORK_ID, mNetworkId);

        proto.write(NetworkIdentityProto.ROAMING, mRoaming);
@@ -149,32 +152,6 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
        return mDefaultNetwork;

    }



    /**

     * Scrub given IMSI on production builds.

     */

    public static String scrubSubscriberId(String subscriberId) {

        if (Build.IS_ENG) {

            return subscriberId;

        } else if (subscriberId != null) {

            // TODO: parse this as MCC+MNC instead of hard-coding

            return subscriberId.substring(0, Math.min(6, subscriberId.length())) + "...";

        } else {

            return "null";

        }

    }



    /**

     * Scrub given IMSI on production builds.

     */

    public static String[] scrubSubscriberId(String[] subscriberId) {

        if (subscriberId == null) return null;

        final String[] res = new String[subscriberId.length];

        for (int i = 0; i < res.length; i++) {

            res[i] = NetworkIdentity.scrubSubscriberId(subscriberId[i]);

        }

        return res;

    }



    /**

     * Build a {@link NetworkIdentity} from the given {@link NetworkState} and {@code subType},

     * assuming that any mobile networks are using the current IMSI. The subType if applicable,

core/java/android/net/NetworkTemplate.java

+3 −2
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.util.Log; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

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



import java.io.ByteArrayOutputStream;

import java.io.DataInputStream;
@@ -296,11 +297,11 @@ public class NetworkTemplate implements Parcelable { 
        builder.append("matchRule=").append(getMatchRuleName(mMatchRule));

        if (mSubscriberId != null) {

            builder.append(", subscriberId=").append(

                    NetworkIdentity.scrubSubscriberId(mSubscriberId));

                    NetworkIdentityUtils.scrubSubscriberId(mSubscriberId));

        }

        if (mMatchSubscriberIds != null) {

            builder.append(", matchSubscriberIds=").append(

                    Arrays.toString(NetworkIdentity.scrubSubscriberId(mMatchSubscriberIds)));

                    Arrays.toString(NetworkIdentityUtils.scrubSubscriberIds(mMatchSubscriberIds)));

        }

        if (mNetworkId != null) {

            builder.append(", networkId=").append(mNetworkId);

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+7 −4
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ import com.android.internal.util.DumpUtils; 
import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.StatLogger;

import com.android.internal.util.XmlUtils;

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

import com.android.server.EventLogTags;

import com.android.server.LocalServices;

import com.android.server.ServiceThread;
@@ -2163,13 +2164,14 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
            if (template.matches(probeIdent)) {

                if (LOGD) {

                    Slog.d(TAG, "Found template " + template + " which matches subscriber "

                            + NetworkIdentity.scrubSubscriberId(subscriberId));

                            + NetworkIdentityUtils.scrubSubscriberId(subscriberId));

                }

                return false;

            }

        }



        Slog.i(TAG, "No policy for subscriber " + NetworkIdentity.scrubSubscriberId(subscriberId)

        Slog.i(TAG, "No policy for subscriber "

                + NetworkIdentityUtils.scrubSubscriberId(subscriberId)

                + "; generating default policy");

        final NetworkPolicy policy = buildDefaultMobilePolicy(subId, subscriberId);

        addNetworkPolicyAL(policy);
@@ -3614,14 +3616,15 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                    final int subId = mSubIdToSubscriberId.keyAt(i);

                    final String subscriberId = mSubIdToSubscriberId.valueAt(i);



                    fout.println(subId + "=" + NetworkIdentity.scrubSubscriberId(subscriberId));

                    fout.println(subId + "="

                            + NetworkIdentityUtils.scrubSubscriberId(subscriberId));

                }

                fout.decreaseIndent();



                fout.println();

                for (String[] mergedSubscribers : mMergedSubscriberIds) {

                    fout.println("Merged subscriptions: " + Arrays.toString(

                            NetworkIdentity.scrubSubscriberId(mergedSubscribers)));

                            NetworkIdentityUtils.scrubSubscriberIds(mergedSubscribers)));

                }



                fout.println();