Skip to content

Commit e4ca924

Browse files
author
Wink Saville
committed
Fix the build.
Needed to update EventLogTags.logtags Change-Id: Ie7d13e012c52778892167380f4fd273f67bb7d62
1 parent 32b5a7e commit e4ca924

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed

telephony/java/com/android/internal/telephony/EventLogTags.logtags

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,18 @@ option java_package com.android.internal.telephony;
5656

5757
# Bad IP address
5858
50117 bad_ip_address (ip_address|3)
59+
60+
# Data Stall Recovery mode DATA_STALL_RECOVERY_GET_DATA_CALL_LIST
61+
50118 data_stall_recovery_get_data_call_list (out_packet_count|1|1)
62+
63+
# Data Stall Recovery mode DATA_STALL_RECOVERY_CLEANUP
64+
50119 data_stall_recovery_cleanup (out_packet_count|1|1)
65+
66+
# Data Stall Recovery mode DATA_STALL_RECOVERY_REREGISTER
67+
50120 data_stall_recovery_reregister (out_packet_count|1|1)
68+
69+
# Data Stall Recovery mode DATA_STALL_RECOVERY_RADIO_RESTART
70+
50121 data_stall_recovery_radio_restart (out_packet_count|1|1)
71+
72+
# Data Stall Recovery mode DATA_STALL_RECOVERY_RADIO_RESTART_WITH_PROP
73+
50122 data_stall_recovery_radio_restart_with_prop (out_packet_count|1|1)

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ public void onChange(boolean selfChange) {
9898

9999
// Recovery action taken in case of data stall
100100
class RecoveryAction {
101-
public static final int GET_DATA_CALL_LIST = 0;
102-
public static final int CLEANUP = 1;
103-
public static final int REREGISTER = 2;
104-
public static final int RADIO_RESTART = 3;
105-
public static final int RADIO_RESET = 4;
101+
public static final int GET_DATA_CALL_LIST = 0;
102+
public static final int CLEANUP = 1;
103+
public static final int REREGISTER = 2;
104+
public static final int RADIO_RESTART = 3;
105+
public static final int RADIO_RESTART_WITH_PROP = 4;
106106
}
107107
public int getRecoveryAction() {
108108
int action = Settings.System.getInt(mPhone.getContext().getContentResolver(),
@@ -1304,25 +1304,27 @@ private void doRecovery() {
13041304
putRecoveryAction(RecoveryAction.REREGISTER);
13051305
break;
13061306
case RecoveryAction.REREGISTER:
1307-
EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_REREGISTER, mSentSinceLastRecv);
1307+
EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_REREGISTER,
1308+
mSentSinceLastRecv);
13081309
if (DBG) log("doRecovery() re-register");
13091310
mPhone.getServiceStateTracker().reRegisterNetwork(null);
13101311
putRecoveryAction(RecoveryAction.RADIO_RESTART);
13111312
break;
13121313
case RecoveryAction.RADIO_RESTART:
1313-
EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RESTART, mSentSinceLastRecv);
1314+
EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RADIO_RESTART,
1315+
mSentSinceLastRecv);
13141316
if (DBG) log("restarting radio");
1315-
putRecoveryAction(RecoveryAction.RADIO_RESET);
1317+
putRecoveryAction(RecoveryAction.RADIO_RESTART_WITH_PROP);
13161318
restartRadio();
13171319
break;
1318-
case RecoveryAction.RADIO_RESET:
1320+
case RecoveryAction.RADIO_RESTART_WITH_PROP:
13191321
// This is in case radio restart has not recovered the data.
13201322
// It will set an additional "gsm.radioreset" property to tell
13211323
// RIL or system to take further action.
13221324
// The implementation of hard reset recovery action is up to OEM product.
13231325
// Once gsm.radioreset property is consumed, it is expected to set back
13241326
// to false by RIL.
1325-
EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RESTART_WITH_PROP, -1);
1327+
EventLog.writeEvent(EventLogTags.DATA_STALL_RECOVERY_RADIO_RESTART_WITH_PROP, -1);
13261328
if (DBG) log("restarting radio with gsm.radioreset to true");
13271329
SystemProperties.set("gsm.radioreset", "true");
13281330
// give 1 sec so property change can be notified.

0 commit comments

Comments
 (0)