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

Commit 8806be91 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 08c00205: am 885f8cd7: Merge "DataConnection : Have a separate alarm for... 

am 08c00205: am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE

* commit '08c00205':
  DataConnection : Have a separate alarm for each APN type.
parents ce7aa225 08c00205

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+8 −1
Original line number Diff line number Diff line
@@ -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 (