commit d9cd20b16325b90d5ddcdb00147f97f40dca9ff9
author Dan Sandler <dsandler@android.com> Fri Nov 13 15:01:44 2015 -0500
committer Dan Sandler <dsandler@android.com> Fri Nov 13 15:01:44 2015 -0500
tree b2c72d34a55c9723e439fd15ed6ba7aac4aa6346
parent 9f1c3f099f410fd1e3b65f1216012c10f01c10fb

Fix crash on second screenshot.

(Work around new animator.end() behavior.)

Bug: 25601129
Change-Id: I9e5d9fc72cffa909dfd98ad80b7812df2a0e178a

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
index 9e3cf37..e6a291c 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
@@ -594,7 +594,9 @@
 
         // Setup the animation with the screenshot just taken
         if (mScreenshotAnimation != null) {
-            mScreenshotAnimation.end();
+            if (mScreenshotAnimation.isStarted()) {
+                mScreenshotAnimation.end();
+            }
             mScreenshotAnimation.removeAllListeners();
         }