diff options
| author | Wink Saville <wink@google.com> | 2011-05-26 18:23:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 18:23:17 -0700 |
| commit | 08c00205a7df0c9af94e4869b800be05eb38c660 (patch) | |
| tree | fa40c88928f1c19d5a3d9b027264fb3d511804e5 /telephony | |
| parent | 37a4069ff957ee64caba52b3f9f5d4ac70f4ea7b (diff) | |
| parent | 885f8cd75f27ec6dc8ca75233bbcdc86ed041c8c (diff) | |
| download | frameworks_base-08c00205a7df0c9af94e4869b800be05eb38c660.zip frameworks_base-08c00205a7df0c9af94e4869b800be05eb38c660.tar.gz frameworks_base-08c00205a7df0c9af94e4869b800be05eb38c660.tar.bz2 | |
am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
* commit '885f8cd75f27ec6dc8ca75233bbcdc86ed041c8c':
DataConnection : Have a separate alarm for each APN type.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnectionTracker.java | 2 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java index 5ddfcd1..5d6aaa6 100644 --- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java @@ -304,7 +304,7 @@ public abstract class DataConnectionTracker extends Handler { mIsScreenOn = false; stopNetStatPoll(); startNetStatPoll(); - } else if (action.equals(getActionIntentReconnectAlarm())) { + } else if (action.startsWith(getActionIntentReconnectAlarm())) { log("Reconnect alarm. Previous state was " + mState); onActionIntentReconnectAlarm(intent); diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index e1a6fef..f6485a4 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -22,6 +22,7 @@ import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.database.ContentObserver; import android.database.Cursor; import android.net.ConnectivityManager; @@ -1427,7 +1428,13 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { AlarmManager am = (AlarmManager) mPhone.getContext().getSystemService(Context.ALARM_SERVICE); - Intent intent = new Intent(INTENT_RECONNECT_ALARM); + + // TODO : Register the receiver only once maybe in baseclass. + IntentFilter filter = new IntentFilter(); + filter.addAction(INTENT_RECONNECT_ALARM + '.'+apnContext.getApnType()); + mPhone.getContext().registerReceiver(mIntentReceiver, filter, null, mPhone); + + Intent intent = new Intent(INTENT_RECONNECT_ALARM + '.' + apnContext.getApnType()); intent.putExtra(INTENT_RECONNECT_ALARM_EXTRA_REASON, apnContext.getReason()); intent.putExtra(INTENT_RECONNECT_ALARM_EXTRA_TYPE, apnContext.getApnType()); apnContext.setReconnectIntent(PendingIntent.getBroadcast ( |