Merge "Fix DuplicateBranches errorprone issue" into main
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
index 5467d42..29bb1bf 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
@@ -617,11 +617,7 @@
             if (isThumbnailRequested()) {
                 if (tag.hasValue()) {
                     for (int i = 0; i < tag.getComponentCount(); i++) {
-                        if (tag.getDataType() == ExifTag.TYPE_UNSIGNED_SHORT) {
-                            registerUncompressedStrip(i, tag.getValueAt(i));
-                        } else {
-                            registerUncompressedStrip(i, tag.getValueAt(i));
-                        }
+                        registerUncompressedStrip(i, tag.getValueAt(i));
                     }
                 } else {
                     mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, false));