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

Commit ce8c105b authored by Sarah Chin's avatar Sarah Chin
Browse files

Add missing logs for new data stack 

Test: build
Bug: 196597630
Change-Id: I9e07e579a867ca87c9d219a0670ecf8fb2e454fe
Merged-In: I9e07e579a867ca87c9d219a0670ecf8fb2e454fe
parent 1ef32bad

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

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ public class NetworkTypeController extends StateMachine { 
        sEvents[EVENT_INITIALIZE] = "EVENT_INITIALIZE";

        sEvents[EVENT_PHYSICAL_CHANNEL_CONFIG_CHANGED] = "EVENT_PHYSICAL_CHANNEL_CONFIG_CHANGED";

        sEvents[EVENT_PCO_DATA_CHANGED] = "EVENT_PCO_DATA_CHANGED";

        sEvents[EVENT_BANDWIDTH_CHANGED] = "EVENT_BANDWIDTH_CHANGED";

        sEvents[EVENT_UPDATE_NR_ADVANCED_STATE] = "EVENT_UPDATE_NR_ADVANCED_STATE";

    }

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

+72 −0
Original line number Diff line number Diff line
@@ -229,6 +229,18 @@ public class DataNetwork extends StateMachine { 
                    TEAR_DOWN_REASON_HANDOVER_NOT_ALLOWED,

                    TEAR_DOWN_REASON_VCN_REQUESTED,

                    TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED,

                    TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED,

                    TEAR_DOWN_REASON_NOT_IN_SERVICE,

                    TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY,

                    TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL,

                    TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE,

                    TEAR_DOWN_REASON_EMERGENCY_CALL,

                    TEAR_DOWN_REASON_RETRY_SCHEDULED,

                    TEAR_DOWN_REASON_DATA_THROTTLED,

                    TEAR_DOWN_REASON_DATA_PROFILE_INVALID,

                    TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED,

                    TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY,

                    TEAR_DOWN_REASON_ILLEGAL_STATE,

            })

    public @interface TearDownReason {}
