Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85aaf am: 11e31f8621

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739868 Change-Id: I2034918fa6134d586fec4eacfa4663912b2dbbf0
2020-06-05 19:28:10 +00:00
parent 064867a988 11e31f8621
commit ec217d20d0
1 changed files with 5 additions and 2 deletions
--- a/core/java/com/android/internal/util/ScreenshotHelper.java
+++ b/core/java/com/android/internal/util/ScreenshotHelper.java
@@ -351,8 +351,11 @@ public class ScreenshotHelper {
                                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();
+                                }
                            }
                        }
                    }