Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6550972c authored by wangqi's avatar wangqi Committed by android-build-merger
Browse files

Merge changes I09e8be0d,Ic94816e1 

am: 82393b83

Change-Id: I8b290ab7f39ce48a8d05942bf9c3d8070d9a4126
parents 0ed650e2 82393b83

java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java

+4 −2
Original line number Diff line number Diff line
@@ -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)});

      }

java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java

+5 −0
Original line number Diff line number Diff line
@@ -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()) {

java/com/android/incallui/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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

java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml

+1 −2
Original line number Diff line number Diff line
@@ -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"/>