Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Miranda Kephart
2020-06-05 18:55:08 +00:00
committed by Android (Google) Code Review
parent 0053a10ea0 700a093b0c
commit 3a51a85aaf
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/util/ScreenshotHelper.java
View File

@@ -351,8 +351,11 @@ public class ScreenshotHelper {
mContext.unbindService(mScreenshotConnection); mContext.unbindService(mScreenshotConnection);
mScreenshotConnection = null; mScreenshotConnection = null;
mScreenshotService = null; mScreenshotService = null;
handler.removeCallbacks(mScreenshotTimeout); // only log an error if we're still within the timeout period
notifyScreenshotError(); if (handler.hasCallbacks(mScreenshotTimeout)) {
handler.removeCallbacks(mScreenshotTimeout);
notifyScreenshotError();
}
} }
} }
} }