Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dd225d28: am 7fbba162: Merge "Suppress OperationCanceledException logging." into klp-dev

Browse Source 
* commit 'dd225d28e6e7a57a9ae70c4a7f6217358e3a2052':
  Suppress OperationCanceledException logging.
This commit is contained in:
Jeff Sharkey
2013-10-29 13:52:54 -07:00
committed by Android Git Automerger
parent ed84dea928 dd225d28e6
commit 88c84f9718
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/provider/DocumentsContract.java
View File

@@ -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) {
Log.w(TAG, "Failed to load thumbnail for " + documentUri + ": " + e);
if (!(e instanceof OperationCanceledException)) {
Log.w(TAG, "Failed to load thumbnail for " + documentUri + ": " + e);
}
return null;
} finally {
ContentProviderClient.releaseQuietly(client);

5
packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
View File

@@ -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) {
Log.w(TAG, "Failed to load thumbnail for " + mUri + ": " + e);
if (!(e instanceof OperationCanceledException)) {
Log.w(TAG, "Failed to load thumbnail for " + mUri + ": " + e);
}
} finally {
ContentProviderClient.releaseQuietly(client);
}