SoundRecorder: fix menu behavior on devices with hardware menu button

If the device has hardware a hardware menu button, onCreateOptionsMenu
is not called. Move the logic from onCreateOptionsMenu to
onPrepareOptionsMenu so it is always run.

Fixes the crash when a user selects "Storage location" on devices with
a hardware menu button and no sdcard.  The option was not removed because
of the reason above.

CYNGNOS-2071
Change-Id: I80e1339220388ec9d5fb206790fa65cbc8d7e216

1 files changed, 9 insertions, 8 deletions

diff --git a/src/com/android/soundrecorder/SoundRecorder.java b/src/com/android/soundrecorder/SoundRecorder.java
index d3c4c80..126a1a5 100644
--- a/src/com/android/soundrecorder/SoundRecorder.java
+++ b/src/com/android/soundrecorder/SoundRecorder.java
@@ -1164,9 +1164,13 @@ public class SoundRecorder extends Activity
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main_menu, menu);
-        if (!mRemainingTimeCalculator.hasExternalStorage()) {
-            menu.removeItem(R.id.menu_item_storage);
-        }
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        Log.i(TAG, "onPrepareOptionsMenu");
 
         // Remove view recordings if there isn't an activity that can handle it
         Uri startDir = Uri.fromFile(Environment.getExternalStorageDirectory());
@@ -1177,16 +1181,13 @@ public class SoundRecorder extends Activity
         if (info.size() == 0) {
             menu.removeItem(R.id.menu_item_view_recordings);
         }
-        return super.onCreateOptionsMenu(menu);
-    }
 
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
         menu.findItem(R.id.menu_item_keyboard).setEnabled(mRecorder.state() == Recorder.IDLE_STATE);
         menu.findItem(R.id.menu_item_filetype).setEnabled(mRecorder.state() == Recorder.IDLE_STATE);
         if (mRemainingTimeCalculator.hasExternalStorage()) {
             menu.findItem(R.id.menu_item_storage).setEnabled(mRecorder.state() == Recorder.IDLE_STATE);
+        } else {
+            menu.removeItem(R.id.menu_item_storage);
         }
         if (SystemProperties.getBoolean("debug.soundrecorder.enable", false)) {
             menu.findItem(R.id.menu_item_keyboard).setVisible(true);