commit be3305505a2e6343a5296198459e4ec4ed907c17
author Wenyi Wang <wenyiw@google.com> Thu Sep 01 12:08:09 2016 -0700
committer Wenyi Wang <wenyiw@google.com> Thu Sep 01 12:08:09 2016 -0700
tree 6e50198a07cc0e63561d36862a50240fe57b6e09
parent d609ed7bc006ad1f6dc30953ea13d7f38e93fe51

Fix editor crash in multi-window mode

Bug: 31236427
Test: manual - based on "steps to reproduce" in the bug.
Change-Id: Iea187b7b1389a9f8ebd4acfd603cf51376c22c11

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;