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

Commit 96d6c40c authored by Tyler Gunn's avatar Tyler Gunn
Browse files

resolved conflicts for merge of 00de38a1 to master 

Change-Id: Ib1ac99ba7181ad79af94a04124380833bcb79a0c
parents ac1496a1 00de38a1

telecomm/java/android/telecom/Call.java

+14 −5
Original line number Diff line number Diff line
@@ -208,16 +208,22 @@ public final class Call { 
         */

        public static final int CAPABILITY_WIFI = 0x00010000;



        //******************************************************************************************

        // Next CAPABILITY value: 0x00020000

        //******************************************************************************************



        /**

         * Indicates that the current device callback number should be shown.

         *

         * @hide

         */

        public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;

        public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00020000;



        /**

         * Speed up audio setup for MT call.

         * @hide

         */

        public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;



        //**********************************************************************************************

        // Next CAPABILITY value: 0x00080000

        //**********************************************************************************************



        private final Uri mHandle;

        private final int mHandlePresentation;
@@ -316,6 +322,9 @@ public final class Call { 
            if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {

                builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");

            }

            if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {

                builder.append(" CAPABILITY_SPEED_UP_IMS_MT_AUDIO");

            }

            builder.append("]");

            return builder.toString();

        }

telecomm/java/android/telecom/Connection.java

+12 −5
Original line number Diff line number Diff line
@@ -173,18 +173,22 @@ public abstract class Connection implements IConferenceable { 
     */

    public static final int CAPABILITY_WIFI = 0x000010000;



    //**********************************************************************************************

    // Next CAPABILITY value: 0x00020000

    //**********************************************************************************************



    /**

     * Indicates that the current device callback number should be shown.

     *

     * @hide

     */

    public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;

    public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00020000;



    /**

     * Speed up audio setup for MT call.

     * @hide

     */

    public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000;



    //**********************************************************************************************

    // Next CAPABILITY value: 0x00080000

    //**********************************************************************************************



    // Flag controlling whether PII is emitted into the logs

    private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
@@ -287,6 +291,9 @@ public abstract class Connection implements IConferenceable { 
        if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {

            builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");

        }

        if (can(capabilities, CAPABILITY_SPEED_UP_MT_AUDIO)) {

            builder.append(" CAPABILITY_SPEED_UP_IMS_MT_AUDIO");

        }

        builder.append("]");

        return builder.toString();

    }