commit c538281fde3933a1712b8b1de198bc12eab5e4fe
author Brian Attwell <brianattwell@google.com> Fri Jun 05 19:22:22 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 05 19:22:22 2015 +0000
tree d40a7cad002978524116ff5cc993e4932cdb54b8
parent b6569313442300b15bcd46cbedc73f82ca481767
parent 77df2019e6050450bdb68eed228117249e052714

am 77df2019: am 6c6a5863: am 61c63d03: Check for null getCurrentFocus(). Fix NPE

* commit '77df2019e6050450bdb68eed228117249e052714':
  Check for null getCurrentFocus(). Fix NPE

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

diff --git a/src/com/android/contacts/activities/ContactEditorBaseActivity.java b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
index 5c45928..eaf607d 100644
--- a/src/com/android/contacts/activities/ContactEditorBaseActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
@@ -38,6 +38,7 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.RawContacts;
 import android.util.Log;
+import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
 import java.util.ArrayList;
@@ -228,9 +229,10 @@
     @Override
     protected void onPause() {
         super.onPause();
-        InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
-        if (imm != null) {
-            imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+        final InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+        final View currentFocus = getCurrentFocus();
+        if (imm != null && currentFocus != null) {
+            imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);
         }
     }