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

Commit 471f63aa authored by Jay Shrauner's avatar Jay Shrauner
Browse files

Fix NPE in getRevealAnimator 

Fix NPE when no longer attached to activity.

Bug:25764709
Change-Id: I1a8a1da184930a99cefc079de9c074b9c69f0bf5
parent ea8f82a9

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

+14 −9
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ public class CircularRevealFragment extends Fragment { 
                    vto.removeOnPreDrawListener(this);

                }

                final Animator animator = getRevealAnimator(mTouchPoint);

                if (animator != null) {

                    animator.addListener(new AnimatorListenerAdapter() {

                        @Override

                        public void onAnimationEnd(Animator animation) {
@@ -137,6 +138,7 @@ public class CircularRevealFragment extends Fragment { 
                        }

                    });

                    animator.start();

                }

                return false;

            }

        });
@@ -144,6 +146,9 @@ public class CircularRevealFragment extends Fragment { 


    private Animator getRevealAnimator(Point touchPoint) {

        final Activity activity = getActivity();

        if (activity == null) {

            return null;

        }

        final View view  = activity.getWindow().getDecorView();

        final Display display = activity.getWindowManager().getDefaultDisplay();

        final Point size = new Point();