Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9310baf authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

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

* commit 'da68124d':
  Defend against NPE.
parents cd63115e da68124d

packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -135,9 +135,9 @@ public class SignalClusterView 
    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {

    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {

        // Standard group layout onPopulateAccessibilityEvent() implementations

        // Standard group layout onPopulateAccessibilityEvent() implementations

        // ignore content description, so populate manually

        // ignore content description, so populate manually

        if (mWifiVisible && mWifiGroup.getContentDescription() != null)

        if (mWifiVisible && mWifiGroup != null && mWifiGroup.getContentDescription() != null)

            event.getText().add(mWifiGroup.getContentDescription());

            event.getText().add(mWifiGroup.getContentDescription());

        if (mMobileVisible && mMobileGroup.getContentDescription() != null)

        if (mMobileVisible && mMobileGroup != null && mMobileGroup.getContentDescription() != null)

            event.getText().add(mMobileGroup.getContentDescription());

            event.getText().add(mMobileGroup.getContentDescription());

        return super.dispatchPopulateAccessibilityEvent(event);

        return super.dispatchPopulateAccessibilityEvent(event);

    }

    }