Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 621565a2 authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc of TelephonyManager#isModemEnabledForSlot" am: be6e81a4 

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

Change-Id: I18f8a5d02df26bbf980d4ed0f14a4e825cdf4374
parents 846984a4 be6e81a4

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -42753,7 +42753,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);

telephony/java/android/telephony/TelephonyManager.java

+8 −5
Original line number Diff line number Diff line
@@ -13621,15 +13621,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();