summaryrefslogtreecommitdiffstats
path: root/packages/DocumentsUI
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-10-29 13:52:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-29 13:52:54 -0700
commit88c84f97186b9f5808949a8b11357f6f8d27f046 (patch)
tree40b4c9e214bc04fe75e033e7e958bd3a6465ea32 /packages/DocumentsUI
parented84dea928a5a830a19b5bcab7ad05a7e92f3279 (diff)
parentdd225d28e6e7a57a9ae70c4a7f6217358e3a2052 (diff)
downloadframeworks_base-88c84f97186b9f5808949a8b11357f6f8d27f046.zip
frameworks_base-88c84f97186b9f5808949a8b11357f6f8d27f046.tar.gz
frameworks_base-88c84f97186b9f5808949a8b11357f6f8d27f046.tar.bz2
am dd225d28: am 7fbba162: Merge "Suppress OperationCanceledException logging." into klp-dev
* commit 'dd225d28e6e7a57a9ae70c4a7f6217358e3a2052': Suppress OperationCanceledException logging.
Diffstat (limited to 'packages/DocumentsUI')
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java5
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);
}