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

Commit 15847070 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Adds CDMA Voice Privacy Property to Call 

Adds the CDMA Enhanced Voice Privacy Property to a Call when it has been
enabled for the call by the network.

Bug: 26931679
Change-Id: I1f5b4a4fb22fe6aaaf0c424ef11925c6058c6e82
parent a5e81480

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -36136,6 +36136,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
@@ -36322,6 +36323,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
@@ -38972,6 +38972,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
@@ -39169,6 +39170,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
@@ -36214,6 +36214,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
@@ -36400,6 +36401,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();

    }