commit 3a51a85aafddc485f2aaba0bcec696d8be3863d5
author Miranda Kephart <mkephart@google.com> Fri Jun 05 18:55:08 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 05 18:55:08 2020 +0000
tree 84f0eaba11e3cd6a0f5b784a46cfe44fa35fdbbe
parent 0053a10ea0dcfa83b8c94795576aa8f21734ad09
parent 700a093b0ccabeb5c420ecdf77e1cd907bab1353

Merge "Only show error if screenshot process dies within timeout period" into rvc-dev

core/java/com/android/internal/util/ScreenshotHelper.java

diff --git a/core/java/com/android/internal/util/ScreenshotHelper.java b/core/java/com/android/internal/util/ScreenshotHelper.java
index adc7ba3..d0052ab 100644
--- a/core/java/com/android/internal/util/ScreenshotHelper.java
+++ b/core/java/com/android/internal/util/ScreenshotHelper.java
@@ -351,8 +351,11 @@
                                 mContext.unbindService(mScreenshotConnection);
                                 mScreenshotConnection = null;
                                 mScreenshotService = null;
-                                handler.removeCallbacks(mScreenshotTimeout);
-                                notifyScreenshotError();
+                                // only log an error if we're still within the timeout period
+                                if (handler.hasCallbacks(mScreenshotTimeout)) {
+                                    handler.removeCallbacks(mScreenshotTimeout);
+                                    notifyScreenshotError();
+                                }
                             }
                         }
                     }