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

Commit 7567c1aa authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "API Review: rename isGlobalModeEnabled" am: 8e1c444d 

Change-Id: I74d9182098d3ae24a95ad0c42548bf16e97d0fe1
parents 02dd9661 8e1c444d

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9153,9 +9153,9 @@ package android.telephony { 
    method public boolean isDataConnectivityPossible();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isGlobalModeEnabled();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isLteCdmaEvdoGsmWcdmaEnabled();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isManualNetworkSelectionAllowed();

    method public boolean isModemEnabledForSlot(int);

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();

telephony/java/android/telephony/TelephonyManager.java

+5 −5
Original line number Diff line number Diff line
@@ -3791,19 +3791,19 @@ public class TelephonyManager { 
    }



    /**

     * Return if the current radio has global mode enabled, meaning it supports

     * both 3GPP and 3GPP2 radio technologies at the same time.

     * Return if the current radio can support both 3GPP and 3GPP2 radio technologies at the same

     * time. This is also known as global mode, which includes LTE, CDMA, EvDo and GSM/WCDMA.

     *

     * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the

     * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()}.

     *

     * @return {@code true} if global mode is enabled

     *         {@code false} if global mode is not enabled or unknown

     * @return {@code true} if 3GPP and 3GPP2 radio technologies can be supported at the same time

     *         {@code false} if not supported or unknown

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isGlobalModeEnabled() {

    public boolean isLteCdmaEvdoGsmWcdmaEnabled() {

        return getLteOnCdmaMode(getSubId()) == PhoneConstants.LTE_ON_CDMA_TRUE;

    }