commit f1689e3e99a95c61c0874f3f5057dd35040f1d7e
author Chiao Cheng <chiaocheng@google.com> Wed Nov 14 17:25:56 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 14 17:25:56 2012 -0800
tree a204c410ac58a2d87eff5ac202ef20df56602d31
parent 9598e1ece6a8c61fb8d7001a660f920ff34b4a37
parent 1cd2c24a772cc5ac1fc4ef5c3e7c173996cf3217

am 1cd2c24a: am f5d37174: Merge "Minor changes to validateAction()." into jb-mr1.1-dev

* commit '1cd2c24a772cc5ac1fc4ef5c3e7c173996cf3217':
  Minor changes to validateAction().

src/com/android/contacts/editor/ContactEditorFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index e29e488..028c01f 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -118,9 +118,6 @@
     private static final String KEY_IS_USER_PROFILE = "isUserProfile";
     private static final String KEY_UPDATED_PHOTOS = "updatedPhotos";
 
-    private static final String[] VALID_ACTIONS = {Intent.ACTION_EDIT, Intent.ACTION_INSERT,
-            ContactEditorActivity.ACTION_SAVE_COMPLETED};
-
     public static final String SAVE_MODE_EXTRA_KEY = "saveMode";
 
 
@@ -405,13 +402,13 @@
      * @throws IllegalArgumentException when the action is invalid.
      */
     private void validateAction(String action) {
-        for (String validAction : VALID_ACTIONS) {
-            if (validAction.equals(action)) {
-                return;
-            }
+        if (Intent.ACTION_EDIT.equals(action) || Intent.ACTION_INSERT.equals(action) ||
+                ContactEditorActivity.ACTION_SAVE_COMPLETED.equals(action)) {
+            return;
         }
         throw new IllegalArgumentException("Unknown Action String " + mAction +
-                ". Only support " + Intent.ACTION_EDIT + " or " + Intent.ACTION_INSERT);
+                ". Only support " + Intent.ACTION_EDIT + " or " + Intent.ACTION_INSERT + " or " +
+                ContactEditorActivity.ACTION_SAVE_COMPLETED);
     }
 
     @Override