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

Commit 62706c51 authored by Eric Erfanian's avatar Eric Erfanian
Browse files

Add assisted dialing properties to the framework. 

This is a manual merge of the oc-mr1-dev change
I086e761ada9a57dca61c3a412561ee54255d6260

These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.

Test: no existing unit tests found. could use some pointers
Bug: 35963245
Change-Id: I84343fb0cda16514c01997fd71d1e819b5b7eebb
parent f20ed032

core/java/android/provider/CallLog.java

+6 −0
Original line number Diff line number Diff line
@@ -223,6 +223,12 @@ public class CallLog { 
        /** Call was WIFI call. */

        public static final int FEATURES_WIFI = 0x8;



        /**

         * Indicates the call underwent Assisted Dialing.

         * @hide

         */

        public static final Integer FEATURES_ASSISTED_DIALING_USED = 0x10;



        /**

         * The phone number as the user entered it.

         * <P>Type: TEXT</P>

telecomm/java/android/telecom/Call.java

+11 −1
Original line number Diff line number Diff line
@@ -416,8 +416,15 @@ public final class Call { 
         */

        public static final int PROPERTY_SELF_MANAGED = 0x00000100;



        /**

         * Indicates the call used Assisted Dialing.

         * See also {@link Connection#PROPERTY_ASSISTED_DIALING_USED}

         * @hide

         */

        public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200;



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

        // Next PROPERTY value: 0x00000200

        // Next PROPERTY value: 0x00000400

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



        private final String mTelecomCallId;
@@ -577,6 +584,9 @@ public final class Call { 
            if(hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {

                builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY");

            }

            if(hasProperty(properties, PROPERTY_ASSISTED_DIALING_USED)) {

                builder.append(" PROPERTY_ASSISTED_DIALING_USED");

            }

            builder.append("]");

            return builder.toString();

        }

telecomm/java/android/telecom/Connection.java

+7 −1
Original line number Diff line number Diff line
@@ -399,8 +399,14 @@ public abstract class Connection extends Conferenceable { 
     */

    public static final int PROPERTY_IS_RTT = 1 << 8;



    /**

     * Set by the framework to indicate that a connection is using assisted dialing.

     * @hide

     */

    public static final int PROPERTY_ASSISTED_DIALING_USED = 1 << 9;



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

    // Next PROPERTY value: 1<<9

    // Next PROPERTY value: 1<<10

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



    /**

telecomm/java/android/telecom/TelecomManager.java

+8 −0
Original line number Diff line number Diff line
@@ -589,6 +589,14 @@ public class TelecomManager { 
    public static final ComponentName EMERGENCY_DIALER_COMPONENT =

            ComponentName.createRelative("com.android.phone", ".EmergencyDialer");



    /**

     * The boolean indicated by this extra controls whether or not a call is eligible to undergo

     * assisted dialing. This extra is stored under {@link #EXTRA_OUTGOING_CALL_EXTRAS}.

     * @hide

     */

    public static final String EXTRA_USE_ASSISTED_DIALING =

            "android.telecom.extra.USE_ASSISTED_DIALING";



    /**

     * The following 4 constants define how properties such as phone numbers and names are

     * displayed to the user.