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

Commit cdb03e5c authored by Hyunho Shin's avatar Hyunho Shin Committed by Automerger Merge Worker
Browse files

Merge "Add new publish trigger type" am: 8bf02e51 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959005

Change-Id: I39ad6a54991cd17f1b243121801bd9958f0c9633
parents e4b491a3 8bf02e51

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13726,6 +13726,7 @@ package android.telephony.ims { 
    field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_3G = 6; // 0x6

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

    field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_HSPAPLUS = 5; // 0x5

    field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_INTERNET_PDN = 12; // 0xc

    field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_IWLAN = 9; // 0x9

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

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

telephony/java/android/telephony/ims/RcsUceAdapter.java

+9 −1
Original line number Diff line number Diff line
@@ -268,6 +268,13 @@ public class RcsUceAdapter { 
    @SystemApi

    public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_ENABLED = 11;



    /**

     * A capability update has been requested due to IMS being registered over INTERNET PDN.

     * @hide

     */

    @SystemApi

    public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_INTERNET_PDN = 12;



    /**@hide*/

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = "ERROR_", value = {
@@ -282,7 +289,8 @@ public class RcsUceAdapter { 
            CAPABILITY_UPDATE_TRIGGER_MOVE_TO_WLAN,

            CAPABILITY_UPDATE_TRIGGER_MOVE_TO_IWLAN,

            CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_DISABLED,

            CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_ENABLED

            CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_ENABLED,

            CAPABILITY_UPDATE_TRIGGER_MOVE_TO_INTERNET_PDN

    })

    public @interface StackPublishTriggerType {}