summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/common/ContactPhotoManager.java
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-05-27 15:30:10 -0700
committerJay Shrauner <shrauner@google.com>2014-05-27 16:53:22 -0700
commit98575ef624c1f8e41c126448763663ecd28ffc0a (patch)
tree254ced7f75a62e3bd5957be4fa3452cfc57d6552 /src/com/android/contacts/common/ContactPhotoManager.java
parentdc467cf4fe7d81925a2665c53213bd63bb2cacce (diff)
downloadandroid_packages_apps_ContactsCommon-98575ef624c1f8e41c126448763663ecd28ffc0a.tar.gz
android_packages_apps_ContactsCommon-98575ef624c1f8e41c126448763663ecd28ffc0a.tar.bz2
android_packages_apps_ContactsCommon-98575ef624c1f8e41c126448763663ecd28ffc0a.zip
Catch OutOfMemoryError on photo load
Catch OutOfMemoryError in loadUriBasedPhotos. Bug:15288070 Change-Id: Id793c9bf989e0410656d811b2bdd3d3bef7c082c
Diffstat (limited to 'src/com/android/contacts/common/ContactPhotoManager.java')
-rw-r--r--src/com/android/contacts/common/ContactPhotoManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/ContactPhotoManager.java b/src/com/android/contacts/common/ContactPhotoManager.java
index b3dbd313..213a7a22 100644
--- a/src/com/android/contacts/common/ContactPhotoManager.java
+++ b/src/com/android/contacts/common/ContactPhotoManager.java
@@ -1514,7 +1514,7 @@ class ContactPhotoManagerImpl extends ContactPhotoManager implements Callback {
Log.v(TAG, "Cannot load photo " + uri);
cacheBitmap(originalUri, null, false, uriRequest.getRequestedExtent());
}
- } catch (Exception ex) {
+ } catch (final Exception | OutOfMemoryError ex) {
Log.v(TAG, "Cannot load photo " + uri, ex);
cacheBitmap(originalUri, null, false, uriRequest.getRequestedExtent());
}