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

am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE

Browse Source 
* commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7':
  Check different CellLocation type in GsmDataConnectionTracker
This commit is contained in:
Wink Saville
2011-04-08 13:23:24 -07:00
committed by Android Git Automerger
parent 01f8f290cd 73ad388aae
commit 4a28096dec
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,8 +38,10 @@ import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Telephony; import android.provider.Telephony;
import android.telephony.CellLocation;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.telephony.cdma.CdmaCellLocation;
import android.telephony.gsm.GsmCellLocation; import android.telephony.gsm.GsmCellLocation;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.EventLog; import android.util.EventLog;
@@ -995,9 +997,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
Log.i(LOG_TAG, "PDP connection has dropped. Reconnecting"); Log.i(LOG_TAG, "PDP connection has dropped. Reconnecting");
// Add an event log when the network drops PDP // Add an event log when the network drops PDP
int cid = -1; int cid = getCellLocationId();
GsmCellLocation loc = ((GsmCellLocation)mPhone.getCellLocation());
if (loc != null) cid = loc.getCid();
EventLog.writeEvent(EventLogTags.PDP_NETWORK_DROP, cid, EventLog.writeEvent(EventLogTags.PDP_NETWORK_DROP, cid,
TelephonyManager.getDefault().getNetworkType()); TelephonyManager.getDefault().getNetworkType());
@@ -1018,9 +1018,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
+ " Reconnecting"); + " Reconnecting");
// Log the network drop on the event log. // Log the network drop on the event log.
int cid = -1; int cid = getCellLocationId();
GsmCellLocation loc = ((GsmCellLocation)mPhone.getCellLocation());
if (loc != null) cid = loc.getCid();
EventLog.writeEvent(EventLogTags.PDP_NETWORK_DROP, cid, EventLog.writeEvent(EventLogTags.PDP_NETWORK_DROP, cid,
TelephonyManager.getDefault().getNetworkType()); TelephonyManager.getDefault().getNetworkType());
@@ -1522,10 +1520,9 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
} }
if (cause.isEventLoggable()) { if (cause.isEventLoggable()) {
// Log this failure to the Event Logs. // Log this failure to the Event Logs.
GsmCellLocation loc = ((GsmCellLocation)mPhone.getCellLocation()); int cid = getCellLocationId();
EventLog.writeEvent(EventLogTags.PDP_SETUP_FAIL, EventLog.writeEvent(EventLogTags.PDP_SETUP_FAIL,
cause.ordinal(), loc != null ? loc.getCid() : -1, cause.ordinal(), cid, TelephonyManager.getDefault().getNetworkType());
TelephonyManager.getDefault().getNetworkType());
} }
// Count permanent failures and remove the APN we just tried // Count permanent failures and remove the APN we just tried
@@ -1984,6 +1981,20 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
} }
} }
private int getCellLocationId() {
int cid = -1;
CellLocation loc = mPhone.getCellLocation();
if (loc != null) {
if (loc instanceof GsmCellLocation) {
cid = ((GsmCellLocation)loc).getCid();
} else if (loc instanceof CdmaCellLocation) {
cid = ((CdmaCellLocation)loc).getBaseStationId();
}
}
return cid;
}
@Override @Override
public boolean isAnyActiveDataConnections() { public boolean isAnyActiveDataConnections() {
return isConnected(); return isConnected();