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

Merge "Update javadoc of TelephonyManager#isModemEnabledForSlot" am: be6e81a4ea am: 621565a21a

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

Change-Id: I447cc7d0863f58f4b56af7cc9ff1acea217d8093
This commit is contained in:
Rambo Wang
2021-11-10 16:11:28 +00:00
committed by Automerger Merge Worker
parent 2616a44c26 621565a21a
commit bc966d1ac1
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -42753,7 +42753,7 @@ package android.telephony {
method public boolean isEmergencyNumber(@NonNull String); method public boolean isEmergencyNumber(@NonNull String);
method public boolean isHearingAidCompatibilitySupported(); method public boolean isHearingAidCompatibilitySupported();
method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isManualNetworkSelectionAllowed(); method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isManualNetworkSelectionAllowed();
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isModemEnabledForSlot(int); method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isModemEnabledForSlot(int);
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int isMultiSimSupported(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int isMultiSimSupported();
method public boolean isNetworkRoaming(); method public boolean isNetworkRoaming();
method public boolean isRadioInterfaceCapabilitySupported(@NonNull String); method public boolean isRadioInterfaceCapabilitySupported(@NonNull String);

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

@@ -13621,15 +13621,18 @@ public class TelephonyManager {
} }
/** /**
* It indicates whether modem is enabled or not per slot. * Indicates whether or not there is a modem stack enabled for the given SIM slot.
* It's the corresponding status of TelephonyManager.enableModemForSlot.
* *
* <p>Requires Permission: * <p>Requires Permission:
* READ_PRIVILEGED_PHONE_STATE or * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE},
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} * READ_PRIVILEGED_PHONE_STATE or that the calling app has carrier privileges (see
* {@link #hasCarrierPrivileges()}).
*
* @param slotIndex which slot it's checking. * @param slotIndex which slot it's checking.
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(anyOf = {android.Manifest.permission.READ_PHONE_STATE,
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE})
public boolean isModemEnabledForSlot(int slotIndex) { public boolean isModemEnabledForSlot(int slotIndex) {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();