From e290ed0f610422fa0420b1fbbf37bb1afd04ab82 Mon Sep 17 00:00:00 2001 From: Tammo Spalink Date: Tue, 21 Apr 2009 15:14:49 +0800 Subject: normalize the DATA_STATE_RADIO_OFF event log id definition Was this different intentionally? It looks internal, and with very limited usage, and so easy to bring in line with the others... --- telephony/java/com/android/internal/telephony/ServiceStateTracker.java | 2 -- telephony/java/com/android/internal/telephony/TelephonyEventLog.java | 2 +- .../com/android/internal/telephony/cdma/CdmaServiceStateTracker.java | 2 +- .../java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) (limited to 'telephony/java/com') diff --git a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java index a4bf0dd..28a9968 100644 --- a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java @@ -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]; } } - diff --git a/telephony/java/com/android/internal/telephony/TelephonyEventLog.java b/telephony/java/com/android/internal/telephony/TelephonyEventLog.java index 1ef3c6c..97f9d7d 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyEventLog.java +++ b/telephony/java/com/android/internal/telephony/TelephonyEventLog.java @@ -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; } diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index ca40e76..6f344b9 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -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(); diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 8ecf245..9ab1002 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -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(); -- cgit v1.1