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

Commit e5eef006 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "mainline-telecom-constants" am: c155bb62 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471168

Change-Id: I5da60e9f18ee80293baf2b0a1a5734d72b20f907
parents 429a15d4 c155bb62

telecomm/java/android/telecom/PhoneAccount.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -48,12 +48,11 @@ import java.util.Objects; 
public final class PhoneAccount implements Parcelable {

public final class PhoneAccount implements Parcelable {





    /**

    /**

     * String extra which determines the order in which {@link PhoneAccount}s are sorted

     * Integer extra which determines the order in which {@link PhoneAccount}s are sorted

     *

     *

     * This is an extras key set via {@link Builder#setExtras} which determines the order in which

     * This is an extras key set via {@link Builder#setExtras} which determines the order in which

     * {@link PhoneAccount}s from the same {@link ConnectionService} are sorted. The accounts

     * {@link PhoneAccount}s from the same {@link ConnectionService} are sorted. The accounts

     * are sorted by this key via standard lexicographical order, (as implemented in

     * are sorted in ascending order by this key, and this ordering is used to

     * {@link String#compareTo}), and this ordering is used to

     * determine priority when a call can be placed via multiple accounts.

     * determine priority when a call can be placed via multiple accounts.

     *

     *

     * When multiple {@link PhoneAccount}s are supplied with the same sort order key, no ordering is

     * When multiple {@link PhoneAccount}s are supplied with the same sort order key, no ordering is