@@ -280,6 +292,42 @@ public class DataNetwork extends StateMachine { 
    /** Data network tear down due to VOPS no longer supported. */

    public static final int TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED = 16;



    /** Data network tear down due to default data unselected. */

    public static final int TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED = 17;



    /** Data network tear down due to device not in service. */

    public static final int TEAR_DOWN_REASON_NOT_IN_SERVICE = 18;



    /** Data network tear down due to data config not ready. */

    public static final int TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY = 19;



    /** Data network tear down due to tear down all pending. */

    public static final int TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL = 20;



    /** Data network tear down due to no suitable data profile. */

    public static final int TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE = 21;



    /** Data network tear down due to emergency call. */

    public static final int TEAR_DOWN_REASON_EMERGENCY_CALL = 22;



    /** Data network tear down due to retry scheduled. */

    public static final int TEAR_DOWN_REASON_RETRY_SCHEDULED = 23;



    /** Data network tear down due to data throttled. */

    public static final int TEAR_DOWN_REASON_DATA_THROTTLED = 24;



    /** Data network tear down due to data profile invalid. */

    public static final int TEAR_DOWN_REASON_DATA_PROFILE_INVALID = 25;



    /** Data network tear down due to data profile not preferred. */

    public static final int TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED = 26;



    /** Data network tear down due to not allowed by policy. */

    public static final int TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY = 27;



    /** Data network tear down due to illegal state. */

    public static final int TEAR_DOWN_REASON_ILLEGAL_STATE = 28;



    @IntDef(prefix = {"BANDWIDTH_SOURCE_"},

            value = {

                    BANDWIDTH_SOURCE_UNKNOWN,
@@ -2547,6 +2595,30 @@ public class DataNetwork extends StateMachine { 
                return "TEAR_DOWN_REASON_VCN_REQUESTED";

            case TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED:

                return "TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED";

            case TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED:

                return "TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED";

            case TEAR_DOWN_REASON_NOT_IN_SERVICE:

                return "TEAR_DOWN_REASON_NOT_IN_SERVICE";

            case TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY:

                return "TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY";

            case TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL:

                return "TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL";

            case TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE:

                return "TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE";

            case TEAR_DOWN_REASON_EMERGENCY_CALL:

                return "TEAR_DOWN_REASON_EMERGENCY_CALL";

            case TEAR_DOWN_REASON_RETRY_SCHEDULED:

                return "TEAR_DOWN_REASON_RETRY_SCHEDULED";

            case TEAR_DOWN_REASON_DATA_THROTTLED:

                return "TEAR_DOWN_REASON_DATA_THROTTLED";

            case TEAR_DOWN_REASON_DATA_PROFILE_INVALID:

                return "TEAR_DOWN_REASON_DATA_PROFILE_INVALID";

            case TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED:

                return "TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED";

            case TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY:

                return "TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY";

            case TEAR_DOWN_REASON_ILLEGAL_STATE:

                return "TEAR_DOWN_REASON_ILLEGAL_STATE";

            default:

                return "UNKNOWN(" + reason + ")";

        }

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

+26 −2
Original line number Diff line number Diff line
@@ -1608,20 +1608,44 @@ public class DataNetworkController extends Handler { 
                    return DataNetwork.TEAR_DOWN_REASON_DATA_DISABLED;

                case ROAMING_DISABLED:

                    return DataNetwork.TEAR_DOWN_REASON_ROAMING_DISABLED;

                case DEFAULT_DATA_UNSELECTED:

                    return DataNetwork.TEAR_DOWN_REASON_DEFAULT_DATA_UNSELECTED;

                case NOT_IN_SERVICE:

                    return DataNetwork.TEAR_DOWN_REASON_NOT_IN_SERVICE;

                case DATA_CONFIG_NOT_READY:

                    return DataNetwork.TEAR_DOWN_REASON_DATA_CONFIG_NOT_READY;

                case SIM_NOT_READY:

                    return DataNetwork.TEAR_DOWN_REASON_SIM_REMOVAL;

                case CONCURRENT_VOICE_DATA_NOT_ALLOWED:

                    return DataNetwork.TEAR_DOWN_REASON_CONCURRENT_VOICE_DATA_NOT_ALLOWED;

                case DATA_RESTRICTED_BY_NETWORK:

                    return DataNetwork.TEAR_DOWN_REASON_DATA_RESTRICTED_BY_NETWORK;

                case RADIO_DISABLED_BY_CARRIER:

                    return DataNetwork.TEAR_DOWN_REASON_POWER_OFF_BY_CARRIER;

                case RADIO_POWER_OFF:

                    return DataNetwork.TEAR_DOWN_REASON_AIRPLANE_MODE_ON;

                case PENDING_TEAR_DOWN_ALL:

                    return DataNetwork.TEAR_DOWN_REASON_PENDING_TEAR_DOWN_ALL;

                case RADIO_DISABLED_BY_CARRIER:

                    return DataNetwork.TEAR_DOWN_REASON_POWER_OFF_BY_CARRIER;

                case DATA_SERVICE_NOT_READY:

                    return DataNetwork.TEAR_DOWN_REASON_DATA_SERVICE_NOT_READY;

                case NO_SUITABLE_DATA_PROFILE:

                    return DataNetwork.TEAR_DOWN_REASON_NO_SUITABLE_DATA_PROFILE;

                case DATA_NETWORK_TYPE_NOT_ALLOWED:

                    return DataNetwork.TEAR_DOWN_REASON_RAT_NOT_ALLOWED;

                case EMERGENCY_CALL:

                    return DataNetwork.TEAR_DOWN_REASON_EMERGENCY_CALL;

                case RETRY_SCHEDULED:

                    return DataNetwork.TEAR_DOWN_REASON_RETRY_SCHEDULED;

                case DATA_THROTTLED:

                    return DataNetwork.TEAR_DOWN_REASON_DATA_THROTTLED;

                case DATA_PROFILE_INVALID:

                    return DataNetwork.TEAR_DOWN_REASON_DATA_PROFILE_INVALID;

                case DATA_PROFILE_NOT_PREFERRED:

                    return DataNetwork.TEAR_DOWN_REASON_DATA_PROFILE_NOT_PREFERRED;

                case NOT_ALLOWED_BY_POLICY:

                    return DataNetwork.TEAR_DOWN_REASON_NOT_ALLOWED_BY_POLICY;

                case ILLEGAL_STATE:

                    return DataNetwork.TEAR_DOWN_REASON_ILLEGAL_STATE;

                case VOPS_NOT_SUPPORTED:

                    return DataNetwork.TEAR_DOWN_REASON_VOPS_NOT_SUPPORTED;

            }