diff --git a/api/system-current.txt b/api/system-current.txt index 3e853a9e02d3d..91c23432e2ed1 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9383,6 +9383,7 @@ 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 @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean isIccLockEnabled(); 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(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index acd33e13b8e28..10a000065e2f2 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3800,21 +3800,20 @@ public class TelephonyManager { } /** - * Return if the current radio is LTE on CDMA. This is a tri-state return value as for a period - * of time the mode may be unknown. + * Return if the current radio has global mode enabled, meaning it supports + * both 3GPP and 3GPP2 radio technologies at the same time. * *
If this object has been created with {@link #createForSubscriptionId}, applies to the - * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()} - * - * @return {@link PhoneConstants#LTE_ON_CDMA_UNKNOWN}, {@link PhoneConstants#LTE_ON_CDMA_FALSE} - * or {@link PhoneConstants#LTE_ON_CDMA_TRUE} + * 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 * @hide */ - @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) - @UnsupportedAppUsage - public int getLteOnCdmaMode() { - return getLteOnCdmaMode(getSubId()); + @SystemApi + @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) + public boolean isGlobalModeEnabled() { + return getLteOnCdmaMode(getSubId()) == PhoneConstants.LTE_ON_CDMA_TRUE; } /** @@ -3827,7 +3826,7 @@ public class TelephonyManager { * or {@link PhoneConstants#LTE_ON_CDMA_TRUE} * @hide */ - @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @UnsupportedAppUsage public int getLteOnCdmaMode(int subId) { try {