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

Fix NPE in GlobalScreenshot

Browse Source 
Bug: 167655989
Fix: 167655989
Test: take screenshot, take another while first is still up,
observe that NPE occurs. add null check, repeat, verify that NPE
does not occur.

Change-Id: I1290f3a556aba5182e3f96ce524efb86364bc3e1
This commit is contained in:
Miranda Kephart
2020-09-03 16:13:01 -04:00
committed by Matt Casey
parent 71f959be7e
commit 771d8f8fbb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -566,7 +566,8 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
private void saveScreenshot(Bitmap screenshot, Consumer<Uri> finisher, Rect screenRect, private void saveScreenshot(Bitmap screenshot, Consumer<Uri> finisher, Rect screenRect,
Insets screenInsets, boolean showFlash) { Insets screenInsets, boolean showFlash) {
if (mScreenshotLayout.isAttachedToWindow()) { if (mScreenshotLayout.isAttachedToWindow()) {
if (!mDismissAnimation.isRunning()) { // if we didn't already dismiss for another reason // if we didn't already dismiss for another reason
if (mDismissAnimation == null || !mDismissAnimation.isRunning()) {
mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_REENTERED); mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_REENTERED);
} }
dismissScreenshot("new screenshot requested", true); dismissScreenshot("new screenshot requested", true);