am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE

* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
  Fix occasional phone app crash
This commit is contained in:
Wink Saville
2011-04-12 17:00:57 -07:00
committed by Android Git Automerger

View File

@@ -569,8 +569,10 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (defaultApnContext != null) { if (defaultApnContext != null) {
if (defaultApnContext.getState() == State.FAILED) { if (defaultApnContext.getState() == State.FAILED) {
cleanUpConnection(false, defaultApnContext); cleanUpConnection(false, defaultApnContext);
if (defaultApnContext.getDataConnection() != null) {
defaultApnContext.getDataConnection().resetRetryCount(); defaultApnContext.getDataConnection().resetRetryCount();
} }
}
trySetupData(Phone.REASON_GPRS_ATTACHED, Phone.APN_TYPE_DEFAULT); trySetupData(Phone.REASON_GPRS_ATTACHED, Phone.APN_TYPE_DEFAULT);
} }
} }