diff options
10 files changed, 16 insertions, 10 deletions
diff --git a/src/com/android/documentsui/CreateDirectoryFragment.java b/src/com/android/documentsui/CreateDirectoryFragment.java index 0c28f543d..dd7c2b585 100644 --- a/src/com/android/documentsui/CreateDirectoryFragment.java +++ b/src/com/android/documentsui/CreateDirectoryFragment.java @@ -29,6 +29,7 @@ import android.content.DialogInterface.OnClickListener; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; +import android.os.FileUtils; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; import androidx.annotation.Nullable; @@ -156,7 +157,7 @@ public class CreateDirectoryFragment extends DialogFragment { Log.w(TAG, "Failed to create directory", e); return null; } finally { - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } } diff --git a/src/com/android/documentsui/DirectoryLoader.java b/src/com/android/documentsui/DirectoryLoader.java index 930d23f94..b95d53e2f 100644 --- a/src/com/android/documentsui/DirectoryLoader.java +++ b/src/com/android/documentsui/DirectoryLoader.java @@ -173,7 +173,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { mSignal = null; } // TODO: Remove this call. - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } return result; diff --git a/src/com/android/documentsui/MultiRootDocumentsLoader.java b/src/com/android/documentsui/MultiRootDocumentsLoader.java index e2b7e297d..36e3e9f1e 100644 --- a/src/com/android/documentsui/MultiRootDocumentsLoader.java +++ b/src/com/android/documentsui/MultiRootDocumentsLoader.java @@ -416,7 +416,7 @@ public abstract class MultiRootDocumentsLoader extends AsyncTaskLoader<Directory } catch (Exception e) { Log.w(TAG, "Failed to acquire content resolver for authority: " + authority); } finally { - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } set(mCursors); diff --git a/src/com/android/documentsui/RefreshTask.java b/src/com/android/documentsui/RefreshTask.java index 85903eaeb..3c238aebd 100644 --- a/src/com/android/documentsui/RefreshTask.java +++ b/src/com/android/documentsui/RefreshTask.java @@ -24,6 +24,7 @@ import android.content.ContentResolver; import android.content.Context; import android.net.Uri; import android.os.CancellationSignal; +import android.os.FileUtils; import android.util.Log; import com.android.documentsui.base.ApplicationScope; @@ -97,7 +98,7 @@ public class RefreshTask extends TimeoutTask<Void, Boolean> { } catch (Exception e) { Log.w(TAG, "Failed to refresh", e); } finally { - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } return refreshSupported; } diff --git a/src/com/android/documentsui/ThumbnailLoader.java b/src/com/android/documentsui/ThumbnailLoader.java index 4b9351377..56cadc3b1 100644 --- a/src/com/android/documentsui/ThumbnailLoader.java +++ b/src/com/android/documentsui/ThumbnailLoader.java @@ -27,6 +27,7 @@ import android.graphics.Point; import android.net.Uri; import android.os.AsyncTask; import android.os.CancellationSignal; +import android.os.FileUtils; import android.os.OperationCanceledException; import android.provider.DocumentsContract; import android.util.Log; @@ -117,7 +118,7 @@ public final class ThumbnailLoader extends AsyncTask<Uri, Void, Bitmap> implemen Log.w(TAG, "Failed to load thumbnail for " + mUri + ": " + e); } } finally { - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } return result; } diff --git a/src/com/android/documentsui/base/DocumentInfo.java b/src/com/android/documentsui/base/DocumentInfo.java index 5b1388dfb..5ae064b61 100644 --- a/src/com/android/documentsui/base/DocumentInfo.java +++ b/src/com/android/documentsui/base/DocumentInfo.java @@ -199,7 +199,7 @@ public class DocumentInfo implements Durable, Parcelable { throw asFileNotFoundException(t); } finally { FileUtils.closeQuietly(cursor); - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } } diff --git a/src/com/android/documentsui/files/ActionHandler.java b/src/com/android/documentsui/files/ActionHandler.java index 3a94d4bc1..245694f84 100644 --- a/src/com/android/documentsui/files/ActionHandler.java +++ b/src/com/android/documentsui/files/ActionHandler.java @@ -26,6 +26,7 @@ import android.content.ContentProviderClient; import android.content.ContentResolver; import android.content.Intent; import android.net.Uri; +import android.os.FileUtils; import android.provider.DocumentsContract; import android.text.TextUtils; import android.util.Log; @@ -182,7 +183,7 @@ public class ActionHandler<T extends FragmentActivity & Addons> extends Abstract Log.w(TAG, "Failed to rename file", e); return null; } finally { - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } } diff --git a/src/com/android/documentsui/roots/ProvidersCache.java b/src/com/android/documentsui/roots/ProvidersCache.java index 11aa203d5..243c2cf28 100644 --- a/src/com/android/documentsui/roots/ProvidersCache.java +++ b/src/com/android/documentsui/roots/ProvidersCache.java @@ -315,7 +315,7 @@ public class ProvidersCache implements ProvidersAccess { return roots; } finally { FileUtils.closeQuietly(cursor); - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } // Cache these freshly parsed roots over in the long-lived system diff --git a/src/com/android/documentsui/services/Job.java b/src/com/android/documentsui/services/Job.java index 92a6aff69..b6f83df63 100644 --- a/src/com/android/documentsui/services/Job.java +++ b/src/com/android/documentsui/services/Job.java @@ -39,6 +39,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.CancellationSignal; +import android.os.FileUtils; import android.os.Parcelable; import android.os.RemoteException; import android.provider.DocumentsContract; @@ -212,7 +213,7 @@ abstract public class Job implements Runnable { final void cleanup() { for (ContentProviderClient client : mClients.values()) { - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } } diff --git a/src/com/android/documentsui/sidebar/EjectRootTask.java b/src/com/android/documentsui/sidebar/EjectRootTask.java index 209fc44af..452eb9d25 100644 --- a/src/com/android/documentsui/sidebar/EjectRootTask.java +++ b/src/com/android/documentsui/sidebar/EjectRootTask.java @@ -22,6 +22,7 @@ import android.content.ContentProviderClient; import android.content.ContentResolver; import android.net.Uri; import android.os.AsyncTask; +import android.os.FileUtils; import android.provider.DocumentsContract; import android.util.Log; @@ -66,7 +67,7 @@ public final class EjectRootTask extends AsyncTask<Void, Void, Boolean> { } catch (Exception e) { Log.w(TAG, "Binder call failed.", e); } finally { - ContentProviderClient.closeQuietly(client); + FileUtils.closeQuietly(client); } return false; |