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" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-22 00:15:46 +00:00
committed by Android (Google) Code Review
parent ef3f84023b 5934699aab
commit c8bd865328
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

@@ -13926,6 +13926,7 @@ package android.telephony.ims.stub {
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_NONE = -1; // 0xffffffff
field public static final int REGISTRATION_TECH_NR = 3; // 0x3
}
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 #isAvailable(int, int)
*
* @param imsRegTech The IMS registration technology, can be one of the following:
* {@link ImsRegistrationImplBase#REGISTRATION_TECH_LTE},
* {@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}
* @param imsRegTech The IMS registration technology.
* @param capability The IMS MmTel capability to query.
* @return {@code true} if the MmTel IMS capability is capable for this subscription, false
* otherwise.
* @hide
@@ -749,15 +742,8 @@ public class ImsMmTelManager implements RegistrationManager {
*
* @see #isCapable(int, int)
*
* @param imsRegTech The IMS registration technology, can be one of the following:
* {@link ImsRegistrationImplBase#REGISTRATION_TECH_LTE},
* {@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}
* @param imsRegTech The IMS registration technology.
* @param capability The IMS MmTel capability to query.
* @return {@code true} if the MmTel IMS capability is available for this subscription, false
* otherwise.
* @hide

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

@@ -83,6 +83,8 @@ public interface RegistrationManager {
AccessNetworkConstants.TRANSPORT_TYPE_INVALID);
put(ImsRegistrationImplBase.REGISTRATION_TECH_LTE,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
put(ImsRegistrationImplBase.REGISTRATION_TECH_NR,
AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
put(ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN,
AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
/* 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_LTE,
REGISTRATION_TECH_IWLAN,
REGISTRATION_TECH_CROSS_SIM
REGISTRATION_TECH_CROSS_SIM,
REGISTRATION_TECH_NR
})
@Retention(RetentionPolicy.SOURCE)
public @interface ImsRegistrationTech {}
@@ -66,19 +67,24 @@ public class ImsRegistrationImplBase {
*/
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;
/**
* IMS is registered to IMS via IWLAN.
* This ImsService is registered to IMS via IWLAN.
*/
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;
/**
* 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
// state.
// The unknown state is set as the initialization state. This is so that we do not call back