Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add the REGISTRATION_TECH_NR Tech type"

Browse Source
This commit is contained in:
Brad Ebinger
2021-05-10 21:02:25 +00:00
committed by Gerrit Code Review
parent 60cd2fa626 500397d3e8
commit 0ad0a88143
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -12331,6 +12331,7 @@ package android.telephony.ims.stub {
field public static final int REGISTRATION_TECH_IWLAN = 1; // 0x1 field public static final int REGISTRATION_TECH_IWLAN = 1; // 0x1
field public static final int REGISTRATION_TECH_LTE = 0; // 0x0 field public static final int REGISTRATION_TECH_LTE = 0; // 0x0
field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff
field public static final int REGISTRATION_TECH_NR = 3; // 0x3
} }
public class ImsSmsImplBase { public class ImsSmsImplBase {

21
telephony/java/android/telephony/ims/ImsMmTelManager.java
View File

@@ -713,15 +713,8 @@ public class ImsMmTelManager implements RegistrationManager {
* @see android.telephony.CarrierConfigManager#KEY_CARRIER_VT_AVAILABLE_BOOL * @see android.telephony.CarrierConfigManager#KEY_CARRIER_VT_AVAILABLE_BOOL
* @see android.telephony.CarrierConfigManager#KEY_CARRIER_IMS_GBA_REQUIRED_BOOL * @see android.telephony.CarrierConfigManager#KEY_CARRIER_IMS_GBA_REQUIRED_BOOL
* @see #isAvailable(int, int) * @see #isAvailable(int, int)
* * @param imsRegTech The IMS registration technology.
* @param imsRegTech The IMS registration technology, can be one of the following: * @param capability The IMS MmTel capability to query.
* {@link ImsRegistrationImplBase#REGISTRATION_TECH_LTE},
* {@link ImsRegistrationImplBase#REGISTRATION_TECH_IWLAN}
* @param capability The IMS MmTel capability to query, can be one of the following:
* {@link MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_VOICE},
* {@link MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_VIDEO},
* {@link MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_UT},
* {@link MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_SMS}
* @return {@code true} if the MmTel IMS capability is capable for this subscription, false * @return {@code true} if the MmTel IMS capability is capable for this subscription, false
* otherwise. * otherwise.
* @hide * @hide
@@ -748,14 +741,8 @@ public class ImsMmTelManager implements RegistrationManager {
* *
* @see #isCapable(int, int) * @see #isCapable(int, int)
* *
* @param imsRegTech The IMS registration technology, can be one of the following: * @param imsRegTech The IMS registration technology.
* {@link ImsRegistrationImplBase#REGISTRATION_TECH_LTE}, * @param capability The IMS MmTel capability to query.
* {@link ImsRegistrationImplBase#REGISTRATION_TECH_IWLAN}
* @param capability The IMS MmTel capability to query, can be one of the following:
* {@link MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_VOICE},
* {@link MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_VIDEO},
* {@link MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_UT},
* {@link MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_SMS}
* @return {@code true} if the MmTel IMS capability is available for this subscription, false * @return {@code true} if the MmTel IMS capability is available for this subscription, false
* otherwise. * otherwise.
* @hide * @hide

2
telephony/java/android/telephony/ims/RegistrationManager.java
View File

@@ -82,6 +82,8 @@ public interface RegistrationManager {
AccessNetworkConstants.TRANSPORT_TYPE_INVALID); AccessNetworkConstants.TRANSPORT_TYPE_INVALID);
put(ImsRegistrationImplBase.REGISTRATION_TECH_LTE, put(ImsRegistrationImplBase.REGISTRATION_TECH_LTE,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN); AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
put(ImsRegistrationImplBase.REGISTRATION_TECH_NR,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
put(ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN, put(ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN,
AccessNetworkConstants.TRANSPORT_TYPE_WLAN); AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
}}; }};

12
telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java
View File

@@ -56,7 +56,8 @@ public class ImsRegistrationImplBase {
@IntDef(value = { @IntDef(value = {
REGISTRATION_TECH_NONE, REGISTRATION_TECH_NONE,
REGISTRATION_TECH_LTE, REGISTRATION_TECH_LTE,
REGISTRATION_TECH_IWLAN REGISTRATION_TECH_IWLAN,
REGISTRATION_TECH_NR
}) })
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface ImsRegistrationTech {} public @interface ImsRegistrationTech {}
@@ -65,13 +66,18 @@ public class ImsRegistrationImplBase {
*/ */
public static final int REGISTRATION_TECH_NONE = -1; public static final int REGISTRATION_TECH_NONE = -1;
/** /**
* IMS is registered to IMS via LTE. * This ImsService is registered to IMS via LTE.
*/ */
public static final int REGISTRATION_TECH_LTE = 0; public static final int REGISTRATION_TECH_LTE = 0;
/** /**
* IMS is registered to IMS via IWLAN. * This ImsService is registered to IMS via IWLAN.
*/ */
public static final int REGISTRATION_TECH_IWLAN = 1; public static final int REGISTRATION_TECH_IWLAN = 1;
// REGISTRATION_TECH = 2 omitted purposefully.
/**
* This ImsService is registered to IMS via NR.
*/
public static final int REGISTRATION_TECH_NR = 3;
// Registration states, used to notify new ImsRegistrationImplBase#Callbacks of the current // Registration states, used to notify new ImsRegistrationImplBase#Callbacks of the current
// state. // state.