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

Commit 49192cef authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when hitting back in InCallActivity" into mnc-dev

parents 151b2e1e 85f7ca65

InCallUI/src/com/android/incallui/InCallActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ public class InCallActivity extends Activity implements FragmentDisplayManager { 
        // in-call UI:



        if ((mConferenceManagerFragment == null || !mConferenceManagerFragment.isVisible())

                && !mCallCardFragment.isVisible()) {

                && (mCallCardFragment == null || !mCallCardFragment.isVisible())) {

            return;

        }