Merge "Prevent double tap on suggestions" into nyc-mr1-dev
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index d0f51f6..e1f8afe 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1269,7 +1269,14 @@
}
public void startSuggestion(Intent intent) {
- mCurrentSuggestion = intent.getComponent();
+ if (intent == null) {
+ return;
+ }
+ final ComponentName componentName = intent.getComponent();
+ if (componentName.equals(mCurrentSuggestion)) {
+ return;
+ }
+ mCurrentSuggestion = componentName;
startActivityForResult(intent, REQUEST_SUGGESTION);
}