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

Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d

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

Change-Id: Iaefd51c1ebe49a81739600c6ef56d5663e54a81d
This commit is contained in:
Jack Nudelman
2021-04-29 20:43:24 +00:00
committed by Automerger Merge Worker
parent f018ea3c3e f99f7fce5d
commit 296cec5c58
5 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Telephony.java
View File

@@ -5334,5 +5334,13 @@ public final class Telephony {
* @hide
*/
public static final String COLUMN_D2D_STATUS_SHARING = "d2d_sharing_status";
/**
* TelephonyProvider column name for VoIMS provisioning. Default is 0.
* <P>Type: INTEGER </P>
*
* @hide
*/
public static final String COLUMN_VOIMS_OPT_IN_STATUS = "voims_opt_in_status";
}
}

8
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -907,6 +907,14 @@ public class SubscriptionManager {
*/
public static final String PROFILE_CLASS = SimInfo.COLUMN_PROFILE_CLASS;
/**
* TelephonyProvider column name for VoIMS opt-in status.
*
* <P>Type: INTEGER (int)</P>
* @hide
*/
public static final String VOIMS_OPT_IN_STATUS = SimInfo.COLUMN_VOIMS_OPT_IN_STATUS;
/**
* Profile class of the subscription
* @hide

13
telephony/java/android/telephony/ims/ProvisioningManager.java
View File

@@ -865,6 +865,19 @@ public class ProvisioningManager {
*/
public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67;
/**
* An integer key representing the voice over IMS opt-in provisioning status for the
* associated subscription. Determines whether the user can see for voice services over
* IMS.
* <p>
* Use {@link #PROVISIONING_VALUE_ENABLED} to enable VoIMS provisioning and
* {@link #PROVISIONING_VALUE_DISABLED} to disable VoIMS provisioning.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
* @hide
*/
public static final int KEY_VOIMS_OPT_IN_STATUS = 68;
/**
* Callback for IMS provisioning changes.
*/

2
telephony/java/android/telephony/ims/aidl/IImsConfig.aidl
View File

@@ -47,4 +47,6 @@ interface IImsConfig {
void removeRcsConfigCallback(IRcsConfigCallback c);
void triggerRcsReconfiguration();
void setRcsClientConfiguration(in RcsClientConfiguration rcc);
void notifyIntImsConfigChanged(int item, int value);
void notifyStringImsConfigChanged(int item, String value);
}

10
telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java
View File

@@ -258,6 +258,16 @@ public class ImsConfigImplBase {
public void setRcsClientConfiguration(RcsClientConfiguration rcc) throws RemoteException {
getImsConfigImpl().setRcsClientConfiguration(rcc);
}
@Override
public void notifyIntImsConfigChanged(int item, int value) throws RemoteException {
notifyImsConfigChanged(item, value);
}
@Override
public void notifyStringImsConfigChanged(int item, String value) throws RemoteException {
notifyImsConfigChanged(item, value);
}
}
/**