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

Commit 8baaf64a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fallback to default on null dialer"

parents 09bb9095 593dea0c
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.telephony.TelephonyManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import java.util.List;

/**
 * Class for behavior of the dialer role.
 *
@@ -49,9 +47,9 @@ public class DialerRoleBehavior implements RoleBehavior {
                context);
    }

    @NonNull
    @Nullable
    @Override
    public List<String> getDefaultHolders(@NonNull Role role, @NonNull Context context) {
        return ExclusiveDefaultHolderMixin.getDefaultHolders(role, "config_defaultDialer", context);
    public String getFallbackHolder(@NonNull Role role, @NonNull Context context) {
        return ExclusiveDefaultHolderMixin.getDefaultHolder(role, "config_defaultDialer", context);
    }
}
+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public class Role {
    /**
     * Get the fallback holder of this role, which will be added whenever there are no role holders.
     * <p>
     * Should return empty if this role {@link #mShowNone shows a "None" item}.
     * Should return {@code null} if this role {@link #mShowNone shows a "None" item}.
     *
     * @param context the {@code Context} to retrieve system services
     *