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

Commit f5ad5d60 authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix a race condition that causes BackAnimation to be null." into tm-dev am: 9feb8c3b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17047561

Change-Id: I137415fe6c7c73b202c30016eb43ebb5c3f12ed8
parents d9ff4a00 9feb8c3b

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+3 −0
Original line number Diff line number Diff line
@@ -936,6 +936,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 


    public void setBackAnimation(BackAnimation backAnimation) {

        mBackAnimation = backAnimation;

        if (mEdgeBackPlugin != null && mEdgeBackPlugin instanceof NavigationBarEdgePanel) {

            ((NavigationBarEdgePanel) mEdgeBackPlugin).setBackAnimation(backAnimation);

        }

    }



    /**

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java

+5 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
                }

            };

    private BackCallback mBackCallback;

    private final BackAnimation mBackAnimation;

    private BackAnimation mBackAnimation;



    public NavigationBarEdgePanel(Context context,

            BackAnimation backAnimation) {
@@ -385,6 +385,10 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
        mShowProtection = !isPrimaryDisplay;

    }



    public void setBackAnimation(BackAnimation backAnimation) {

        mBackAnimation = backAnimation;

    }



    @Override

    public void onDestroy() {

        cancelFailsafe();