Merge "Fix a race condition that causes BackAnimation to be null." (ac13cc9a) · Commits · e / os / android_frameworks_base

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);
		}
		}

		/**

+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();