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

Commit 0531621e authored by Grant Menke's avatar Grant Menke Committed by Android (Google) Code Review
Browse files

Merge "Tag PROPERTY_IS_TRANSACTIONAL with the relevant feature flag." into main

parents 40db2be3 417190a3

AconfigFlags.bp

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ java_defaults { 
        ":camera_platform_flags_core_java_lib{.generated_srcjars}",

        ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",

        ":com.android.text.flags-aconfig-java{.generated_srcjars}",

        ":telecom_flags_core_java_lib{.generated_srcjars}",

        ":android.companion.virtual.flags-aconfig-java{.generated_srcjars}",

        ":android.view.inputmethod.flags-aconfig-java{.generated_srcjars}",

    ],
@@ -45,6 +46,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Telecom

java_aconfig_library {

    name: "telecom_flags_core_java_lib",

    aconfig_declarations: "telecom_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Window

aconfig_declarations {

    name: "com.android.window.flags.window-aconfig",

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -42273,7 +42273,7 @@ package android.telecom { 
    field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10

    field public static final int PROPERTY_IS_ADHOC_CONFERENCE = 8192; // 0x2000

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

    field public static final int PROPERTY_IS_TRANSACTIONAL = 32768; // 0x8000

    field @FlaggedApi(Flags.FLAG_VOIP_APP_ACTIONS_SUPPORT) public static final int PROPERTY_IS_TRANSACTIONAL = 32768; // 0x8000

    field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800

    field public static final int PROPERTY_RTT = 1024; // 0x400

    field public static final int PROPERTY_SELF_MANAGED = 256; // 0x100

telecomm/java/android/telecom/Call.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.telecom;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -31,6 +32,7 @@ import android.os.Handler; 
import android.os.ParcelFileDescriptor;



import com.android.internal.telecom.IVideoProvider;

import com.android.server.telecom.flags.Flags;



import java.io.IOException;

import java.io.InputStreamReader;
@@ -720,6 +722,7 @@ public final class Call { 
         * The underlying connection was added as a transactional call via the

         * {@link TelecomManager#addCall} API.

         */

        @FlaggedApi(Flags.FLAG_VOIP_APP_ACTIONS_SUPPORT)

        public static final int PROPERTY_IS_TRANSACTIONAL = 0x00008000;



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