Merge "Fix NPE if animation updated after manager released."
am: 84c0d025e8

Change-Id: Icbabe77d687d91634fa6853184ba7dea1d914e6b

v17/leanback/src/android/support/v17/leanback/app/BackgroundManager.java

diff --git a/v17/leanback/src/android/support/v17/leanback/app/BackgroundManager.java b/v17/leanback/src/android/support/v17/leanback/app/BackgroundManager.java
index 1989791..27bcd70 100644
--- a/v17/leanback/src/android/support/v17/leanback/app/BackgroundManager.java
+++ b/v17/leanback/src/android/support/v17/leanback/app/BackgroundManager.java
@@ -703,15 +703,18 @@
      */
     public void release() {
         if (DEBUG) Log.v(TAG, "release " + this);
+        if (mChangeRunnable != null) {
+            mHandler.removeCallbacks(mChangeRunnable);
+            mChangeRunnable = null;
+        }
+        if (mAnimator.isStarted()) {
+            mAnimator.cancel();
+        }
         if (mLayerDrawable != null) {
             mLayerDrawable.clearDrawable(R.id.background_imagein, mContext);
             mLayerDrawable.clearDrawable(R.id.background_imageout, mContext);
             mLayerDrawable = null;
         }
-        if (mChangeRunnable != null) {
-            mHandler.removeCallbacks(mChangeRunnable);
-            mChangeRunnable = null;
-        }
         mBackgroundDrawable = null;
     }