Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Defend against NPE.

Browse Source 
During SystemUI startup, populating accessibility for other
views can race with attaching SignalClusterView to its parent.

Bug: 9999664
Change-Id: Iba34a3edba403ae65ff3c37b953d0736068a67b9
This commit is contained in:
Daniel Sandler
2013-08-13 20:18:01 -07:00
parent 9955699d30
commit 24e028e0ec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
View File

@@ -135,9 +135,9 @@ public class SignalClusterView
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
// Standard group layout onPopulateAccessibilityEvent() implementations
// ignore content description, so populate manually
if (mWifiVisible && mWifiGroup.getContentDescription() != null)
if (mWifiVisible && mWifiGroup != null && mWifiGroup.getContentDescription() != null)
event.getText().add(mWifiGroup.getContentDescription());
if (mMobileVisible && mMobileGroup.getContentDescription() != null)
if (mMobileVisible && mMobileGroup != null && mMobileGroup.getContentDescription() != null)
event.getText().add(mMobileGroup.getContentDescription());
return super.dispatchPopulateAccessibilityEvent(event);
}