diff options
| author | Wink Saville <wink@google.com> | 2012-02-07 15:56:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-07 15:56:23 -0800 |
| commit | 28900a7b36c372b953648a6ce4c8858de25e9197 (patch) | |
| tree | dbe175cdcc92f3d88865d3c5b2397884f1fc4284 /telephony | |
| parent | b5718c29aece51dd337e719c5b94be867833d53e (diff) | |
| parent | d38e711dda8ce41d9f99fdffc51c83fc241f2174 (diff) | |
| download | frameworks_base-28900a7b36c372b953648a6ce4c8858de25e9197.zip frameworks_base-28900a7b36c372b953648a6ce4c8858de25e9197.tar.gz frameworks_base-28900a7b36c372b953648a6ce4c8858de25e9197.tar.bz2 | |
Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnectionTracker.java | 3 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java index 664a091..5d76484 100644 --- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java @@ -225,7 +225,8 @@ public abstract class DataConnectionTracker extends Handler { // having to have different values for GSM and // CDMA. If so we can then remove the need for // 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 // of times the setup is to fail before succeeding. If the counter isn't passed the diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index 8f04dba..66e9487 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -131,7 +131,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { private static final String INTENT_RECONNECT_ALARM = "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 = "com.android.internal.telephony.gprs-data-stall"; |