commit 39301428ac2b04b68daeb4ec1a919b4251d56e63
author bown.zhang <bown.zhang@spreadtrum.com> Mon Apr 16 16:23:09 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 16 16:23:09 2018 -0700
tree 90d09a6e47afc4719bda16ed84bf13c50a9d05bb
parent 5d04a27dac61951eccdfc7c7cf2085483c87fc18
parent d21ebd74fb229aa347540c0bc1296fb2b8d75949

Merge "Bug #74135101 fix NPE in GroupNameEditDialogFragment in monkey test" am: 7173594e8b
am: d21ebd74fb

Change-Id: I0bb4e726f75b42f033d99e0606e76a94192325f6

src/com/android/contacts/group/GroupNameEditDialogFragment.java

diff --git a/src/com/android/contacts/group/GroupNameEditDialogFragment.java b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
index 853b8fc..e4fb89b 100644
--- a/src/com/android/contacts/group/GroupNameEditDialogFragment.java
+++ b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
@@ -318,6 +318,9 @@
     }
 
     private void showInputMethod(View view) {
+        if (getActivity() == null) {
+            return;
+        }
         final InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(
                 Context.INPUT_METHOD_SERVICE);
         if (imm != null) {