diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-08-15 16:06:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-15 16:06:49 +0000 |
| commit | da68124da23acadc192ba996d0e64f6d362a9a26 (patch) | |
| tree | 29c8df9ff14d6b4937883479175053d1acc3b303 | |
| parent | 70e907f51f75bf8d481e11e0d6411e2974b83b06 (diff) | |
| parent | 24e028e0ec533cb7304296118a73bdc03870d10d (diff) | |
| download | frameworks_base-da68124da23acadc192ba996d0e64f6d362a9a26.zip frameworks_base-da68124da23acadc192ba996d0e64f6d362a9a26.tar.gz frameworks_base-da68124da23acadc192ba996d0e64f6d362a9a26.tar.bz2 | |
Merge "Defend against NPE." into klp-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index f17b143..ff84243 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -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); } |