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

Commit 068085b3 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Fix emergency callback number not shown for incoming calls. 

- Adding new Connection/Call capability: CAPABILITY_SHOW_CALLBACK_NUMBER.
- Used in Telephony to indicate on an incoming call that the callback
number should be shown.

Bug: 18689292
Change-Id: I1ab3baf9f0d5a22c4b01e6504e88d496182e01c7
parent 86d4da3a

telecomm/java/android/telecom/Call.java

+10 −0
Original line number Diff line number Diff line
@@ -212,6 +212,13 @@ public final class Call { 
        // Next CAPABILITY value: 0x00020000

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



        /**

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

         *

         * @hide

         */

        public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;



        private final Uri mHandle;

        private final int mHandlePresentation;

        private final String mCallerDisplayName;
@@ -306,6 +313,9 @@ public final class Call { 
            if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {

                builder.append(" CAPABILITY_GENERIC_CONFERENCE");

            }

            if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {

                builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");

            }

            builder.append("]");

            return builder.toString();

        }

telecomm/java/android/telecom/Connection.java

+12 −0
Original line number Diff line number Diff line
@@ -177,6 +177,15 @@ public abstract class Connection implements IConferenceable { 
    // Next CAPABILITY value: 0x00020000

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



    /**

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

     *

     * @hide

     */

    public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;







    // Flag controlling whether PII is emitted into the logs

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

            builder.append(" CAPABILITY_GENERIC_CONFERENCE");

        }

        if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {

            builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");

        }

        builder.append("]");

        return builder.toString();

    }