Merge "Expose getLteOnCdmaMode as isGlobalModeEnabled" am: b3a20cbfff am: 96c4a23176 (435c4d61) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -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();

telephony/java/android/telephony/TelephonyManager.java

+10 −11

Original line number	Diff line number	Diff line
		@@ -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.
		*
		* <p>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 {