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

am da68124d: Merge "Defend against NPE." into klp-dev

Browse Source 
* commit 'da68124da23acadc192ba996d0e64f6d362a9a26':
  Defend against NPE.
This commit is contained in:
Daniel Sandler
2013-08-15 09:11:57 -07:00
committed by Android Git Automerger
parent cd63115ebc da68124da2
commit f9310baf2e
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);
}