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

Commit f45ac75c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Respond to various API council feedback."

parents 5174816a bb68a650

src/com/android/documentsui/CreateDirectoryFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

            }

        }

src/com/android/documentsui/DirectoryLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
                mSignal = null;

            }

            // TODO: Remove this call.

            ContentProviderClient.closeQuietly(client);

            FileUtils.closeQuietly(client);

        }



        return result;

src/com/android/documentsui/MultiRootDocumentsLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/documentsui/RefreshTask.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }

src/com/android/documentsui/ThumbnailLoader.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }