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

Commit 7781993c authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 99b4572c: Merge "Fix NPE when hitting back in InCallActivity" into mnc-dev 

* commit '99b4572c41bd1b6c236ebdf195261efb5746a896':
  Fix NPE when hitting back in InCallActivity
parents fed25072 49192cef

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;

        }