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

Commit 58d8a0bb authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 404 into donut 

* changes:
  normalize the DATA_STATE_RADIO_OFF event log id definition
parents 8486930c e290ed0f

telephony/java/com/android/internal/telephony/ServiceStateTracker.java

+0 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ public abstract class ServiceStateTracker extends Handler { 


    // Event Log Tags

    protected static final int EVENT_LOG_CGREG_FAIL = 50107;

    protected static final int EVENT_DATA_STATE_RADIO_OFF = 50108;



    //***** Time Zones

    protected static final String TIMEZONE_PROPERTY = "persist.sys.timezone";
@@ -241,4 +240,3 @@ public abstract class ServiceStateTracker extends Handler { 
        pollingContext = new int[1];

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ public final class TelephonyEventLog { 
    public static final int EVENT_LOG_RADIO_PDP_SETUP_FAIL = 50105;

    public static final int EVENT_LOG_CALL_DROP = 50106;

    public static final int EVENT_LOG_CGREG_FAIL = 50107;

    public static final int EVENT_DATA_STATE_RADIO_OFF = 50108;

    public static final int EVENT_LOG_DATA_STATE_RADIO_OFF = 50108;

    public static final int EVENT_LOG_PDP_NETWORK_DROP = 50109;

}

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { 
                EventLog.List val = new EventLog.List(

                        dcTracker.getStateInString(),

                        (dcTracker.getAnyDataEnabled() ? 1 : 0) );

                EventLog.writeEvent(TelephonyEventLog.EVENT_DATA_STATE_RADIO_OFF, val);

                EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_DATA_STATE_RADIO_OFF, val);

            }

            dcTracker.cleanConnectionBeforeRadioOff();

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

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
                EventLog.List val = new EventLog.List(

                        dcTracker.getStateInString(),

                        (dcTracker.getAnyDataEnabled() ? 1 : 0) );

                EventLog.writeEvent(TelephonyEventLog.EVENT_DATA_STATE_RADIO_OFF, val);

                EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_DATA_STATE_RADIO_OFF, val);

            }

            dcTracker.cleanConnectionBeforeRadioOff();