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

Commit 87737bd0 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge \\"Adds CDMA Voice Privacy Property to Call\\" into nyc-mr1-dev am: 5eebdd8b 

am: 8f6b7a8c

Change-Id: Ic58027cec2c1f1c630f59936624665e050cb067e
parents f0cd8d30 8f6b7a8c

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -36151,6 +36151,7 @@ package android.telecom { 
    field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4

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

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

    field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80

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

    field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40

    field public static final int PROPERTY_WIFI = 8; // 0x8
@@ -36337,6 +36338,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

    field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";

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

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

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

    field public static final int STATE_DIALING = 3; // 0x3

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -38987,6 +38987,7 @@ package android.telecom { 
    field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4

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

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

    field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80

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

    field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40

    field public static final int PROPERTY_WIFI = 8; // 0x8
@@ -39184,6 +39185,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

    field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";

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

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

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

    field public static final int STATE_DIALING = 3; // 0x3

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -36229,6 +36229,7 @@ package android.telecom { 
    field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4

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

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

    field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 128; // 0x80

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

    field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40

    field public static final int PROPERTY_WIFI = 8; // 0x8
@@ -36415,6 +36416,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

    field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";

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

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

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

    field public static final int STATE_DIALING = 3; // 0x3

telecomm/java/android/telecom/Call.java

+8 −0
Original line number Diff line number Diff line
@@ -307,6 +307,11 @@ public final class Call { 
         */

        public static final int PROPERTY_IS_EXTERNAL_CALL = 0x00000040;



        /**

         * Indicates that the call has CDMA Enhanced Voice Privacy enabled.

         */

        public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 0x00000080;



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

        // Next PROPERTY value: 0x00000100

        //******************************************************************************************
@@ -463,6 +468,9 @@ public final class Call { 
            if (hasProperty(properties, PROPERTY_IS_EXTERNAL_CALL)) {

                builder.append(" PROPERTY_IS_EXTERNAL_CALL");

            }

            if(hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {

                builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY");

            }

            builder.append("]");

            return builder.toString();

        }

telecomm/java/android/telecom/Connection.java

+9 −1
Original line number Diff line number Diff line
@@ -334,9 +334,13 @@ public abstract class Connection extends Conferenceable { 
     */

    public static final int PROPERTY_IS_EXTERNAL_CALL = 1<<4;



    /**

     * Indicates that the connection has CDMA Enhanced Voice Privacy enabled.

     */

    public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 1<<5;



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

    // Next PROPERTY value: 1<<5

    // Next PROPERTY value: 1<<6

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



    /**
@@ -531,6 +535,10 @@ public abstract class Connection extends Conferenceable { 
            builder.append(" PROPERTY_IS_EXTERNAL_CALL");

        }



        if (can(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {

            builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY");

        }



        builder.append("]");

        return builder.toString();

    }