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

Commit 4c01673a authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev

parents e9a9e6b9 25c7c4d1

telecomm/java/android/telecom/Connection.java

+3 −3
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ public abstract class Connection extends Conferenceable { 
     *

     * @hide

     */

    public static final int PROPERTY_SHOW_CALLBACK_NUMBER = 1<<0;

    public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 1<<0;



    /**

     * Whether the call is a generic conference, where we do not know the precise state of
@@ -655,8 +655,8 @@ public abstract class Connection extends Conferenceable { 
            builder.append("Properties:");

        }



        if (can(properties, PROPERTY_SHOW_CALLBACK_NUMBER)) {

            builder.append(isLong ? " PROPERTY_SHOW_CALLBACK_NUMBER" : " clbk");

        if (can(properties, PROPERTY_EMERGENCY_CALLBACK_MODE)) {

            builder.append(isLong ? " PROPERTY_EMERGENCY_CALLBACK_MODE" : " ecbm");

        }



        if (can(properties, PROPERTY_HIGH_DEF_AUDIO)) {