am ad955fe: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"

dsandler · Android Git Automerger · commit 393e3170b3f5 · 2012-08-28T13:19:52.000-07:00
* commit 'ad955fe87f44b43dbb2842fdcbe4e62900b5a07f':
  SystemUI: Fix data activity overlay not being removed when data is disabled
diff --git 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 @@ void refreshViews() {
                 combinedActivityIconId = mMobileActivityIconId;
                 combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
                 mContentDescriptionCombinedSignal = mContentDescriptionDataType;
+            } else {
+                mMobileActivityIconId = 0;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -988,6 +988,8 @@ void refreshViews() {`
`988`	`988`	`combinedActivityIconId = mMobileActivityIconId;`
`989`	`989`	`combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()`
`990`	`990`	`mContentDescriptionCombinedSignal = mContentDescriptionDataType;`
	`991`	`+ } else {`
	`992`	`+ mMobileActivityIconId = 0;`
`991`	`993`	`}`
`992`	`994`	`}`
`993`	`995`