commit 2cef9ae6c860df85c36f8da25bd0bee3d785016d
author Romain Guy <romainguy@android.com> Tue Jul 14 13:21:34 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Jul 14 13:21:34 2009 -0700
tree 9da3adfd489e34a4a304233fed2385e32e176246
parent 9d8ab69b47236e453356abb1b8256ca3eb721371
parent 6f227eba4bdf96102e6dda24ff6c9961a6c41c38

am 6f227eba: Fixes #1977560. Prevents NPE when rotating the gestures activity.

Merge commit '6f227eba4bdf96102e6dda24ff6c9961a6c41c38'

* commit '6f227eba4bdf96102e6dda24ff6c9961a6c41c38':
  Fixes #1977560. Prevents NPE when rotating the gestures activity.

src/com/android/launcher/GesturesActivity.java

diff --git a/src/com/android/launcher/GesturesActivity.java b/src/com/android/launcher/GesturesActivity.java
index 3ea49e2..844392d 100644
--- a/src/com/android/launcher/GesturesActivity.java
+++ b/src/com/android/launcher/GesturesActivity.java
@@ -167,7 +167,7 @@
     @Override
     protected void onPrepareDialog(int id, Dialog dialog) {
         super.onPrepareDialog(id, dialog);
-        if (id == DIALOG_RENAME_GESTURE) {
+        if (id == DIALOG_RENAME_GESTURE && mCurrentRenameInfo != null) {
             mInput.setText(mCurrentRenameInfo.title);
         }
     }