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

Commit cbe8f022 authored by Matt Casey's avatar Matt Casey
Browse files

Remove always-true 'publish' parameter 

All ImageExporter methods publish.

Flag: EXEMPT dead code removal
Test: atest ImageExporterTest
Bug: NONE
Change-Id: Ia0eac999dcce4ee95843bbdf222c487405181ad9
parent c82878e7

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

+10 −20
Original line number Original line Diff line number Diff line
@@ -158,8 +158,7 @@ public class ImageExporter { 
        ZonedDateTime captureTime = ZonedDateTime.now(ZoneId.systemDefault());

        ZonedDateTime captureTime = ZonedDateTime.now(ZoneId.systemDefault());

        return export(executor,

        return export(executor,

                new Task(mResolver, requestId, bitmap, captureTime, mCompressFormat,

                new Task(mResolver, requestId, bitmap, captureTime, mCompressFormat,

                        mQuality, /* publish */ true, owner,

                        mQuality, owner, createFilename(captureTime, mCompressFormat, displayId)));

                        createFilename(captureTime, mCompressFormat, displayId)));

    }

    }





    /**

    /**
@@ -181,7 +180,8 @@ public class ImageExporter { 
                        bitmap,

                        bitmap,

                        ZonedDateTime.now(ZoneId.systemDefault()),

                        ZonedDateTime.now(ZoneId.systemDefault()),

                        format,

                        format,

                        mQuality, /* publish */ true, owner,

                        mQuality,

                        owner,

                        createSystemFileDisplayName(fileName, format),

                        createSystemFileDisplayName(fileName, format),

                        true /* allowOverwrite */));

                        true /* allowOverwrite */));

    }

    }
@@ -196,8 +196,7 @@ public class ImageExporter { 
    public ListenableFuture<Result> export(Executor executor, UUID requestId, Bitmap bitmap,

    public ListenableFuture<Result> export(Executor executor, UUID requestId, Bitmap bitmap,

            ZonedDateTime captureTime, UserHandle owner, int displayId) {

            ZonedDateTime captureTime, UserHandle owner, int displayId) {

        return export(executor, new Task(mResolver, requestId, bitmap, captureTime, mCompressFormat,

        return export(executor, new Task(mResolver, requestId, bitmap, captureTime, mCompressFormat,

                mQuality, /* publish */ true, owner,

                mQuality, owner, createFilename(captureTime, mCompressFormat, displayId)));

                createFilename(captureTime, mCompressFormat, displayId)));

    }

    }





    /**

    /**
@@ -210,8 +209,7 @@ public class ImageExporter { 
    ListenableFuture<Result> export(Executor executor, UUID requestId, Bitmap bitmap,

    ListenableFuture<Result> export(Executor executor, UUID requestId, Bitmap bitmap,

            ZonedDateTime captureTime, UserHandle owner, String fileName) {

            ZonedDateTime captureTime, UserHandle owner, String fileName) {

        return export(executor, new Task(mResolver, requestId, bitmap, captureTime, mCompressFormat,

        return export(executor, new Task(mResolver, requestId, bitmap, captureTime, mCompressFormat,

                mQuality, /* publish */ true, owner,

                mQuality, owner, createSystemFileDisplayName(fileName, mCompressFormat)));

                createSystemFileDisplayName(fileName, mCompressFormat)));

    }

    }





    /**

    /**
@@ -246,7 +244,6 @@ public class ImageExporter { 
        public String fileName;

        public String fileName;

        public long timestamp;

        public long timestamp;

        public CompressFormat format;

        public CompressFormat format;

        public boolean published;





        @Override

        @Override

        public String toString() {

        public String toString() {
@@ -256,7 +253,6 @@ public class ImageExporter { 
            sb.append(", fileName='").append(fileName).append('\'');

            sb.append(", fileName='").append(fileName).append('\'');

            sb.append(", timestamp=").append(timestamp);

            sb.append(", timestamp=").append(timestamp);

            sb.append(", format=").append(format);

            sb.append(", format=").append(format);

            sb.append(", published=").append(published);

            sb.append('}');

            sb.append('}');

            return sb.toString();

            return sb.toString();

        }

        }
@@ -271,7 +267,6 @@ public class ImageExporter { 
        private final int mQuality;

        private final int mQuality;

        private final UserHandle mOwner;

        private final UserHandle mOwner;

        private final String mFileName;

        private final String mFileName;

        private final boolean mPublish;





        /**

        /**

         * This variable specifies the behavior when a file to be exported has a same name and

         * This variable specifies the behavior when a file to be exported has a same name and
@@ -283,14 +278,13 @@ public class ImageExporter { 
        private final boolean mAllowOverwrite;

        private final boolean mAllowOverwrite;





        Task(ContentResolver resolver, UUID requestId, Bitmap bitmap, ZonedDateTime captureTime,

        Task(ContentResolver resolver, UUID requestId, Bitmap bitmap, ZonedDateTime captureTime,

                CompressFormat format, int quality, boolean publish, UserHandle owner,

                CompressFormat format, int quality, UserHandle owner, String fileName) {

                String fileName) {

            this(resolver, requestId, bitmap, captureTime, format, quality, owner, fileName,

            this(resolver, requestId, bitmap, captureTime, format, quality, publish, owner,

                    false /* allowOverwrite */);

                    fileName, false /* allowOverwrite */);

        }

        }





        Task(ContentResolver resolver, UUID requestId, Bitmap bitmap, ZonedDateTime captureTime,

        Task(ContentResolver resolver, UUID requestId, Bitmap bitmap, ZonedDateTime captureTime,

                CompressFormat format, int quality, boolean publish, UserHandle owner,

                CompressFormat format, int quality, UserHandle owner,

                String fileName, boolean allowOverwrite) {

                String fileName, boolean allowOverwrite) {

            mResolver = resolver;

            mResolver = resolver;

            mRequestId = requestId;

            mRequestId = requestId;
@@ -300,7 +294,6 @@ public class ImageExporter { 
            mQuality = quality;

            mQuality = quality;

            mOwner = owner;

            mOwner = owner;

            mFileName = fileName;

            mFileName = fileName;

            mPublish = publish;

            mAllowOverwrite = allowOverwrite;

            mAllowOverwrite = allowOverwrite;

        }

        }
@@ -327,10 +320,7 @@ public class ImageExporter { 
                writeExif(mResolver, uri, mRequestId, width, height, mCaptureTime);

                writeExif(mResolver, uri, mRequestId, width, height, mCaptureTime);

                throwIfInterrupted();

                throwIfInterrupted();





                if (mPublish) {

                publishEntry(mResolver, uri);

                publishEntry(mResolver, uri);

                    result.published = true;

                }





                result.timestamp = mCaptureTime.toInstant().toEpochMilli();

                result.timestamp = mCaptureTime.toInstant().toEpochMilli();

                result.requestId = mRequestId;

                result.requestId = mRequestId;