commit 88fa7f98c2bff1eb56542f3c5e9de3fb5b84d19f
author Walter Jang <wjang@google.com> Mon Mar 02 09:15:28 2015 -0800
committer Walter Jang <wjang@google.com> Mon Mar 02 09:15:28 2015 -0800
tree 95942aee21563129d714bb6cbf0856f6e1de2372
parent 8025f801f5153917781a9496cabdd81ae1b6deaf

Continue to load fully expanded editor on Intent.ACTION_EDIT

Regression was introduced in ag/638730

Bug 19559699

Change-Id: I62df3cbbcf9afab5332d1287721fd74bebee6169

src/com/android/contacts/activities/ContactEditorActivity.java

diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index 713b45d..16dd9a1 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -20,6 +20,7 @@
 import com.android.contacts.editor.ContactEditorFragment;
 import com.android.contacts.util.DialogManager;
 
+import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 
@@ -41,7 +42,7 @@
 
         final String action = getIntent().getAction();
         final Uri uri = ContactEditorBaseActivity.ACTION_EDIT.equals(action)
-                ? getIntent().getData() : null;
+                || Intent.ACTION_EDIT.equals(action) ? getIntent().getData() : null;
         mFragment.load(action, uri, getIntent().getExtras());
     }
 }