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

Commit b4e839b7 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

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

parents 4dce0505 e14339ad

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -190,9 +190,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
        } catch (Exception e) {

        } catch (Exception e) {

            // IOException/UnsupportedOperationException may be thrown if external storage is

            // IOException/UnsupportedOperationException may be thrown if external storage is

            // not mounted

            // not mounted

            if (DEBUG_STORAGE) {

            Log.d(TAG, "Failed to store screenshot", e);

            Log.d(TAG, "Failed to store screenshot", e);

            }

            mParams.clearImage();

            mParams.clearImage();

            mImageData.reset();

            mImageData.reset();

            mQuickShareData.reset();

            mQuickShareData.reset();

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

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




    /** Reset screenshot view and then call onCompleteRunnable */

    /** Reset screenshot view and then call onCompleteRunnable */

    private void finishDismiss() {

    private void finishDismiss() {

        if (DEBUG_DISMISS) {

        Log.d(TAG, "finishDismiss");

        Log.d(TAG, "finishDismiss");

        }

        if (mLastScrollCaptureRequest != null) {

        if (mLastScrollCaptureRequest != null) {

            mLastScrollCaptureRequest.cancel(true);

            mLastScrollCaptureRequest.cancel(true);

            mLastScrollCaptureRequest = null;

            mLastScrollCaptureRequest = null;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -253,6 +253,7 @@ public class TakeScreenshotService extends Service { 
            Consumer<Uri> uriConsumer, RequestCallback callback) {

            Consumer<Uri> uriConsumer, RequestCallback callback) {

        mUiEventLogger.log(ScreenshotEvent.getScreenshotSource(screenshot.getSource()), 0,

        mUiEventLogger.log(ScreenshotEvent.getScreenshotSource(screenshot.getSource()), 0,

                screenshot.getPackageNameString());

                screenshot.getPackageNameString());

        Log.d(TAG, "Screenshot request: " + screenshot);

        mScreenshot.handleScreenshot(screenshot, uriConsumer, callback);

        mScreenshot.handleScreenshot(screenshot, uriConsumer, callback);

    }

    }