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

Fix the build.

Browse Source 
Needed to update EventLogTags.logtags

Change-Id: Ie7d13e012c52778892167380f4fd273f67bb7d62
This commit is contained in:
Wink Saville
2011-11-03 23:12:54 -07:00
parent 32b5a7eeaf
commit e4ca92421c
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/com/android/internal/telephony/EventLogTags.logtags
View File

@@ -56,3 +56,18 @@ option java_package com.android.internal.telephony;
# Bad IP address # Bad IP address
50117 bad_ip_address (ip_address|3) 50117 bad_ip_address (ip_address|3)
# Data Stall Recovery mode DATA_STALL_RECOVERY_GET_DATA_CALL_LIST
50118 data_stall_recovery_get_data_call_list (out_packet_count|1|1)
# Data Stall Recovery mode DATA_STALL_RECOVERY_CLEANUP
50119 data_stall_recovery_cleanup (out_packet_count|1|1)
# Data Stall Recovery mode DATA_STALL_RECOVERY_REREGISTER
50120 data_stall_recovery_reregister (out_packet_count|1|1)
# Data Stall Recovery mode DATA_STALL_RECOVERY_RADIO_RESTART
50121 data_stall_recovery_radio_restart (out_packet_count|1|1)
# Data Stall Recovery mode DATA_STALL_RECOVERY_RADIO_RESTART_WITH_PROP
50122 data_stall_recovery_radio_restart_with_prop (out_packet_count|1|1)

14
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -102,7 +102,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
public static final int CLEANUP = 1; public static final int CLEANUP = 1;
public static final int REREGISTER = 2; public static final int REREGISTER = 2;
public static final int RADIO_RESTART = 3; public static final int RADIO_RESTART = 3;
public static final int RADIO_RESET = 4; public static final int RADIO_RESTART_WITH_PROP = 4;
} }
public int getRecoveryAction() { public int getRecoveryAction() {
int action = Settings.System.getInt(mPhone.getContext().getContentResolver(), int action = Settings.System.getInt(mPhone.getContext().getContentResolver(),
@@ -1304,25 +1304,27 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
putRecoveryAction(RecoveryAction.REREGISTER); putRecoveryAction(RecoveryAction.REREGISTER);
break; break;
case RecoveryAction.REREGISTER: case RecoveryAction.REREGISTER:
EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_REREGISTER, mSentSinceLastRecv); EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_REREGISTER,
mSentSinceLastRecv);
if (DBG) log("doRecovery() re-register"); if (DBG) log("doRecovery() re-register");
mPhone.getServiceStateTracker().reRegisterNetwork(null); mPhone.getServiceStateTracker().reRegisterNetwork(null);
putRecoveryAction(RecoveryAction.RADIO_RESTART); putRecoveryAction(RecoveryAction.RADIO_RESTART);
break; break;
case RecoveryAction.RADIO_RESTART: case RecoveryAction.RADIO_RESTART:
EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RESTART, mSentSinceLastRecv); EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RADIO_RESTART,
mSentSinceLastRecv);
if (DBG) log("restarting radio"); if (DBG) log("restarting radio");
putRecoveryAction(RecoveryAction.RADIO_RESET); putRecoveryAction(RecoveryAction.RADIO_RESTART_WITH_PROP);
restartRadio(); restartRadio();
break; break;
case RecoveryAction.RADIO_RESET: case RecoveryAction.RADIO_RESTART_WITH_PROP:
// This is in case radio restart has not recovered the data. // This is in case radio restart has not recovered the data.
// It will set an additional "gsm.radioreset" property to tell // It will set an additional "gsm.radioreset" property to tell
// RIL or system to take further action. // RIL or system to take further action.
// The implementation of hard reset recovery action is up to OEM product. // The implementation of hard reset recovery action is up to OEM product.
// Once gsm.radioreset property is consumed, it is expected to set back // Once gsm.radioreset property is consumed, it is expected to set back
// to false by RIL. // to false by RIL.
EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RESTART_WITH_PROP, -1); EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RADIO_RESTART_WITH_PROP, -1);
if (DBG) log("restarting radio with gsm.radioreset to true"); if (DBG) log("restarting radio with gsm.radioreset to true");
SystemProperties.set("gsm.radioreset", "true"); SystemProperties.set("gsm.radioreset", "true");
// give 1 sec so property change can be notified. // give 1 sec so property change can be notified.