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

Commit de707749 authored by Wink Saville's avatar Wink Saville Committed by Gerrit Code Review
Browse files

Merge "Telephony: Update Permanent Fail and Event Loggable Types"

parents 64f509b2 0c5d5ba2

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

+7 −3
Original line number Diff line number Diff line
@@ -163,9 +163,11 @@ public abstract class DataConnection extends StateMachine { 
        public boolean isPermanentFail() {

            return (this == OPERATOR_BARRED) || (this == MISSING_UNKNOWN_APN) ||

                   (this == UNKNOWN_PDP_ADDRESS_TYPE) || (this == USER_AUTHENTICATION) ||

                   (this == SERVICE_OPTION_NOT_SUPPORTED) ||

                   (this == ACTIVATION_REJECT_GGSN) || (this == SERVICE_OPTION_NOT_SUPPORTED) ||

                   (this == SERVICE_OPTION_NOT_SUBSCRIBED) || (this == NSAPI_IN_USE) ||

                   (this == PROTOCOL_ERRORS);

                   (this == ONLY_IPV4_ALLOWED) || (this == ONLY_IPV6_ALLOWED) ||

                   (this == PROTOCOL_ERRORS) || (this == SIGNAL_LOST) ||

                   (this == RADIO_POWER_OFF) || (this == TETHERED_CALL_ACTIVE);

        }



        public boolean isEventLoggable() {
@@ -175,7 +177,9 @@ public abstract class DataConnection extends StateMachine { 
                    (this == SERVICE_OPTION_NOT_SUBSCRIBED) ||

                    (this == SERVICE_OPTION_NOT_SUPPORTED) ||

                    (this == SERVICE_OPTION_OUT_OF_ORDER) || (this == NSAPI_IN_USE) ||

                    (this == PROTOCOL_ERRORS) ||

                    (this == ONLY_IPV4_ALLOWED) || (this == ONLY_IPV6_ALLOWED) ||

                    (this == PROTOCOL_ERRORS) || (this == SIGNAL_LOST) ||

                    (this == RADIO_POWER_OFF) || (this == TETHERED_CALL_ACTIVE) ||

                    (this == UNACCEPTABLE_NETWORK_PARAMETER);

        }