Merge "ExifInterface: Remove unnecessary logging of exceptions" (f635d5b8) · Commits · e / os / android_frameworks_base

media/java/android/media/ExifInterface.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -1578,9 +1578,11 @@ public class ExifInterface {
		} catch (IOException e) {
		// Ignore exceptions in order to keep the compatibility with the old versions of
		// ExifInterface.
		if (DEBUG) {
		Log.w(TAG, "Invalid image: ExifInterface got an unsupported image format file"
		+ "(ExifInterface supports JPEG and some RAW image formats only) "
		+ "or a corrupted JPEG file to ExifInterface.", e);
		}
		} finally {
		addDefaultValuesForCompatibility();

		@@ -1601,6 +1603,9 @@ public class ExifInterface {

		private boolean handleRawResult(HashMap map) {
		if (map == null) {
		if (DEBUG) {
		Log.d(TAG, "Raw image file not detected");
		}
		return false;
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ static jobject getRawAttributes(JNIEnv* env, SkStream* stream, bool returnThumbn
		piex::PreviewImageData image_data;

		if (!GetExifFromRawImage(piexStream.get(), String8("[piex stream]"), image_data)) {
		ALOGI("Raw image not detected");
		return NULL;
		}