diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-18 15:41:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-18 15:41:14 -0700 |
| commit | 6c317acc9f1d43cd5d75e3b766c5431cf2a354d8 (patch) | |
| tree | 663f992d23ed2e96664e0e27ebc1fe23174c95d0 /telephony/java | |
| parent | 1066cbcac08268e2254ed6818181949d83e9ba1c (diff) | |
| parent | d324c81c049f30b779967c73de591e20f9a15d99 (diff) | |
| download | frameworks_base-6c317acc9f1d43cd5d75e3b766c5431cf2a354d8.zip frameworks_base-6c317acc9f1d43cd5d75e3b766c5431cf2a354d8.tar.gz frameworks_base-6c317acc9f1d43cd5d75e3b766c5431cf2a354d8.tar.bz2 | |
Merge change 21790 into eclair
* changes:
Dormant ICON was not being displayed, fixes bug 2039239.
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java index d02d33e..8913e81 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java @@ -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) { |