summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/data
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2012-05-17 23:44:54 -0700
committerChih-Chung Chang <chihchung@google.com>2012-05-17 23:48:00 -0700
commit62c29e71e226ae31573ab883a18e30fdfcb2711b (patch)
tree1daaadc4f5fa2b7acb794729a1865ee9098c8bc6 /src/com/android/gallery3d/data
parent71cd89a38752bc22ae0ec2df965e4280b776623c (diff)
downloadandroid_packages_apps_Gallery2-62c29e71e226ae31573ab883a18e30fdfcb2711b.tar.gz
android_packages_apps_Gallery2-62c29e71e226ae31573ab883a18e30fdfcb2711b.tar.bz2
android_packages_apps_Gallery2-62c29e71e226ae31573ab883a18e30fdfcb2711b.zip
Handle null for the video resolution field in MediaProvider.
Bug: 6517317 Change-Id: Ic9bb769b3b8e8816bc76a4500c6a2770e69a4dc5
Diffstat (limited to 'src/com/android/gallery3d/data')
-rw-r--r--src/com/android/gallery3d/data/LocalVideo.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java
index 8eb6f914a..4e888a573 100644
--- a/src/com/android/gallery3d/data/LocalVideo.java
+++ b/src/com/android/gallery3d/data/LocalVideo.java
@@ -113,6 +113,7 @@ public class LocalVideo extends LocalMediaItem {
}
private void parseResolution(String resolution) {
+ if (resolution == null) return;
int m = resolution.indexOf('x');
if (m == -1) return;
try {