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

Commit 1a59a97a authored by Eric Erfanian's avatar Eric Erfanian Committed by android-build-merger
Browse files

Merge "Update the RTT features constant." 

am: c18b175d

Change-Id: Ic4419be53f3390336a5b95abe34a03944b3437e4
parents f17dcdae c18b175d

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -33430,7 +33430,7 @@ package android.provider { 
    field public static final java.lang.String FEATURES = "features";

    field public static final int FEATURES_HD_CALL = 4; // 0x4

    field public static final int FEATURES_PULLED_EXTERNALLY = 2; // 0x2

    field public static final int FEATURES_RTT = 16; // 0x10

    field public static final int FEATURES_RTT = 32; // 0x20

    field public static final int FEATURES_VIDEO = 1; // 0x1

    field public static final int FEATURES_WIFI = 8; // 0x8

    field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";

core/java/android/provider/CallLog.java

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

        public static final int FEATURES_WIFI = 1 << 3;



        /** Call was on RTT at some point */

        public static final int FEATURES_RTT = 1 << 4;



        /**

         * Indicates the call underwent Assisted Dialing.

         * @hide

         */

        public static final Integer FEATURES_ASSISTED_DIALING_USED = 0x10;

        public static final int FEATURES_ASSISTED_DIALING_USED = 1 << 4;



        /** Call was on RTT at some point */

        public static final int FEATURES_RTT = 1 << 5;



        /**

         * The phone number as the user entered it.