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 am: bc966d1ac1 am: 67bd6aa180

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

Change-Id: I47fc3c3a1c79eb534cea4e9d83c615dce83b79e4
This commit is contained in:
Rambo Wang
2021-11-10 16:40:20 +00:00
committed by Automerger Merge Worker
parent c2e084ecd6 67bd6aa180
commit 7274868735
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

@@ -42831,7 +42831,7 @@ package android.telephony {
method public boolean isEmergencyNumber(@NonNull String);
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(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 public boolean isNetworkRoaming();
method public boolean isRadioInterfaceCapabilitySupported(@NonNull String);

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

@@ -13624,15 +13624,18 @@ public class TelephonyManager {
}
/**
* It indicates whether modem is enabled or not per slot.
* It's the corresponding status of TelephonyManager.enableModemForSlot.
* Indicates whether or not there is a modem stack enabled for the given SIM slot.
*
* <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.
*/
@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) {
try {
ITelephony telephony = getITelephony();