summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2018-07-09 16:48:45 -0600
committer Jeff Sharkey <jsharkey@android.com> 2018-07-09 16:52:33 -0600
commit00a12bf0e6cd8fc6a31ce4e35687b1425407f631 (patch)
treea0edd98505cca0cfc4e01940fa2a04c8fd60a4b6
parenta4ff00f7d103a82aaa9da48f1ada1a98540bdb73 (diff)
Mechanical refactoring of Preconditions.
We're making an effort to get DocumentsUI to build against public API, so move toward use "androidx" Preconditions from the support library. Mostly mechanical refactoring with "sed". Test: builds Bug: 110959821 Change-Id: Ic3f2171cfe09ba30bdf59906d0c125abc6d1d8dc
-rw-r--r--src/com/android/documentsui/FocusManager.java2
-rw-r--r--src/com/android/documentsui/ScopedAccessProvider.java2
-rw-r--r--src/com/android/documentsui/archives/Archive.java2
-rw-r--r--src/com/android/documentsui/archives/ReadableArchive.java2
-rw-r--r--src/com/android/documentsui/base/DocumentStack.java2
-rw-r--r--src/com/android/documentsui/dirlist/DragStartListener.java2
-rw-r--r--src/com/android/documentsui/inspector/HeaderTextSelector.java2
-rw-r--r--src/com/android/documentsui/inspector/InspectorController.java2
-rw-r--r--src/com/android/documentsui/inspector/InspectorFragment.java2
-rw-r--r--src/com/android/documentsui/inspector/MetadataUtils.java2
-rw-r--r--src/com/android/documentsui/inspector/RuntimeDataSupplier.java2
-rw-r--r--src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java4
-rw-r--r--src/com/android/documentsui/selection/DefaultBandHost.java2
-rw-r--r--src/com/android/documentsui/services/FileOperation.java2
-rw-r--r--tests/common/com/android/documentsui/DocumentsProviderHelper.java2
-rw-r--r--tests/unit/com/android/documentsui/files/ActionHandlerTest.java2
16 files changed, 17 insertions, 17 deletions
diff --git a/src/com/android/documentsui/FocusManager.java b/src/com/android/documentsui/FocusManager.java
index 1fa42e450..5fe732684 100644
--- a/src/com/android/documentsui/FocusManager.java
+++ b/src/com/android/documentsui/FocusManager.java
@@ -18,7 +18,7 @@ package com.android.documentsui;
import static com.android.documentsui.base.DocumentInfo.getCursorString;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import static com.android.internal.util.Preconditions.checkNotNull;
+import static androidx.core.util.Preconditions.checkNotNull;
import androidx.annotation.ColorRes;
import androidx.annotation.Nullable;
diff --git a/src/com/android/documentsui/ScopedAccessProvider.java b/src/com/android/documentsui/ScopedAccessProvider.java
index e1209111c..d09a90f31 100644
--- a/src/com/android/documentsui/ScopedAccessProvider.java
+++ b/src/com/android/documentsui/ScopedAccessProvider.java
@@ -38,7 +38,7 @@ import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.clearSc
import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.getAllPackages;
import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.getAllPermissions;
import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.setScopedAccessPermissionStatus;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import androidx.annotation.Nullable;
import android.app.ActivityManager;
diff --git a/src/com/android/documentsui/archives/Archive.java b/src/com/android/documentsui/archives/Archive.java
index 6031ebed8..e1119df67 100644
--- a/src/com/android/documentsui/archives/Archive.java
+++ b/src/com/android/documentsui/archives/Archive.java
@@ -36,7 +36,7 @@ import android.text.TextUtils;
import android.webkit.MimeTypeMap;
import androidx.annotation.GuardedBy;
-import com.android.internal.util.Preconditions;
+import androidx.core.util.Preconditions;
import java.io.Closeable;
import java.io.File;
diff --git a/src/com/android/documentsui/archives/ReadableArchive.java b/src/com/android/documentsui/archives/ReadableArchive.java
index 3427d7364..77fb07e31 100644
--- a/src/com/android/documentsui/archives/ReadableArchive.java
+++ b/src/com/android/documentsui/archives/ReadableArchive.java
@@ -32,7 +32,7 @@ import android.util.Log;
import android.util.jar.StrictJarFile;
import androidx.annotation.GuardedBy;
-import com.android.internal.util.Preconditions;
+import androidx.core.util.Preconditions;
import libcore.io.IoUtils;
diff --git a/src/com/android/documentsui/base/DocumentStack.java b/src/com/android/documentsui/base/DocumentStack.java
index f30c43aa1..fee6ee3be 100644
--- a/src/com/android/documentsui/base/DocumentStack.java
+++ b/src/com/android/documentsui/base/DocumentStack.java
@@ -17,7 +17,7 @@
package com.android.documentsui.base;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import android.content.ContentResolver;
import android.database.Cursor;
diff --git a/src/com/android/documentsui/dirlist/DragStartListener.java b/src/com/android/documentsui/dirlist/DragStartListener.java
index ba2624f05..e3fa088a6 100644
--- a/src/com/android/documentsui/dirlist/DragStartListener.java
+++ b/src/com/android/documentsui/dirlist/DragStartListener.java
@@ -17,7 +17,7 @@
package com.android.documentsui.dirlist;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import android.net.Uri;
import androidx.annotation.VisibleForTesting;
diff --git a/src/com/android/documentsui/inspector/HeaderTextSelector.java b/src/com/android/documentsui/inspector/HeaderTextSelector.java
index 5530fbe63..9593844f3 100644
--- a/src/com/android/documentsui/inspector/HeaderTextSelector.java
+++ b/src/com/android/documentsui/inspector/HeaderTextSelector.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import android.text.Spannable;
import android.view.ActionMode;
diff --git a/src/com/android/documentsui/inspector/InspectorController.java b/src/com/android/documentsui/inspector/InspectorController.java
index 97e8642f6..7d1ec2e92 100644
--- a/src/com/android/documentsui/inspector/InspectorController.java
+++ b/src/com/android/documentsui/inspector/InspectorController.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import androidx.annotation.StringRes;
import android.app.Activity;
diff --git a/src/com/android/documentsui/inspector/InspectorFragment.java b/src/com/android/documentsui/inspector/InspectorFragment.java
index b2fd155e7..0345948f6 100644
--- a/src/com/android/documentsui/inspector/InspectorFragment.java
+++ b/src/com/android/documentsui/inspector/InspectorFragment.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import android.app.Fragment;
import android.content.Intent;
diff --git a/src/com/android/documentsui/inspector/MetadataUtils.java b/src/com/android/documentsui/inspector/MetadataUtils.java
index b5c1034b5..c737d14db 100644
--- a/src/com/android/documentsui/inspector/MetadataUtils.java
+++ b/src/com/android/documentsui/inspector/MetadataUtils.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector;
-import static com.android.internal.util.Preconditions.checkNotNull;
+import static androidx.core.util.Preconditions.checkNotNull;
import android.media.ExifInterface;
import android.os.Bundle;
diff --git a/src/com/android/documentsui/inspector/RuntimeDataSupplier.java b/src/com/android/documentsui/inspector/RuntimeDataSupplier.java
index fa8048892..1b7ff84ea 100644
--- a/src/com/android/documentsui/inspector/RuntimeDataSupplier.java
+++ b/src/com/android/documentsui/inspector/RuntimeDataSupplier.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.inspector;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import android.app.LoaderManager;
import android.app.LoaderManager.LoaderCallbacks;
diff --git a/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java b/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
index 2e9fda730..08cbf1a62 100644
--- a/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
+++ b/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
@@ -17,7 +17,7 @@ package com.android.documentsui.prefs;
import static com.android.documentsui.base.SharedMinimal.DEBUG;
import static com.android.documentsui.base.SharedMinimal.DIRECTORY_ROOT;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
@@ -90,7 +90,7 @@ public class ScopedAccessLocalPreferences {
public static void setScopedAccessPermissionStatus(Context context, String packageName,
@Nullable String uuid, String directory, @PermissionStatus int status) {
checkArgument(!TextUtils.isEmpty(directory),
- "Cannot pass empty directory - did you mean %s?", DIRECTORY_ROOT);
+ "Cannot pass empty directory - did you mean " + DIRECTORY_ROOT + "?");
final String key = getScopedAccessDenialsKey(packageName, uuid, directory);
if (DEBUG) {
Log.d(TAG, "Setting permission of " + packageName + ":" + uuid + ":" + directory
diff --git a/src/com/android/documentsui/selection/DefaultBandHost.java b/src/com/android/documentsui/selection/DefaultBandHost.java
index 9d856cc75..5b24e8e92 100644
--- a/src/com/android/documentsui/selection/DefaultBandHost.java
+++ b/src/com/android/documentsui/selection/DefaultBandHost.java
@@ -15,7 +15,7 @@
*/
package com.android.documentsui.selection;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import androidx.annotation.DrawableRes;
import android.graphics.Point;
diff --git a/src/com/android/documentsui/services/FileOperation.java b/src/com/android/documentsui/services/FileOperation.java
index b056f33ea..29393a81e 100644
--- a/src/com/android/documentsui/services/FileOperation.java
+++ b/src/com/android/documentsui/services/FileOperation.java
@@ -22,7 +22,7 @@ import static com.android.documentsui.services.FileOperationService.OPERATION_DE
import static com.android.documentsui.services.FileOperationService.OPERATION_EXTRACT;
import static com.android.documentsui.services.FileOperationService.OPERATION_MOVE;
import static com.android.documentsui.services.FileOperationService.OPERATION_UNKNOWN;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import android.content.Context;
import android.net.Uri;
diff --git a/tests/common/com/android/documentsui/DocumentsProviderHelper.java b/tests/common/com/android/documentsui/DocumentsProviderHelper.java
index 9b9118e37..b4ad5eb78 100644
--- a/tests/common/com/android/documentsui/DocumentsProviderHelper.java
+++ b/tests/common/com/android/documentsui/DocumentsProviderHelper.java
@@ -20,7 +20,7 @@ import static android.provider.DocumentsContract.buildChildDocumentsUri;
import static android.provider.DocumentsContract.buildDocumentUri;
import static android.provider.DocumentsContract.buildRootsUri;
import static com.android.documentsui.base.DocumentInfo.getCursorString;
-import static com.android.internal.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgument;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.fail;
diff --git a/tests/unit/com/android/documentsui/files/ActionHandlerTest.java b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java
index 34c314259..1916924ed 100644
--- a/tests/unit/com/android/documentsui/files/ActionHandlerTest.java
+++ b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java
@@ -63,7 +63,7 @@ import com.android.documentsui.testing.TestEnv;
import com.android.documentsui.testing.TestFeatures;
import com.android.documentsui.testing.TestProvidersAccess;
import com.android.documentsui.ui.TestDialogController;
-import com.android.internal.util.Preconditions;
+import androidx.core.util.Preconditions;
import org.junit.Before;
import org.junit.Test;