summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-27 13:54:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-27 13:54:02 -0700
commite62abe9385121cb91abea389bd08924a1c0ce25e (patch)
tree4b541849d5dc534de537f34feaed3b88ce9051db
parent986d2b05513e7cf4faaed54afd0931df7f9d5e4a (diff)
parenta2c6e06dfa4e83925a9af7d3b455b48e5e97f067 (diff)
downloadGallery3D-e62abe9385121cb91abea389bd08924a1c0ce25e.tar.gz
am a2c6e06d: Merge "Fixing a couple of crashes when mContentUri is null."
* commit 'a2c6e06dfa4e83925a9af7d3b455b48e5e97f067': Fixing a couple of crashes when mContentUri is null.
-rw-r--r--src/com/cooliris/media/HudLayer.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/cooliris/media/HudLayer.java b/src/com/cooliris/media/HudLayer.java
index a449603..4b09b27 100644
--- a/src/com/cooliris/media/HudLayer.java
+++ b/src/com/cooliris/media/HudLayer.java
@@ -324,7 +324,7 @@ public final class HudLayer extends Layer {
public void run() {
ArrayList<MediaBucket> buckets = mGridLayer.getSelectedBuckets();
MediaItem item = MediaBucketList.getFirstItemSelection(buckets);
- if (item == null) {
+ if (item == null || item.mContentUri == null) {
return;
}
mGridLayer.deselectAll();
@@ -345,7 +345,7 @@ public final class HudLayer extends Layer {
public void run() {
ArrayList<MediaBucket> buckets = mGridLayer.getSelectedBuckets();
MediaItem item = MediaBucketList.getFirstItemSelection(buckets);
- if (item == null) {
+ if (item == null || item.mContentUri == null) {
return;
}
mGridLayer.deselectAll();
@@ -368,7 +368,7 @@ public final class HudLayer extends Layer {
public void run() {
ArrayList<MediaBucket> buckets = mGridLayer.getSelectedBuckets();
MediaItem item = MediaBucketList.getFirstItemSelection(buckets);
- if (item == null) {
+ if (item == null || item.mContentUri == null) {
return;
}
mGridLayer.deselectAll();