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

Add the REGISTRATION_TECH_NR Tech type

Browse Source 
Adds the new NR registration technology for devices
that support IMS over NR so that the APIs can report
this technology.

Bug: 179724463
Test: atest CtsTelephonyTestCases
Change-Id: I4b0f9882dcf36e2ff7151778cbadb8e83513df5a
This commit is contained in:
Brad Ebinger
2021-04-17 15:17:14 -07:00
parent 1f1bbd88dc
commit 5934699aab
4 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13883,6 +13883,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 {

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

@@ -714,15 +714,8 @@ public class ImsMmTelManager implements RegistrationManager {
* @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, 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_CROSS_SIM},
* {@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
@@ -749,15 +742,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_CROSS_SIM},
* {@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

@@ -83,6 +83,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);
/* As the cross sim will be using ePDG tunnel over internet, it behaves /* As the cross sim will be using ePDG tunnel over internet, it behaves

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

@@ -57,7 +57,8 @@ public class ImsRegistrationImplBase {
REGISTRATION_TECH_NONE, REGISTRATION_TECH_NONE,
REGISTRATION_TECH_LTE, REGISTRATION_TECH_LTE,
REGISTRATION_TECH_IWLAN, REGISTRATION_TECH_IWLAN,
REGISTRATION_TECH_CROSS_SIM REGISTRATION_TECH_CROSS_SIM,
REGISTRATION_TECH_NR
}) })
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface ImsRegistrationTech {} public @interface ImsRegistrationTech {}
@@ -66,19 +67,24 @@ 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;
/** /**
* IMS is registered to IMS via internet over second subscription. * This ImsService is registered to IMS via internet over second subscription.
*/ */
public static final int REGISTRATION_TECH_CROSS_SIM = 2; public static final int REGISTRATION_TECH_CROSS_SIM = 2;
/**
* 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.
// The unknown state is set as the initialization state. This is so that we do not call back // The unknown state is set as the initialization state. This is so that we do not call back