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

Commit dd52b39f authored by calderwoodra's avatar calderwoodra Committed by Copybara-Service
Browse files

Added 2 null checks to fix top crashers. 

Bug: 73886704,73887420
Test: n/a
PiperOrigin-RevId: 187201516
Change-Id: Ic94816e198e29b87b031a85252e984bc167bb7f8
parent 46cdf805

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()) {