diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
commit | 680c92febe88260b74f101838a9734b8e10a704c (patch) | |
tree | e3294c3b2b32cd3532fa9b239326b1aaaa79fc40 /WallpaperPicker/src/com/android/gallery3d/exif | |
parent | 494d2237b8d7b892902604c18098127e77372509 (diff) | |
parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
download | android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.gz android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.bz2 android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.zip |
resolved conflicts for merge of 13ef17a3 to cw-e-dev
b/22609402
Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
Diffstat (limited to 'WallpaperPicker/src/com/android/gallery3d/exif')
-rw-r--r-- | WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java index a1cf0fc85..9247e879f 100644 --- a/WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java +++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java @@ -1247,7 +1247,7 @@ public class ExifInterface { if (l == null || l.length <= 0) { return null; } - return new Long(l[0]); + return Long.valueOf(l[0]); } /** @@ -1266,7 +1266,7 @@ public class ExifInterface { if (l == null || l.length <= 0) { return null; } - return new Integer(l[0]); + return Integer.valueOf(l[0]); } /** @@ -1285,7 +1285,7 @@ public class ExifInterface { if (l == null || l.length <= 0) { return null; } - return new Byte(l[0]); + return Byte.valueOf(l[0]); } /** |