Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 404 into donut

Browse Source 
* changes:
  normalize the DATA_STATE_RADIO_OFF event log id definition
This commit is contained in:
Android (Google) Code Review
2009-04-21 23:44:04 -07:00
parent 8486930c8f e290ed0f61
commit 58d8a0bb73
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/ServiceStateTracker.java
View File

@@ -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];
}
}

2
telephony/java/com/android/internal/telephony/TelephonyEventLog.java
View File

@@ -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;
}

2
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -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();

2
telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
View File

@@ -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();