Merge changes I09e8be0d,Ic94816e1

* changes:
  Fix bug that soft keyboard pushes action bar out of window.
  Added 2 null checks to fix top crashers.

1 files changed, 4 insertions, 2 deletions

diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
index 57e253c7e..7caa314f3 100644
--- a/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
@@ -103,7 +103,8 @@ public final class SearchContactsCursorLoader extends CursorLoader {
   static class SmartDialCursor extends MergeCursor implements SearchCursor {
 
     static SmartDialCursor newInstance(Context context, Cursor smartDialCursor) {
-      if (smartDialCursor.getCount() == 0) {
+      if (smartDialCursor == null || smartDialCursor.getCount() == 0) {
+        LogUtil.i("SmartDialCursor.newInstance", "Cursor was null or empty");
         return new SmartDialCursor(new Cursor[] {new MatrixCursor(Projections.CP2_PROJECTION)});
       }
 
@@ -173,7 +174,8 @@ public final class SearchContactsCursorLoader extends CursorLoader {
   static class RegularSearchCursor extends MergeCursor implements SearchCursor {
 
     static RegularSearchCursor newInstance(Context context, Cursor regularSearchCursor) {
-      if (regularSearchCursor.getCount() == 0) {
+      if (regularSearchCursor == null || regularSearchCursor.getCount() == 0) {
+        LogUtil.i("RegularSearchCursor.newInstance", "Cursor was null or empty");
         return new RegularSearchCursor(new Cursor[] {new MatrixCursor(Projections.CP2_PROJECTION)});
       }