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

Commit 28900a7b authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."

parents b5718c29 d38e711d

telephony/java/com/android/internal/telephony/DataConnectionTracker.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -225,7 +225,8 @@ public abstract class DataConnectionTracker extends Handler { 
    //       having to have different values for GSM and

    //       having to have different values for GSM and

    //       CDMA. If so we can then remove the need for

    //       CDMA. If so we can then remove the need for

    //       getActionIntentReconnectAlarm.

    //       getActionIntentReconnectAlarm.

    protected static final String INTENT_RECONNECT_ALARM_EXTRA_REASON = "reason";

    protected static final String INTENT_RECONNECT_ALARM_EXTRA_REASON =

        "reconnect_alarm_extra_reason";





    // Used for debugging. Send the INTENT with an optional counter value with the number

    // Used for debugging. Send the INTENT with an optional counter value with the number

    // of times the setup is to fail before succeeding. If the counter isn't passed the

    // of times the setup is to fail before succeeding. If the counter isn't passed the

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -131,7 +131,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 




    private static final String INTENT_RECONNECT_ALARM =

    private static final String INTENT_RECONNECT_ALARM =

        "com.android.internal.telephony.gprs-reconnect";

        "com.android.internal.telephony.gprs-reconnect";

    private static final String INTENT_RECONNECT_ALARM_EXTRA_TYPE = "type";

    private static final String INTENT_RECONNECT_ALARM_EXTRA_TYPE = "reconnect_alarm_extra_type";





    private static final String INTENT_DATA_STALL_ALARM =

    private static final String INTENT_DATA_STALL_ALARM =

        "com.android.internal.telephony.gprs-data-stall";

        "com.android.internal.telephony.gprs-data-stall";