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

Commit 8f24cfb8 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Trigger anomaly when data stuck in transient states am: 4ac58a97 am: 84134cef 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2056533



Change-Id: Ic189cda0a83ed302e1ad4936fd67a8799cad68c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0bc53f58 84134cef

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

+87 −5
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.telephony.Annotation.DataState; 
import android.telephony.Annotation.NetCapability;

import android.telephony.Annotation.NetworkType;

import android.telephony.Annotation.ValidationStatus;

import android.telephony.AnomalyReporter;

import android.telephony.DataFailCause;

import android.telephony.DataSpecificRegistrationInfo;

import android.telephony.LinkCapacityEstimate;
@@ -108,7 +109,9 @@ import java.util.List; 
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.Consumer;

import java.util.stream.Collectors;
@@ -200,6 +203,13 @@ public class DataNetwork extends StateMachine { 
    /** Event for deactivate data network response. */

    private static final int EVENT_DEACTIVATE_DATA_NETWORK_RESPONSE = 19;



    /**

     * Event for data network stuck in transient (i.e. connecting/disconnecting/handover) state for

     * too long time. Timeout value specified in {@link #MAXIMUM_CONNECTING_DURATION_MILLIS},

     * {@link #MAXIMUM_DISCONNECTING_DURATION_MILLIS}, {@link #MAXIMUM_HANDOVER_DURATION_MILLIS}.

     */

    private static final int EVENT_STUCK_IN_TRANSIENT_STATE = 20;



    /** The default MTU for IPv4 network. */

    private static final int DEFAULT_MTU_V4 = 1280;
@@ -209,6 +219,18 @@ public class DataNetwork extends StateMachine { 
    /** Invalid context id. */

    private static final int INVALID_CID = -1;



    /** The maximum time the data network can stay in {@link ConnectingState}. */

    private static final long MAXIMUM_CONNECTING_DURATION_MILLIS =

            TimeUnit.SECONDS.toMillis(60);



    /** The maximum time the data network can stay in {@link DisconnectingState}. */

    private static final long MAXIMUM_DISCONNECTING_DURATION_MILLIS =

            TimeUnit.SECONDS.toMillis(15);



    /** The maximum time the data network can stay in {@link HandoverState}. */

    private static final long MAXIMUM_HANDOVER_DURATION_MILLIS =

            TimeUnit.SECONDS.toMillis(60);



    /**

     * The data network providing default internet will have a higher score of 50. Other network

     * will have a slightly lower score of 45. The intention is other connections will not cause
@@ -967,6 +989,7 @@ public class DataNetwork extends StateMachine { 
                case EVENT_BANDWIDTH_ESTIMATE_FROM_BANDWIDTH_ESTIMATOR_CHANGED:

                case EVENT_TEAR_DOWN_NETWORK:

                case EVENT_PCO_DATA_RECEIVED:

                case EVENT_STUCK_IN_TRANSIENT_STATE:

                    // Ignore the events when not in the correct state.

                    break;

                default:
@@ -985,6 +1008,8 @@ public class DataNetwork extends StateMachine { 
    private final class ConnectingState extends State {

        @Override

        public void enter() {

            sendMessageDelayed(EVENT_STUCK_IN_TRANSIENT_STATE,

                    MAXIMUM_CONNECTING_DURATION_MILLIS);

            // Need to calculate the initial capabilities before creating the network agent.

            updateNetworkCapabilities();

            mNetworkAgent = createNetworkAgent();
@@ -1008,6 +1033,7 @@ public class DataNetwork extends StateMachine { 


        @Override

        public void exit() {

            removeMessages(EVENT_STUCK_IN_TRANSIENT_STATE);

        }



        @Override
@@ -1036,6 +1062,19 @@ public class DataNetwork extends StateMachine { 
                    // Defer the request until connected or disconnected.

                    deferMessage(msg);

                    break;

                case EVENT_STUCK_IN_TRANSIENT_STATE:

                    String message = "Data network stuck in connecting state for "

                            + TimeUnit.MILLISECONDS.toSeconds(

                                    MAXIMUM_CONNECTING_DURATION_MILLIS) + " seconds.";

                    logl(message);

                    AnomalyReporter.reportAnomaly(

                            UUID.fromString("58c56403-7ea7-4e56-a0c7-e467114d09b8"), message);

                    // Setup data failed. Use the retry logic defined in

                    // CarrierConfigManager.KEY_TELEPHONY_DATA_SETUP_RETRY_RULES_STRING_ARRAY.

                    mRetryDelayMillis = DataCallResponse.RETRY_DURATION_UNDEFINED;

                    mFailCause = DataFailCause.NO_RETRY_FAILURE;

                    transitionTo(mDisconnectedState);

                    break;

                default:

                    return NOT_HANDLED;

            }
@@ -1154,11 +1193,13 @@ public class DataNetwork extends StateMachine { 
    private final class HandoverState extends State {

        @Override

        public void enter() {

            sendMessageDelayed(EVENT_STUCK_IN_TRANSIENT_STATE, MAXIMUM_HANDOVER_DURATION_MILLIS);

            notifyPreciseDataConnectionState();

        }



        @Override

        public void exit() {

            removeMessages(EVENT_STUCK_IN_TRANSIENT_STATE);

        }



        @Override
@@ -1190,6 +1231,26 @@ public class DataNetwork extends StateMachine { 
                    AsyncResult ar = (AsyncResult) msg.obj;

                    onPcoDataReceived((PcoData) ar.result);

                    break;

                case EVENT_STUCK_IN_TRANSIENT_STATE:

                    String message = "Data service did not respond the handover request within "

                            + TimeUnit.MILLISECONDS.toSeconds(

                            MAXIMUM_HANDOVER_DURATION_MILLIS) + " seconds.";

                    logl(message);

                    AnomalyReporter.reportAnomaly(

                            UUID.fromString("15f60e1d-c985-48a9-abc4-be76e343864f"), message);



                    // Handover failed. Use the retry logic defined in

                    // CarrierConfigManager.KEY_TELEPHONY_DATA_HANDOVER_RETRY_RULES_STRING_ARRAY.

                    long retry = DataCallResponse.RETRY_DURATION_UNDEFINED;

                    int handoverFailureMode =

                            DataCallResponse.HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL;

                    mFailCause = DataFailCause.ERROR_UNSPECIFIED;

                    mDataNetworkCallback.invokeFromExecutor(

                            () -> mDataNetworkCallback.onHandoverFailed(DataNetwork.this,

                                    mFailCause, retry, handoverFailureMode));

                    // No matter handover succeeded or not, transit back to connected state.

                    transitionTo(mConnectedState);

                    break;

                default:

                    return NOT_HANDLED;

            }
@@ -1241,9 +1302,16 @@ public class DataNetwork extends StateMachine { 
    private final class DisconnectingState extends State {

        @Override

        public void enter() {

            sendMessageDelayed(EVENT_STUCK_IN_TRANSIENT_STATE,

                    MAXIMUM_DISCONNECTING_DURATION_MILLIS);

            notifyPreciseDataConnectionState();

        }



        @Override

        public void exit() {

            removeMessages(EVENT_STUCK_IN_TRANSIENT_STATE);

        }



        @Override

        public boolean processMessage(Message msg) {

            logv("event=" + eventToString(msg.what));
@@ -1252,6 +1320,19 @@ public class DataNetwork extends StateMachine { 
                    int resultCode = msg.arg1;

                    onDeactivateResponse(resultCode);

                    break;

                case EVENT_STUCK_IN_TRANSIENT_STATE:

                    // After frameworks issues deactivate data call request, RIL should report

                    // data disconnected through data call list changed event subsequently.

                    String message = "RIL did not send data call list changed event after "

                            + "deactivate data call request within "

                            + TimeUnit.MILLISECONDS.toSeconds(

                                    MAXIMUM_DISCONNECTING_DURATION_MILLIS) + " seconds.";

                    logl(message);

                    AnomalyReporter.reportAnomaly(

                            UUID.fromString("d0e4fa1c-c57b-4ba5-b4b6-8955487012ca"), message);

                    mFailCause = DataFailCause.LOST_CONNECTION;

                    transitionTo(mDisconnectedState);

                    break;

                default:

                    return NOT_HANDLED;

            }
@@ -1267,10 +1348,13 @@ public class DataNetwork extends StateMachine { 
    private final class DisconnectedState extends State {

        @Override

        public void enter() {

            logl("Data network disconnected.");

            logl("Data network disconnected. mEverConnected=" + mEverConnected);

            if (mEverConnected) {

                mDataNetworkCallback.invokeFromExecutor(() -> mDataNetworkCallback

                        .onDisconnected(DataNetwork.this, mFailCause));

                if (mTransport == AccessNetworkConstants.TRANSPORT_TYPE_WWAN) {

                    unregisterForWwanEvents();

                }

            } else {

                mDataNetworkCallback.invokeFromExecutor(() -> mDataNetworkCallback

                        .onSetupDataFailed(DataNetwork.this,
@@ -1292,10 +1376,6 @@ public class DataNetwork extends StateMachine { 
                mRil.releasePduSessionId(null, mPduSessionId);

            }



            if (mTransport == AccessNetworkConstants.TRANSPORT_TYPE_WWAN && mEverConnected) {

                unregisterForWwanEvents();

            }



            if (mVcnManager != null && mVcnPolicyChangeListener != null) {

                mVcnManager.removeVcnNetworkPolicyChangeListener(mVcnPolicyChangeListener);

            }
@@ -2841,6 +2921,8 @@ public class DataNetwork extends StateMachine { 
                return "EVENT_CARRIER_PRIVILEGED_UIDS_CHANGED";

            case EVENT_DEACTIVATE_DATA_NETWORK_RESPONSE:

                return "EVENT_DEACTIVATE_DATA_NETWORK_RESPONSE";

            case EVENT_STUCK_IN_TRANSIENT_STATE:

                return "EVENT_STUCK_IN_TRANSIENT_STATE";

            default:

                return "Unknown(" + event + ")";

        }