summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hyunho Shin <hhshin@google.com> 2022-01-25 23:33:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-01-25 23:33:53 +0000
commit99dc6717fd8acc9ca065b5151f7c92dee1e56b09 (patch)
tree74255fe98636bd3eefaee9d8b373a9de7a317c69
parent9bb654855f1bce0953fc5d5961de116fbdcb10a9 (diff)
parentcdb03e5cda83c01e7f580d46f6e571c0b6b062a8 (diff)
Merge "Add new publish trigger type" am: 8bf02e51dc am: cdb03e5cda
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959005 Change-Id: I88d81e3a35a84ed273fe0451724d01a721f095e1
-rw-r--r--core/api/system-current.txt1
-rw-r--r--telephony/java/android/telephony/ims/RcsUceAdapter.java10
2 files changed, 10 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 6d00909e4499..6c8c06160bd7 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -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
diff --git a/telephony/java/android/telephony/ims/RcsUceAdapter.java b/telephony/java/android/telephony/ims/RcsUceAdapter.java
index 61de3ac2b25e..154bb11db5e3 100644
--- a/telephony/java/android/telephony/ims/RcsUceAdapter.java
+++ b/telephony/java/android/telephony/ims/RcsUceAdapter.java
@@ -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 {}