Merge changes I09e8be0d,Ic94816e1

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

4 files changed, 12 insertions, 5 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)});
       }
 
diff --git a/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java b/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java
index dbe11dd96..4d7ea3f3d 100644
--- a/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java
+++ b/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java
@@ -71,6 +71,11 @@ public final class DirectoriesCursorLoader extends CursorLoader {
    * @return A list of directories.
    */
   public static List<Directory> toDirectories(Cursor cursor) {
+    if (cursor == null) {
+      LogUtil.i("DirectoriesCursorLoader.toDirectories", "Cursor was null");
+      return new ArrayList<>();
+    }
+
     List<Directory> directories = new ArrayList<>();
     cursor.moveToPosition(-1);
     while (cursor.moveToNext()) {
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml
index eb080bc82..a45330b73 100644
--- a/java/com/android/incallui/AndroidManifest.xml
+++ b/java/com/android/incallui/AndroidManifest.xml
@@ -63,7 +63,8 @@
         android:resizeableActivity="true"
         android:screenOrientation="nosensor"
         android:taskAffinity="com.android.incallui"
-        android:theme="@style/Theme.InCallScreen">
+        android:theme="@style/Theme.InCallScreen"
+        android:windowSoftInputMode="adjustResize">
     </activity>
 
     <activity
diff --git a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml
index 5ba9f4ee8..ef3c1f91a 100644
--- a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml
+++ b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml
@@ -17,8 +17,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/dialer_theme_color"
-    android:fitsSystemWindows="true">
+    android:background="@color/dialer_theme_color">
 
   <include layout="@layout/rtt_banner"/>