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

Commit 9af4893f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Id68f8f14,I4c34c5d7 

* changes:
  Allow 0 ms window for serverside manipulation
  Add anomaly reports for IMS throttle retry attempt
parents 879e132f 494b1bce

src/java/com/android/internal/telephony/SlidingWindowEventCounter.java

+3 −3
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ public class SlidingWindowEventCounter { 
    private final int mNumOccurrences;

    private final LongArrayQueue mTimestampQueueMillis;



    public SlidingWindowEventCounter(@IntRange(from = 1) final long windowSizeMillis,

    public SlidingWindowEventCounter(@IntRange(from = 0) final long windowSizeMillis,

            @IntRange(from = 2) final int numOccurrences) {

        if (windowSizeMillis <= 0) {

            throw new IllegalArgumentException("windowSizeMillis must be greater than 0");

        if (windowSizeMillis < 0) {

            throw new IllegalArgumentException("windowSizeMillis must be greater or equal to 0");

        }

        if (numOccurrences <= 1) {

            throw new IllegalArgumentException("numOccurrences must be greater than 1");

src/java/com/android/internal/telephony/data/DataConfigManager.java

+18 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.PersistableBundle;

import android.os.RegistrantList;

import android.provider.DeviceConfig;

import android.telephony.Annotation.ApnType;

import android.telephony.Annotation.NetCapability;

import android.telephony.Annotation.NetworkType;
@@ -184,6 +185,14 @@ public class DataConfigManager extends Handler { 
    @Retention(RetentionPolicy.SOURCE)

    private @interface DataConfigNetworkType {}



    /**

     * The minimal time window for duplicate release-request for IMS, the violation of which

     * triggers anomaly report in {@link DataNetworkController}.

     */

    private final long mImsRequestReleaseThrottleAnomalyWindowMs =

            DeviceConfig.getInt(DeviceConfig.NAMESPACE_TELEPHONY,

                    "ims_release_request_window", 0);



    private @NonNull final Phone mPhone;

    private @NonNull final String mLogTag;
@@ -655,6 +664,13 @@ public class DataConfigManager extends Handler { 
        }

    }



     /**

     * @return The IMS back to back request/release minimal interval.

     */

    public long getImsRequestReleaseThrottleAnomalyWindowMs() {

        return mImsRequestReleaseThrottleAnomalyWindowMs;

    }



    /**

     * Get the TCP config string, used by {@link LinkProperties#setTcpBufferSizes(String)}.

     * The config string will have the following form, with values in bytes:
@@ -957,6 +973,8 @@ public class DataConfigManager extends Handler { 
        pw.increaseIndent();

        mDataHandoverRetryRules.forEach(pw::println);

        pw.decreaseIndent();

        pw.println("IMS request release throttle anomaly window in ms="

                + mImsRequestReleaseThrottleAnomalyWindowMs);

        pw.println("Metered APN types=" + mMeteredApnTypes.stream()

                .map(ApnSetting::getApnTypeString).collect(Collectors.joining(",")));

        pw.println("Roaming metered APN types=" + mRoamingMeteredApnTypes.stream()

src/java/com/android/internal/telephony/data/DataNetworkController.java

+35 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.telephony.Annotation.DataFailureCause; 
import android.telephony.Annotation.NetCapability;

import android.telephony.Annotation.NetworkType;

import android.telephony.Annotation.ValidationStatus;

import android.telephony.AnomalyReporter;

import android.telephony.CarrierConfigManager;

import android.telephony.DataFailCause;

import android.telephony.DataSpecificRegistrationInfo;
@@ -78,6 +79,7 @@ import android.util.SparseBooleanArray; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.SlidingWindowEventCounter;

import com.android.internal.telephony.SubscriptionInfoUpdater;

import com.android.internal.telephony.TelephonyComponentFactory;

import com.android.internal.telephony.data.AccessNetworksManager.AccessNetworksManagerCallback;
@@ -112,6 +114,7 @@ import java.util.Locale; 
import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.UUID;

import java.util.concurrent.Executor;

import java.util.concurrent.TimeUnit;

import java.util.function.Function;
@@ -201,6 +204,13 @@ public class DataNetworkController extends Handler { 
    private static final long REEVALUATE_PREFERRED_TRANSPORT_DELAY_MILLIS =

            TimeUnit.SECONDS.toMillis(3);



    /**

     * The maximum number of occurrences within a time window defined by

     * {@link DataConfigManager#getImsRequestReleaseThrottleAnomalyWindowMs}

     * for duplicate release-request for IMS, the violation of which triggers anomaly report.

     */

    private static final int IMS_REQUEST_RELEASE_THROTTLE_ANOMALY_NUM_OCCURRENCES = 2;



    private final Phone mPhone;

    private final String mLogTag;

    private final LocalLog mLocalLog = new LocalLog(128);
@@ -325,6 +335,15 @@ public class DataNetworkController extends Handler { 
     */

    private boolean mPendingTearDownAllNetworks = false;



    /** The counter to detect back to back release/request IMS network. */

    private final @NonNull SlidingWindowEventCounter mImsThrottleCounter;



    /**

     * The capabilities of the latest released IMS request. To detect back to back release/request

     * IMS network.

     */

    private int[] mLastReleasedImsRequestCapabilities;



    /** The broadcast receiver. */

    private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {

        @Override
@@ -739,6 +758,9 @@ public class DataNetworkController extends Handler { 
        }

        mDataConfigManager = new DataConfigManager(mPhone, looper);



        mImsThrottleCounter = new SlidingWindowEventCounter(

                mDataConfigManager.getImsRequestReleaseThrottleAnomalyWindowMs(),

                IMS_REQUEST_RELEASE_THROTTLE_ANOMALY_NUM_OCCURRENCES);

        mDataSettingsManager = TelephonyComponentFactory.getInstance().inject(

                DataSettingsManager.class.getName())

                .makeDataSettingsManager(mPhone, this, looper,
@@ -1052,6 +1074,15 @@ public class DataNetworkController extends Handler { 
     * @param networkRequest The network request.

     */

    private void onAddNetworkRequest(@NonNull TelephonyNetworkRequest networkRequest) {

        if (Arrays.equals(mLastReleasedImsRequestCapabilities, networkRequest.getCapabilities())

                && mImsThrottleCounter.addOccurrence()) {

            AnomalyReporter.reportAnomaly(

                    UUID.fromString("ead6f8db-d2f2-4ed3-8da5-1d8560fe7daf"),

                    networkRequest.getNativeNetworkRequest().getRequestorPackageName()

                            + " requested with same capabilities falls under "

                            + mDataConfigManager.getImsRequestReleaseThrottleAnomalyWindowMs()

                            + " ms window.");

        }

        if (!mAllNetworkRequestList.add(networkRequest)) {

            loge("onAddNetworkRequest: Duplicate network request. " + networkRequest);

            return;
@@ -1766,6 +1797,10 @@ public class DataNetworkController extends Handler { 
    }



    private void onRemoveNetworkRequest(@NonNull TelephonyNetworkRequest networkRequest) {

        if (networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_IMS)) {

            mImsThrottleCounter.addOccurrence();

            mLastReleasedImsRequestCapabilities = networkRequest.getCapabilities();

        }

        if (!mAllNetworkRequestList.remove(networkRequest)) {

            loge("onRemoveNetworkRequest: Network request does not exist. " + networkRequest);

            return;

tests/telephonytests/src/com/android/internal/telephony/SlidingWindowEventCounterTest.java

+6 −0
Original line number Diff line number Diff line
@@ -75,5 +75,11 @@ public class SlidingWindowEventCounterTest { 
        counter.addOccurrence(mInitialTime + 101);

        counter.addOccurrence(mInitialTime + 102);

        assertFalse(counter.isInWindow());



        counter = new SlidingWindowEventCounter(0, 2);

        counter.addOccurrence(mInitialTime);

        counter.addOccurrence(mInitialTime);

        assertTrue(counter.isInWindow());

        assertFalse(counter.addOccurrence(mInitialTime + 1));

    }

}