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

Commit 8f299d48 authored by Andrew Lee's avatar Andrew Lee Committed by android-build-merger
Browse files

Finish activity before reveal if not setup. 

automerge: c5722b4

* commit 'c5722b4638a4807a3accbd85822eeb7c09973c44':
  Finish activity before reveal if not setup.
parents 5894bc8a 0ad206a7

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

+6 −0
Original line number Diff line number Diff line
@@ -1143,6 +1143,12 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener { 
            mHandler.post(new Runnable() {

                @Override

                public void run() {

                    if (mContext == null) {

                        Log.e(this, "Setup did not occur before showing the InCallActivity.");

                        activity.finish();

                        return;

                    }



                    Log.i(this, "Showing InCallActivity after circular reveal");

                    final Intent intent =

                            getInCallIntent(mShowDialpadOnStart, true, false, false);