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

Commit 24d17c93 authored Oct 20, 2022 by Cole Faust Committed by Automerger Merge Worker Oct 20, 2022

Fix errorprone warnings that should be errors am: 27db4326

Original change: https://android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/2256451

Change-Id: If12028187816759809fc4c33064715db9471d1e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents be4d956f 27db4326

src/com/android/documentsui/archives/Archive.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -327,4 +327,4 @@ public abstract class Archive implements Closeable {
		checkArgumentEquals(expected.toString(), actual.toString(), message);
		}
		}
		};
		}

src/com/android/documentsui/archives/ArchiveId.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,4 +54,4 @@ public class ArchiveId {
		public String toDocumentId() {
		return mArchiveUri.toString() + DELIMITER + mAccessMode + DELIMITER + mPath;
		}
		};
		}

src/com/android/documentsui/base/Providers.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -45,12 +45,11 @@ public final class Providers {
		public static final String AUTHORITY_BUGREPORT = "com.android.shell.documents";

		private static final String DOCSUI_PACKAGE = "com.android.documentsui";
		private static final Set<String> SYSTEM_AUTHORITIES = new HashSet<String>() {{
		add(AUTHORITY_STORAGE);
		add(AUTHORITY_DOWNLOADS);
		add(AUTHORITY_MEDIA);
		add(AUTHORITY_MTP);
		}};
		private static final Set<String> SYSTEM_AUTHORITIES = Set.of(
		AUTHORITY_STORAGE,
		AUTHORITY_DOWNLOADS,
		AUTHORITY_MEDIA,
		AUTHORITY_MTP);

		public static boolean isArchiveUri(Uri uri) {
		return uri != null && ArchivesProvider.AUTHORITY.equals(uri.getAuthority());

src/com/android/documentsui/dirlist/DirectoryItemAnimator.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ class DirectoryItemAnimator extends DefaultItemAnimator {

		class ItemInfo extends DefaultItemAnimator.ItemHolderInfo {
		boolean isActivated;
		};
		}

		/**
		* Animates changes in background color.
		@@ -161,5 +161,5 @@ class DirectoryItemAnimator extends DefaultItemAnimator {

		@Override
		public void onAnimationRepeat(Animator animation) {}
		};
		};
		}
		}

src/com/android/documentsui/roots/ProvidersCache.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -89,12 +89,11 @@ public class ProvidersCache implements ProvidersAccess, LookupApplicationName {
		// Not all providers are equally well written. If a provider returns
		// empty results we don't cache them...unless they're in this magical list
		// of beloved providers.
		private static final List<String> PERMIT_EMPTY_CACHE = new ArrayList<String>() {{
		private static final List<String> PERMIT_EMPTY_CACHE = List.of(
		// MTP provider commonly returns no roots (if no devices are attached).
		add(Providers.AUTHORITY_MTP);
		Providers.AUTHORITY_MTP,
		// ArchivesProvider doesn't support any roots.
		add(ArchivesProvider.AUTHORITY);
		}};
		ArchivesProvider.AUTHORITY);
		private static final int FIRST_LOAD_TIMEOUT_MS = 5000;

		private final Context mContext;