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

Commit 3b42bce6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix NPE when querying preferred without an account"

parents 70ebcc7c de9dde6a

java/com/android/dialer/precall/impl/CallingAccountSelector.java

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ public class CallingAccountSelector implements PreCallAction { 
      if (cursor == null || !cursor.moveToFirst()) {

        return Optional.absent();

      }

      return Optional.of(cursor.getString(0));

      return Optional.fromNullable(cursor.getString(0));

    }

  }

java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ public interface SuggestionProvider { 
    USER_SET,

    // The user has selected the SIM for all contacts on the account.

    ACCOUNT,

    // Unspecified reason.

    OTHER,

  }



  /** The suggestion. */