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

Commit 1ce14b17 authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge changes Ia0eac999,I51b2e045 into main 

* changes:
  Remove always-true 'publish' parameter
  Remove unused Flags variable from ImageExporter
parents 8f26e540 cbe8f022

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

+14 −29
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import androidx.concurrent.futures.CallbackToFutureAdapter; 
import androidx.exifinterface.media.ExifInterface;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.flags.FeatureFlags;



import com.google.common.util.concurrent.ListenableFuture;
@@ -94,12 +93,10 @@ public class ImageExporter { 
    private final ContentResolver mResolver;

    private CompressFormat mCompressFormat = CompressFormat.PNG;

    private int mQuality = 100;

    private final FeatureFlags mFlags;



    @Inject

    public ImageExporter(ContentResolver resolver, FeatureFlags flags) {

    public ImageExporter(ContentResolver resolver) {

        mResolver = resolver;

        mFlags = flags;

    }



    /**
@@ -161,8 +158,7 @@ public class ImageExporter { 
        ZonedDateTime captureTime = ZonedDateTime.now(ZoneId.systemDefault());

        return export(executor,

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

                        mQuality, /* publish */ true, owner, mFlags,

                        createFilename(captureTime, mCompressFormat, displayId)));

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

    }



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

                        ZonedDateTime.now(ZoneId.systemDefault()),

                        format,

                        mQuality, /* publish */ true, owner, mFlags,

                        mQuality,

                        owner,

                        createSystemFileDisplayName(fileName, format),

                        true /* allowOverwrite */));

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

            ZonedDateTime captureTime, UserHandle owner, int displayId) {

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

                mQuality, /* publish */ true, owner, mFlags,

                createFilename(captureTime, mCompressFormat, displayId)));

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

    }



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

            ZonedDateTime captureTime, UserHandle owner, String fileName) {

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

                mQuality, /* publish */ true, owner, mFlags,

                createSystemFileDisplayName(fileName, mCompressFormat)));

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

    }



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

        public long timestamp;

        public CompressFormat format;

        public boolean published;



        @Override

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

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

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

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

            sb.append('}');

            return sb.toString();

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

        private final UserHandle mOwner;

        private final String mFileName;

        private final boolean mPublish;

        private final FeatureFlags mFlags;



        /**

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



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

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

                FeatureFlags flags, String fileName) {

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

                    fileName, false /* allowOverwrite */);

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

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

                    false /* allowOverwrite */);

        }



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

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

                FeatureFlags flags, String fileName, boolean allowOverwrite) {

                CompressFormat format, int quality, UserHandle owner,

                String fileName, boolean allowOverwrite) {

            mResolver = resolver;

            mRequestId = requestId;

            mBitmap = bitmap;
@@ -304,8 +294,6 @@ public class ImageExporter { 
            mQuality = quality;

            mOwner = owner;

            mFileName = fileName;

            mPublish = publish;

            mFlags = flags;

            mAllowOverwrite = allowOverwrite;

        }
@@ -320,7 +308,7 @@ public class ImageExporter { 
                    start = Instant.now();

                }



                uri = createEntry(mResolver, mFormat, mCaptureTime, mFileName, mOwner, mFlags,

                uri = createEntry(mResolver, mFormat, mCaptureTime, mFileName, mOwner,

                        mAllowOverwrite);

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

                throwIfInterrupted();



                if (mPublish) {

                publishEntry(mResolver, uri);

                    result.published = true;

                }



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

                result.requestId = mRequestId;
@@ -365,7 +350,7 @@ public class ImageExporter { 
    }



    private static Uri createEntry(ContentResolver resolver, CompressFormat format,

            ZonedDateTime time, String fileName, UserHandle owner, FeatureFlags flags,

            ZonedDateTime time, String fileName, UserHandle owner,

            boolean allowOverwrite) throws ImageExportException {

        Trace.beginSection("ImageExporter_createEntry");

        try {

packages/SystemUI/tests/src/com/android/systemui/screenshot/ImageExporterTest.java

+3 −5
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import androidx.exifinterface.media.ExifInterface; 
import androidx.test.filters.MediumTest;



import com.android.systemui.SysuiTestCase;

import com.android.systemui.flags.FakeFeatureFlags;



import com.google.common.util.concurrent.ListenableFuture;
@@ -79,7 +78,6 @@ public class ImageExporterTest extends SysuiTestCase { 
    private static final ZonedDateTime CAPTURE_TIME =

            ZonedDateTime.of(LocalDateTime.of(2020, 12, 15, 13, 15), ZoneId.of("America/New_York"));



    private FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags();

    @Mock

    private ContentResolver mMockContentResolver;
@@ -125,7 +123,7 @@ public class ImageExporterTest extends SysuiTestCase { 
    @Test

    public void testImageExport() throws ExecutionException, InterruptedException, IOException {

        ContentResolver contentResolver = mContext.getContentResolver();

        ImageExporter exporter = new ImageExporter(contentResolver, mFeatureFlags);

        ImageExporter exporter = new ImageExporter(contentResolver);



        UUID requestId = UUID.fromString("3c11da99-9284-4863-b1d5-6f3684976814");

        Bitmap original = createCheckerBitmap(10, 10, 10);
@@ -191,7 +189,7 @@ public class ImageExporterTest extends SysuiTestCase { 
        // metadata are not affected by the specified file name.

        final String customizedFileName = "customized_file_name";

        ContentResolver contentResolver = mContext.getContentResolver();

        ImageExporter exporter = new ImageExporter(contentResolver, mFeatureFlags);

        ImageExporter exporter = new ImageExporter(contentResolver);



        UUID requestId = UUID.fromString("3c11da99-9284-4863-b1d5-6f3684976814");

        Bitmap original = createCheckerBitmap(10, 10, 10);
@@ -228,7 +226,7 @@ public class ImageExporterTest extends SysuiTestCase { 


    @Test

    public void testSetUser() {

        ImageExporter exporter = new ImageExporter(mMockContentResolver, mFeatureFlags);

        ImageExporter exporter = new ImageExporter(mMockContentResolver);



        UserHandle imageUserHande = UserHandle.of(10);