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

Merge "Add Applicability Language to Usage Settings" into tm-dev

Browse Source
This commit is contained in:
Nathan Harold
2022-03-29 01:36:12 +00:00
committed by Android (Google) Code Review
parent c00a1aafe7 b36dcb00e4
commit 5f5ab5a727
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -4754,10 +4754,14 @@ public class CarrierConfigManager {
* Either omit this key or pass a value of
* {@link SubscriptionManager#USAGE_SETTING_UNKNOWN unknown} to preserve the current setting.
*
* <p>Devices that support configuration of the cellular usage setting, including devices
* with HAL capability to set the cellular usage setting, must honor this setting accordingly.
*
* {@link SubscriptionManager#USAGE_SETTING_DEFAULT default},
* {@link SubscriptionManager#USAGE_SETTING_VOICE_CENTRIC voice-centric},
* or {@link SubscriptionManager#USAGE_SETTING_DATA_CENTRIC data-centric}.
* {@see SubscriptionInfo#getUsageSetting}
*
*/
public static final String KEY_CELLULAR_USAGE_SETTING_INT =
"cellular_usage_setting_int";

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

@@ -1085,6 +1085,10 @@ public class SubscriptionManager {
* <p>Refer to voice-centric mode in 3gpp 24.301 sec 4.3 and 3gpp 24.501 sec 4.3.
* Also refer to "UE's usage setting" as defined in 3gpp 24.301 section 3.1 and 3gpp 23.221
* Annex A.
*
* <p>Devices that support {@link PackageManager#FEATURE_TELEPHONY_CALLING} and support usage
* setting configuration must support setting this value via
* {@link CarrierConfigManager#KEY_CELLULAR_USAGE_SETTING_INT}.
*/
public static final int USAGE_SETTING_VOICE_CENTRIC = 1;
@@ -1094,6 +1098,10 @@ public class SubscriptionManager {
* <p>Refer to data-centric mode in 3gpp 24.301 sec 4.3 and 3gpp 24.501 sec 4.3.
* Also refer to "UE's usage setting" as defined in 3gpp 24.301 section 3.1 and 3gpp 23.221
* Annex A.
*
* <p>Devices that support {@link PackageManager#FEATURE_TELEPHONY_DATA} and support usage
* setting configuration must support setting this value via.
* {@link CarrierConfigManager#KEY_CELLULAR_USAGE_SETTING_INT}.
*/
public static final int USAGE_SETTING_DATA_CENTRIC = 2;