auto import from //branches/cupcake/...@125939

1 files changed, 4 insertions, 3 deletions

diff --git a/src/com/android/camera/GalleryPicker.java b/src/com/android/camera/GalleryPicker.java
index da946a0..df9049f 100644
--- a/src/com/android/camera/GalleryPicker.java
+++ b/src/com/android/camera/GalleryPicker.java
@@ -315,6 +315,9 @@ public class GalleryPicker extends Activity {
             String cameraBucketId = null;
             for (Map.Entry<String, String> entry: hashMap.entrySet()) {
                 String key = entry.getKey();
+                if (key == null) {
+                    continue;
+                }
                 if (key.equals(cameraItem)) {
                     cameraBucketId = key;
                 } else {
@@ -651,9 +654,7 @@ public class GalleryPicker extends Activity {
 
     @Override
     public boolean onPrepareOptionsMenu(android.view.Menu menu) {
-        int keyboard = getResources().getConfiguration().keyboardHidden;
-        mFlipItem.setEnabled(keyboard == android.content.res.Configuration.KEYBOARDHIDDEN_YES);
-
+        MenuHelper.setFlipOrientationEnabled(this, mFlipItem);
         return true;
     }