diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-08-28 13:41:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-28 13:41:19 -0700 |
| commit | 0d43c567cea30e6fb7af0f7adadb1c620339c0f5 (patch) | |
| tree | cb93abaeee84422925a5b629e124dd2d56e90721 /packages | |
| parent | 8d8646471cfef1f31b4d2211d9b33c4071776ae4 (diff) | |
| parent | 393e3170b3f52a3e191554ffd8c8f81821ba2074 (diff) | |
| download | frameworks_base-0d43c567cea30e6fb7af0f7adadb1c620339c0f5.zip frameworks_base-0d43c567cea30e6fb7af0f7adadb1c620339c0f5.tar.gz frameworks_base-0d43c567cea30e6fb7af0f7adadb1c620339c0f5.tar.bz2 | |
am 393e3170: am ad955fe8: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"
* commit '393e3170b3f52a3e191554ffd8c8f81821ba2074':
SystemUI: Fix data activity overlay not being removed when data is disabled
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index 8365d08..d94c6b2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -988,6 +988,8 @@ public class NetworkController extends BroadcastReceiver { combinedActivityIconId = mMobileActivityIconId; combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon() mContentDescriptionCombinedSignal = mContentDescriptionDataType; + } else { + mMobileActivityIconId = 0; } } |