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

Merge "Expose getLteOnCdmaMode as isGlobalModeEnabled" am: b3a20cbfff am: 96c4a23176

Browse Source 
Change-Id: Icc6c25c8483f86d92d555e465baaba460a395f08
This commit is contained in:
Automerger Merge Worker
2020-02-21 22:41:37 +00:00
parent 0ea7868a9d 96c4a23176
commit 435c4d6186
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -9383,6 +9383,7 @@ package android.telephony {
method public boolean isDataConnectivityPossible(); 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 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 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 @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 @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 isInEmergencySmsMode();

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

@@ -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 * Return if the current radio has global mode enabled, meaning it supports
* of time the mode may be unknown. * both 3GPP and 3GPP2 radio technologies at the same time.
* *
* <p>If this object has been created with {@link #createForSubscriptionId}, applies to the * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
* given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()} * 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}
* *
* @return {@code true} if global mode is enabled
* {@code false} if global mode is not enabled or unknown
* @hide * @hide
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @SystemApi
@UnsupportedAppUsage @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public int getLteOnCdmaMode() { public boolean isGlobalModeEnabled() {
return getLteOnCdmaMode(getSubId()); return getLteOnCdmaMode(getSubId()) == PhoneConstants.LTE_ON_CDMA_TRUE;
} }
/** /**
@@ -3827,7 +3826,7 @@ public class TelephonyManager {
* or {@link PhoneConstants#LTE_ON_CDMA_TRUE} * or {@link PhoneConstants#LTE_ON_CDMA_TRUE}
* @hide * @hide
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@UnsupportedAppUsage @UnsupportedAppUsage
public int getLteOnCdmaMode(int subId) { public int getLteOnCdmaMode(int subId) {
try { try {