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

Merge "setCdmaSubscription/RoamingMode returns when not CDMA" into sc-dev

Browse Source
This commit is contained in:
Sarah Chin
2021-03-17 00:36:06 +00:00
committed by Android (Google) Code Review
parent bb4be48b51 0762c16765
commit 1c97b8d767
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9980,7 +9980,8 @@ public class TelephonyManager {
}
/**
* Sets the roaming mode for CDMA phone to the given mode {@code mode}.
* Sets the roaming mode for CDMA phone to the given mode {@code mode}. If the phone is not
* CDMA capable, this method does nothing.
*
* <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
* given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()}
@@ -10003,6 +10004,7 @@ public class TelephonyManager {
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setCdmaRoamingMode(@CdmaRoamingMode int mode) {
if (getPhoneType() != PHONE_TYPE_CDMA) return;
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
@@ -10083,7 +10085,8 @@ public class TelephonyManager {
}
/**
* Sets the subscription mode for CDMA phone to the given mode {@code mode}.
* Sets the subscription mode for CDMA phone to the given mode {@code mode}. If the phone is not
* CDMA capable, this method does nothing.
*
* @param mode CDMA subscription mode.
* @throws SecurityException if the caller does not have the permission.
@@ -10102,6 +10105,7 @@ public class TelephonyManager {
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setCdmaSubscriptionMode(@CdmaSubscription int mode) {
if (getPhoneType() != PHONE_TYPE_CDMA) return;
try {
ITelephony telephony = getITelephony();
if (telephony != null) {