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

Commit 9f88c351 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

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

* commit 'de707749':
  Telephony: Update Permanent Fail and Event Loggable Types
parents 5aea02db de707749

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

+7 −3
Original line number Diff line number Diff line
@@ -170,9 +170,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() {
@@ -182,7 +184,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);

        }