commit 949b3eb9d3ced2a068fcec5a96a2d8b0e90d2fa2
author Android (Google) Code Review <android-gerrit@google.com> Tue Jul 14 14:51:25 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 14 14:51:25 2009 -0700
tree 30aa30b8d6b040aabe3e6ca8f50de065adf5c3cc
parent 6f227eba4bdf96102e6dda24ff6c9961a6c41c38
parent 7b4ef330d9675733bc950c07e8907d8a00966de8

Merge change 7136 into donut

* changes:
  Fix the lock issue on Home. This was caused by onPrepareDialog().

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);
         }
     }