Merge "Guard against menu onclick being called twice"
diff --git a/src/com/android/browser/WallpaperHandler.java b/src/com/android/browser/WallpaperHandler.java
index 2cb223a..cd896da 100644
--- a/src/com/android/browser/WallpaperHandler.java
+++ b/src/com/android/browser/WallpaperHandler.java
@@ -68,7 +68,7 @@
@Override
public boolean onMenuItemClick(MenuItem item) {
- if (mUrl != null) {
+ if (mUrl != null && getState() == State.NEW) {
// The user may have tried to set a image with a large file size as
// their background so it may take a few moments to perform the
// operation.