commit c55b39d312008d0d9f2994fc83c3e4d373cbc42c
author Wenyi Wang <wenyiw@google.com> Thu Sep 01 22:22:58 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 01 22:22:58 2016 +0000
tree ce32d6270e49d3ac5346a291676181356ebe08b8
parent 27f524da0ba0eaf57218f7515ec0eed3cb0bb0aa
parent be3305505a2e6343a5296198459e4ec4ed907c17

Merge "Fix editor crash in multi-window mode" into ub-contactsdialer-g-dev

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 8762dc2..f10120c 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -520,6 +520,9 @@
 
         @Override
         public void startPhotoActivity(Intent intent, int requestCode, Uri photoUri) {
+            if (getActivity() == null) {
+                return;
+            }
             mRawContactIdRequestingPhoto = mEditor.getRawContactId();
             mCurrentPhotoHandler = this;
             mStatus = Status.SUB_ACTIVITY;