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"

Browse Source 
* changes:
  Add new provisioning flag for VOIMS opt-in
  Add D2D sharing level setting APIs.
This commit is contained in:
Jack Nudelman
2021-04-29 18:31:39 +00:00
committed by Gerrit Code Review
parent 2a2aa6d3c5 1fe2aa14c4
commit f99f7fce5d
7 changed files with 124 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/api/current.txt
View File

@@ -40794,6 +40794,7 @@ package android.telephony {
method public static int getDefaultSmsSubscriptionId();
method public static int getDefaultSubscriptionId();
method public static int getDefaultVoiceSubscriptionId();
method public int getDeviceToDeviceStatusSharing(int);
method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions();
method public static int getSlotIndex(int);
method @Nullable public int[] getSubscriptionIds(int);
@@ -40806,6 +40807,7 @@ package android.telephony {
method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);
method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void removeSubscriptionsFromGroup(@NonNull java.util.List<java.lang.Integer>, @NonNull android.os.ParcelUuid);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharing(int, int);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunistic(boolean, int);
method public void setSubscriptionOverrideCongested(int, boolean, long);
method public void setSubscriptionOverrideCongested(int, boolean, @NonNull int[], long);
@@ -40817,6 +40819,11 @@ package android.telephony {
field public static final String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED";
field public static final String ACTION_MANAGE_SUBSCRIPTION_PLANS = "android.telephony.action.MANAGE_SUBSCRIPTION_PLANS";
field public static final String ACTION_REFRESH_SUBSCRIPTION_PLANS = "android.telephony.action.REFRESH_SUBSCRIPTION_PLANS";
field public static final int D2D_SHARING_ALL = 3; // 0x3
field public static final int D2D_SHARING_ALL_CONTACTS = 1; // 0x1
field public static final int D2D_SHARING_DISABLED = 0; // 0x0
field public static final int D2D_SHARING_STARRED_CONTACTS = 2; // 0x2
field public static final String D2D_STATUS_SHARING = "d2d_sharing_status";
field public static final int DATA_ROAMING_DISABLE = 0; // 0x0
field public static final int DATA_ROAMING_ENABLE = 1; // 0x1
field public static final int DEFAULT_SUBSCRIPTION_ID = 2147483647; // 0x7fffffff

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

@@ -5327,5 +5327,20 @@ public final class Telephony {
* @hide
*/
public static final String COLUMN_RCS_CONFIG = "rcs_config";
/**
* TelephonyProvider column name for device to device sharing status.
*
* @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";
}
}

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

@@ -581,6 +581,43 @@ public class SubscriptionManager {
})
public @interface SimDisplayNameSource {}
/**
* Device status is not shared to a remote party.
*/
public static final int D2D_SHARING_DISABLED = 0;
/**
* Device status is shared with all numbers in the user's contacts.
*/
public static final int D2D_SHARING_ALL_CONTACTS = 1;
/**
* Device status is shared with all starred contacts.
*/
public static final int D2D_SHARING_STARRED_CONTACTS = 2;
/**
* Device status is shared whenever possible.
*/
public static final int D2D_SHARING_ALL = 3;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"D2D_SHARING_"},
value = {
D2D_SHARING_DISABLED,
D2D_SHARING_ALL_CONTACTS,
D2D_SHARING_STARRED_CONTACTS,
D2D_SHARING_ALL
})
public @interface DeviceToDeviceStatusSharing {}
/**
* TelephonyProvider column name for device to device sharing status.
* <P>Type: INTEGER (int)</P>
*/
public static final String D2D_STATUS_SHARING = SimInfo.COLUMN_D2D_STATUS_SHARING;
/**
* TelephonyProvider column name for the color of a SIM.
* <P>Type: INTEGER (int)</P>
@@ -870,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
@@ -3356,6 +3401,36 @@ public class SubscriptionManager {
return false;
}
/**
* Set the device to device status sharing user preference for a subscription ID. The setting
* app uses this method to indicate with whom they wish to share device to device status
* information.
* @param sharing the status sharing preference
* @param subId the unique Subscription ID in database
*/
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setDeviceToDeviceStatusSharing(@DeviceToDeviceStatusSharing int sharing,
int subId) {
if (VDBG) {
logd("[setDeviceToDeviceStatusSharing] + sharing: " + sharing + " subId: " + subId);
}
setSubscriptionPropertyHelper(subId, "setDeviceToDeviceSharingStatus",
(iSub)->iSub.setDeviceToDeviceStatusSharing(sharing, subId));
}
/**
* Returns the user-chosen device to device status sharing preference
* @param subId Subscription id of subscription
* @return The device to device status sharing preference
*/
public @DeviceToDeviceStatusSharing int getDeviceToDeviceStatusSharing(int subId) {
if (VDBG) {
logd("[getDeviceToDeviceStatusSharing] + subId: " + subId);
}
return getIntegerSubscriptionProperty(subId, D2D_STATUS_SHARING, D2D_SHARING_DISABLED,
mContext);
}
/**
* DO NOT USE.
* This API is designed for features that are not finished at this point. Do not call this API.

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);
}
}
/**

2
telephony/java/com/android/internal/telephony/ISub.aidl
View File

@@ -300,4 +300,6 @@ interface ISub {
boolean canDisablePhysicalSubscription();
int setUiccApplicationsEnabled(boolean enabled, int subscriptionId);
int setDeviceToDeviceStatusSharing(int sharing, int subId);
}