am 6c317acc: Merge change 21790 into eclair

Merge commit '6c317acc9f1d43cd5d75e3b766c5431cf2a354d8'

* commit '6c317acc9f1d43cd5d75e3b766c5431cf2a354d8':
  Dormant ICON was not being displayed, fixes bug 2039239.
This commit is contained in:
Wink Saville
2009-08-18 17:19:58 -07:00
committed by Android Git Automerger

View File

@@ -498,10 +498,10 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
sentSinceLastRecv = 0;
newActivity = Activity.DATAIN;
} else if (sent == 0 && received == 0) {
newActivity = Activity.NONE;
newActivity = (activity == Activity.DORMANT) ? activity : Activity.NONE;
} else {
sentSinceLastRecv = 0;
newActivity = Activity.NONE;
newActivity = (activity == Activity.DORMANT) ? activity : Activity.NONE;
}
if (activity != newActivity) {