Remove unused Flags variable from ImageExporter (c82878e7) · Commits · e / os / android_frameworks_base

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

+10 −15

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

	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
	import com.android.systemui.flags.FeatureFlags;

	import com.google.common.util.concurrent.ListenableFuture;		import com.google.common.util.concurrent.ListenableFuture;

	@@ -94,12 +93,10 @@ public class ImageExporter {
	private final ContentResolver mResolver;		private final ContentResolver mResolver;
	private CompressFormat mCompressFormat = CompressFormat.PNG;		private CompressFormat mCompressFormat = CompressFormat.PNG;
	private int mQuality = 100;		private int mQuality = 100;
	private final FeatureFlags mFlags;

	@Inject		@Inject
	public ImageExporter(ContentResolver resolver, FeatureFlags flags) {		public ImageExporter(ContentResolver resolver) {
	mResolver = resolver;		mResolver = resolver;
	mFlags = flags;
	}		}

	/**		/**
	@@ -161,7 +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, mFlags,		mQuality, /* publish */ true, owner,
	createFilename(captureTime, mCompressFormat, displayId)));		createFilename(captureTime, mCompressFormat, displayId)));
	}		}

	@@ -184,7 +181,7 @@ public class ImageExporter {
	bitmap,		bitmap,
	ZonedDateTime.now(ZoneId.systemDefault()),		ZonedDateTime.now(ZoneId.systemDefault()),
	format,		format,
	mQuality, /* publish */ true, owner, mFlags,		mQuality, /* publish */ true, owner,
	createSystemFileDisplayName(fileName, format),		createSystemFileDisplayName(fileName, format),
	true /* allowOverwrite */));		true /* allowOverwrite */));
	}		}
	@@ -199,7 +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, mFlags,		mQuality, /* publish */ true, owner,
	createFilename(captureTime, mCompressFormat, displayId)));		createFilename(captureTime, mCompressFormat, displayId)));
	}		}

	@@ -213,7 +210,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, mFlags,		mQuality, /* publish */ true, owner,
	createSystemFileDisplayName(fileName, mCompressFormat)));		createSystemFileDisplayName(fileName, mCompressFormat)));
	}		}

	@@ -275,7 +272,6 @@ public class ImageExporter {
	private final UserHandle mOwner;		private final UserHandle mOwner;
	private final String mFileName;		private final String mFileName;
	private final boolean mPublish;		private final boolean mPublish;
	private final FeatureFlags mFlags;

	/**		/**
	* 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
	@@ -288,14 +284,14 @@ public class ImageExporter {

	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, boolean publish, UserHandle owner,
	FeatureFlags flags, String fileName) {		String fileName) {
	this(resolver, requestId, bitmap, captureTime, format, quality, publish, owner, flags,		this(resolver, requestId, bitmap, captureTime, format, quality, publish, owner,
	fileName, 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, boolean publish, UserHandle owner,
	FeatureFlags flags, String fileName, boolean allowOverwrite) {		String fileName, boolean allowOverwrite) {
	mResolver = resolver;		mResolver = resolver;
	mRequestId = requestId;		mRequestId = requestId;
	mBitmap = bitmap;		mBitmap = bitmap;
	@@ -305,7 +301,6 @@ public class ImageExporter {
	mOwner = owner;		mOwner = owner;
	mFileName = fileName;		mFileName = fileName;
	mPublish = publish;		mPublish = publish;
	mFlags = flags;
	mAllowOverwrite = allowOverwrite;		mAllowOverwrite = allowOverwrite;
	}		}

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

	uri = createEntry(mResolver, mFormat, mCaptureTime, mFileName, mOwner, mFlags,		uri = createEntry(mResolver, mFormat, mCaptureTime, mFileName, mOwner,
	mAllowOverwrite);		mAllowOverwrite);
	throwIfInterrupted();		throwIfInterrupted();

	@@ -365,7 +360,7 @@ public class ImageExporter {
	}		}

	private static Uri createEntry(ContentResolver resolver, CompressFormat format,		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 {		boolean allowOverwrite) throws ImageExportException {
	Trace.beginSection("ImageExporter_createEntry");		Trace.beginSection("ImageExporter_createEntry");
	try {		try {

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

+3 −5

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

	import com.android.systemui.SysuiTestCase;		import com.android.systemui.SysuiTestCase;
	import com.android.systemui.flags.FakeFeatureFlags;

	import com.google.common.util.concurrent.ListenableFuture;		import com.google.common.util.concurrent.ListenableFuture;

	@@ -79,7 +78,6 @@ public class ImageExporterTest extends SysuiTestCase {
	private static final ZonedDateTime CAPTURE_TIME =		private static final ZonedDateTime CAPTURE_TIME =
	ZonedDateTime.of(LocalDateTime.of(2020, 12, 15, 13, 15), ZoneId.of("America/New_York"));		ZonedDateTime.of(LocalDateTime.of(2020, 12, 15, 13, 15), ZoneId.of("America/New_York"));

	private FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags();
	@Mock		@Mock
	private ContentResolver mMockContentResolver;		private ContentResolver mMockContentResolver;

	@@ -125,7 +123,7 @@ public class ImageExporterTest extends SysuiTestCase {
	@Test		@Test
	public void testImageExport() throws ExecutionException, InterruptedException, IOException {		public void testImageExport() throws ExecutionException, InterruptedException, IOException {
	ContentResolver contentResolver = mContext.getContentResolver();		ContentResolver contentResolver = mContext.getContentResolver();
	ImageExporter exporter = new ImageExporter(contentResolver, mFeatureFlags);		ImageExporter exporter = new ImageExporter(contentResolver);

	UUID requestId = UUID.fromString("3c11da99-9284-4863-b1d5-6f3684976814");		UUID requestId = UUID.fromString("3c11da99-9284-4863-b1d5-6f3684976814");
	Bitmap original = createCheckerBitmap(10, 10, 10);		Bitmap original = createCheckerBitmap(10, 10, 10);
	@@ -191,7 +189,7 @@ public class ImageExporterTest extends SysuiTestCase {
	// metadata are not affected by the specified file name.		// metadata are not affected by the specified file name.
	final String customizedFileName = "customized_file_name";		final String customizedFileName = "customized_file_name";
	ContentResolver contentResolver = mContext.getContentResolver();		ContentResolver contentResolver = mContext.getContentResolver();
	ImageExporter exporter = new ImageExporter(contentResolver, mFeatureFlags);		ImageExporter exporter = new ImageExporter(contentResolver);

	UUID requestId = UUID.fromString("3c11da99-9284-4863-b1d5-6f3684976814");		UUID requestId = UUID.fromString("3c11da99-9284-4863-b1d5-6f3684976814");
	Bitmap original = createCheckerBitmap(10, 10, 10);		Bitmap original = createCheckerBitmap(10, 10, 10);
	@@ -228,7 +226,7 @@ public class ImageExporterTest extends SysuiTestCase {

	@Test		@Test
	public void testSetUser() {		public void testSetUser() {
	ImageExporter exporter = new ImageExporter(mMockContentResolver, mFeatureFlags);		ImageExporter exporter = new ImageExporter(mMockContentResolver);

	UserHandle imageUserHande = UserHandle.of(10);		UserHandle imageUserHande = UserHandle.of(10);