Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cad3651 authored Mar 30, 2023 by Miranda Kephart Committed by Automerger Merge Worker Mar 30, 2023

Merge "Add more debug logs for screenshots" into udc-dev am: b4e839b7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22182822

Change-Id: Ib490ae469557ecd34786cff6556842ccf6b95bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5ef80eb7 b4e839b7

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -190,9 +190,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		} catch (Exception e) {
		// IOException/UnsupportedOperationException may be thrown if external storage is
		// not mounted
		if (DEBUG_STORAGE) {
		Log.d(TAG, "Failed to store screenshot", e);
		}
		mParams.clearImage();
		mImageData.reset();
		mQuickShareData.reset();

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -1119,9 +1119,7 @@ public class ScreenshotController {

		/** Reset screenshot view and then call onCompleteRunnable */
		private void finishDismiss() {
		if (DEBUG_DISMISS) {
		Log.d(TAG, "finishDismiss");
		}
		if (mLastScrollCaptureRequest != null) {
		mLastScrollCaptureRequest.cancel(true);
		mLastScrollCaptureRequest = null;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ public class TakeScreenshotService extends Service {
		Consumer<Uri> uriConsumer, RequestCallback callback) {
		mUiEventLogger.log(ScreenshotEvent.getScreenshotSource(screenshot.getSource()), 0,
		screenshot.getPackageNameString());
		Log.d(TAG, "Screenshot request: " + screenshot);
		mScreenshot.handleScreenshot(screenshot, uriConsumer, callback);
		}