commit d33af0b2b31b6b16f72ea92f5015a30f6a723d2d
author Jay Shrauner <shrauner@google.com> Tue May 27 15:30:10 2014 -0700
committer Jay Shrauner <shrauner@google.com> Tue May 27 16:53:22 2014 -0700
tree e622cb563bd73d655ab8f1782238602dd51683bf
parent 2c092fd9aa840f10bf088dba87cde03050c68906

Catch OutOfMemoryError on photo load

Catch OutOfMemoryError in loadUriBasedPhotos.

Bug:15288070
Change-Id: Id793c9bf989e0410656d811b2bdd3d3bef7c082c

src/com/android/contacts/common/ContactPhotoManager.java

diff --git a/src/com/android/contacts/common/ContactPhotoManager.java b/src/com/android/contacts/common/ContactPhotoManager.java
index b3dbd31..213a7a2 100644
--- a/src/com/android/contacts/common/ContactPhotoManager.java
+++ b/src/com/android/contacts/common/ContactPhotoManager.java
@@ -1514,7 +1514,7 @@
                         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());
                 }