From c7aa65b8d5e1596b8c1e11ad676725943169d272 Mon Sep 17 00:00:00 2001 From: Winson Date: Thu, 10 Mar 2016 12:52:27 -0800 Subject: [PATCH] Prevent crash with invalid cancelled params. Bug: 27368990 Change-Id: I3eaa9e0391a4149da29bb5dc638ef152f5125bc6 --- .../systemui/screenshot/GlobalScreenshot.java | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java index e64354ca1408d..eb089471c9928 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java @@ -93,13 +93,13 @@ class SaveImageInBackgroundData { /** * An AsyncTask that saves an image to the media store in the background. */ -class SaveImageInBackgroundTask extends AsyncTask { +class SaveImageInBackgroundTask extends AsyncTask { private static final String SCREENSHOTS_DIR_NAME = "Screenshots"; private static final String SCREENSHOT_FILE_NAME_TEMPLATE = "Screenshot_%s.png"; private static final String SCREENSHOT_SHARE_SUBJECT_TEMPLATE = "Screenshot (%s)"; + private final SaveImageInBackgroundData mParams; private final NotificationManager mNotificationManager; private final Notification.Builder mNotificationBuilder, mPublicNotificationBuilder; private final File mScreenshotDir; @@ -122,6 +122,7 @@ class SaveImageInBackgroundTask extends AsyncTask mSaveInBgTask; + private AsyncTask mSaveInBgTask; private MediaActionSound mCameraSound; @@ -510,7 +514,7 @@ class GlobalScreenshot { mSaveInBgTask.cancel(false); } mSaveInBgTask = new SaveImageInBackgroundTask(mContext, data, mNotificationManager) - .execute(data); + .execute(); } /**