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

Commit 33819318 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Suppress OperationCanceledException logging. 

These exceptions are normal when an app has cancelled an outstanding
thumbnail request.

Bug: 11385378
Change-Id: I8aed5721b447cda5baf447ac7afd627aa1062863
parent 5d321d47

core/java/android/provider/DocumentsContract.java

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.media.ExifInterface; 
import android.net.Uri;

import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.OperationCanceledException;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor.OnCloseListener;

import android.os.RemoteException;
@@ -670,7 +671,9 @@ public final class DocumentsContract { 
        try {

            return getDocumentThumbnail(client, documentUri, size, signal);

        } catch (Exception e) {

            if (!(e instanceof OperationCanceledException)) {

                Log.w(TAG, "Failed to load thumbnail for " + documentUri + ": " + e);

            }

            return null;

        } finally {

            ContentProviderClient.releaseQuietly(client);

packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java

+4 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.net.Uri; 
import android.os.AsyncTask;

import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.OperationCanceledException;

import android.os.Parcelable;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;
@@ -1028,7 +1029,9 @@ public class DirectoryFragment extends Fragment { 
                    thumbs.put(mUri, result);

                }

            } catch (Exception e) {

                if (!(e instanceof OperationCanceledException)) {

                    Log.w(TAG, "Failed to load thumbnail for " + mUri + ": " + e);

                }

            } finally {

                ContentProviderClient.releaseQuietly(client);

            }