diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-10-29 14:59:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 14:59:28 -0700 |
| commit | 854419b5c71e42a13c171e1c533c6381a1082a62 (patch) | |
| tree | 00d25962c810ca20dfefbba3d27e03c3f7b48710 /packages/DocumentsUI | |
| parent | dd86ed9b578332661ecea50e20f91335a0151a88 (diff) | |
| parent | 88c84f97186b9f5808949a8b11357f6f8d27f046 (diff) | |
| download | frameworks_base-854419b5c71e42a13c171e1c533c6381a1082a62.zip frameworks_base-854419b5c71e42a13c171e1c533c6381a1082a62.tar.gz frameworks_base-854419b5c71e42a13c171e1c533c6381a1082a62.tar.bz2 | |
am 88c84f97: am dd225d28: am 7fbba162: Merge "Suppress OperationCanceledException logging." into klp-dev
* commit '88c84f97186b9f5808949a8b11357f6f8d27f046':
Suppress OperationCanceledException logging.
Diffstat (limited to 'packages/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index 775720e..b2b2bd8 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java @@ -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); } |