Merge "Fix logs when screenshot fails to save" (b38b1d31) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -104,7 +104,6 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
		public Bitmap image;
		public Consumer<Uri> finisher;
		public GlobalScreenshot.ActionsReadyListener mActionsReadyListener;
		public int errorMsgResId;

		void clearImage() {
		image = null;
		@@ -632,7 +631,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
		if (imageData.uri == null) {
		mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_NOT_SAVED);
		mNotificationsController.notifyScreenshotError(
		R.string.screenshot_failed_to_capture_text);
		R.string.screenshot_failed_to_save_text);
		} else {
		mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SAVED);

		@@ -752,7 +751,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
		if (imageData.uri == null) {
		mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_NOT_SAVED);
		mNotificationsController.notifyScreenshotError(
		R.string.screenshot_failed_to_capture_text);
		R.string.screenshot_failed_to_save_text);
		} else {
		mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SAVED);
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -217,13 +217,11 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		mParams.mActionsReadyListener.onActionsReady(mImageData);
		mParams.finisher.accept(mImageData.uri);
		mParams.image = null;
		mParams.errorMsgResId = 0;
		} catch (Exception e) {
		// IOException/UnsupportedOperationException may be thrown if external storage is
		// not mounted
		Slog.e(TAG, "unable to save screenshot", e);
		mParams.clearImage();
		mParams.errorMsgResId = R.string.screenshot_failed_to_save_text;
		mImageData.reset();
		mParams.mActionsReadyListener.onActionsReady(mImageData);
		mParams.finisher.accept(null);