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

Commit 72a02774 authored by Sindhu Kanathur's avatar Sindhu Kanathur Committed by Steve Kondik
Browse files

Telephony(MSIM): Avoid NullPointerException 

Wifi group and Mobile group variable can be null
during SystemUI startup or onDetachWindow.

Change-Id: Ia97fef9d7ed730b78e8cd9579d6e1d002cc9082f
CRs-Fixed: 643031
parent 40ed0f9f

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

+4 −2
Original line number Diff line number Diff line
@@ -195,9 +195,11 @@ public class MSimSignalClusterView 
    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[MSimConstants.DEFAULT_SUBSCRIPTION].

        if (mMobileVisible && mMobileGroup[MSimConstants.DEFAULT_SUBSCRIPTION] != null

                && mMobileGroup[MSimConstants.DEFAULT_SUBSCRIPTION].

                getContentDescription() != null)

            event.getText().add(mMobileGroup[MSimConstants.DEFAULT_SUBSCRIPTION].

                    getContentDescription());