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

Commit 88a195b5 authored by John Wang's avatar John Wang Committed by Android Git Automerger
Browse files

am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair 

Merge commit '7319d94f'

* commit '7319d94f':
  Add Event log for RAT switch.
parents f5831d43 7319d94f

telephony/java/com/android/internal/telephony/TelephonyEventLog.java

+1 −0
Original line number Diff line number Diff line
@@ -32,4 +32,5 @@ public final class TelephonyEventLog { 
    public static final int EVENT_LOG_PDP_NETWORK_DROP = 50109;

    public static final int EVENT_LOG_CDMA_DATA_SETUP_FAILED = 50110;

    public static final int EVENT_LOG_CDMA_DATA_DROP = 50111;

    public static final int EVENT_LOG_GSM_RAT_SWITCHED = 50112;

}

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

+16 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.provider.Settings.SettingNotFoundException; 
import android.provider.Telephony.Intents;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.TelephonyManager;

import android.telephony.gsm.GsmCellLocation;

import android.text.TextUtils;

import android.util.Config;
@@ -858,6 +859,21 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
        cellLoc = newCellLoc;

        newCellLoc = tcl;





        // Add an event log when network type switched

        // TODO: we may add filtering to reduce the event logged,

        // i.e. check preferred network setting, only switch to 2G, etc

        if (hasNetworkTypeChanged) {

            int cid = -1;

            GsmCellLocation loc = ((GsmCellLocation)phone.getCellLocation());

            if (loc != null) cid = loc.getCid();

            EventLog.List val = new EventLog.List(cid, networkType, newNetworkType);

            EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_GSM_RAT_SWITCHED, val);

            Log.d(LOG_TAG,

                    "RAT switched " + networkTypeToString(networkType) + " -> "

                    + networkTypeToString(newNetworkType) + " at cell " + cid);

        }



        gprsState = newGPRSState;

        networkType = newNetworkType;