diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-10-29 20:46:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-29 20:46:39 +0000 |
| commit | 7fbba1622a975782fddb9a7c5d9dd733dd4e425d (patch) | |
| tree | 9cca0fb6184bab1a32cac9de971dc982b0d89bab /packages | |
| parent | 1b5bd6b68af0f26dc0f42e442a9ffa8e1f30e3e5 (diff) | |
| parent | 33819318f61224cdda45e5e9a70dc9cdb9f33911 (diff) | |
| download | frameworks_base-7fbba1622a975782fddb9a7c5d9dd733dd4e425d.zip frameworks_base-7fbba1622a975782fddb9a7c5d9dd733dd4e425d.tar.gz frameworks_base-7fbba1622a975782fddb9a7c5d9dd733dd4e425d.tar.bz2 | |
Merge "Suppress OperationCanceledException logging." into klp-dev
Diffstat (limited to 'packages')
| -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); } |