diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java b/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java index 1029ecda6705..663ba20070bd 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java @@ -158,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, - createFilename(captureTime, mCompressFormat, displayId))); + mQuality, owner, createFilename(captureTime, mCompressFormat, displayId))); } /** @@ -181,7 +180,8 @@ public class ImageExporter { bitmap, ZonedDateTime.now(ZoneId.systemDefault()), format, - mQuality, /* publish */ true, owner, + mQuality, + owner, createSystemFileDisplayName(fileName, format), true /* allowOverwrite */)); } @@ -196,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, - createFilename(captureTime, mCompressFormat, displayId))); + mQuality, owner, createFilename(captureTime, mCompressFormat, displayId))); } /** @@ -210,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, - createSystemFileDisplayName(fileName, mCompressFormat))); + mQuality, owner, createSystemFileDisplayName(fileName, mCompressFormat))); } /** @@ -246,7 +244,6 @@ public class ImageExporter { public String fileName; public long timestamp; public CompressFormat format; - public boolean published; @Override public String toString() { @@ -256,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(); } @@ -271,7 +267,6 @@ public class ImageExporter { private final int mQuality; private final UserHandle mOwner; private final String mFileName; - private final boolean mPublish; /** * 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; Task(ContentResolver resolver, UUID requestId, Bitmap bitmap, ZonedDateTime captureTime, - CompressFormat format, int quality, boolean publish, UserHandle owner, - String fileName) { - this(resolver, requestId, bitmap, captureTime, format, quality, publish, owner, - 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, + CompressFormat format, int quality, UserHandle owner, String fileName, boolean allowOverwrite) { mResolver = resolver; mRequestId = requestId; @@ -300,7 +294,6 @@ public class ImageExporter { mQuality = quality; mOwner = owner; mFileName = fileName; - mPublish = publish; mAllowOverwrite = allowOverwrite; } @@ -327,10 +320,7 @@ public class ImageExporter { writeExif(mResolver, uri, mRequestId, width, height, mCaptureTime); throwIfInterrupted(); - if (mPublish) { - publishEntry(mResolver, uri); - result.published = true; - } + publishEntry(mResolver, uri); result.timestamp = mCaptureTime.toInstant().toEpochMilli(); result.requestId = mRequestId; |