Merge "Catch exceptions if Exif is malformed" into ub-now-lunchbox (523e762a) · Commits · e / os / android_packages_apps_Trebuchet

WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -276,6 +276,9 @@ public class WallpaperCropActivity extends Activity {
		}
		} catch (IOException e) {
		Log.w(LOGTAG, "Getting exif data failed", e);
		} catch (NullPointerException e) {
		// Sometimes the ExifInterface has an internal NPE if Exif data isn't valid
		Log.w(LOGTAG, "Getting exif data failed", e);
		} finally {
		Utils.closeSilently(bis);
		Utils.closeSilently(is);

+6 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,9 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource {
		try {
		ei.readExif(mPath);
		return true;
		} catch (NullPointerException e) {
		Log.w("BitmapRegionTileSource", "reading exif failed", e);
		return false;
		} catch (IOException e) {
		Log.w("BitmapRegionTileSource", "getting decoder failed", e);
		return false;
		@@ -311,6 +314,9 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource {
		} catch (IOException e) {
		Log.e("BitmapRegionTileSource", "Failed to load URI " + mUri, e);
		return false;
		} catch (NullPointerException e) {
		Log.e("BitmapRegionTileSource", "Failed to read EXIF for URI " + mUri, e);
		return false;
		} finally {
		Utils.closeSilently(is);
		}