Merge "Disable CDMA calls" into main (c8e86757) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -2455,6 +2455,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public String getMeid() {
		if (Flags.cleanupCdma()) return null;
		return getMeid(getSlotIndex());
		}

		@@ -2500,6 +2501,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public String getMeid(int slotIndex) {
		if (Flags.cleanupCdma()) return null;
		ITelephony telephony = getITelephony();
		if (telephony == null) return null;

		@@ -2531,6 +2533,7 @@ public class TelephonyManager {
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		@Nullable
		public String getManufacturerCode() {
		if (Flags.cleanupCdma()) return null;
		return getManufacturerCode(getSlotIndex());
		}

		@@ -2549,6 +2552,7 @@ public class TelephonyManager {
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		@Nullable
		public String getManufacturerCode(int slotIndex) {
		if (Flags.cleanupCdma()) return null;
		ITelephony telephony = getITelephony();
		if (telephony == null) return null;

		@@ -6942,6 +6946,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public @EriIconIndex int getCdmaEnhancedRoamingIndicatorDisplayNumber() {
		if (Flags.cleanupCdma()) return -1;
		return getCdmaEriIconIndex(getSubId());
		}

		@@ -6954,6 +6959,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@UnsupportedAppUsage
		public @EriIconIndex int getCdmaEriIconIndex(int subId) {
		if (Flags.cleanupCdma()) return -1;
		try {
		ITelephony telephony = getITelephony();
		if (telephony == null)
		@@ -6980,6 +6986,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@UnsupportedAppUsage
		public @EriIconMode int getCdmaEriIconMode(int subId) {
		if (Flags.cleanupCdma()) return -1;
		try {
		ITelephony telephony = getITelephony();
		if (telephony == null)
		@@ -7003,6 +7010,7 @@ public class TelephonyManager {
		@Deprecated
		@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
		public String getCdmaEriText() {
		if (Flags.cleanupCdma()) return null;
		return getCdmaEriText(getSubId());
		}

		@@ -7016,6 +7024,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
		@UnsupportedAppUsage
		public String getCdmaEriText(int subId) {
		if (Flags.cleanupCdma()) return null;
		try {
		ITelephony telephony = getITelephony();
		if (telephony == null)
		@@ -8295,6 +8304,7 @@ public class TelephonyManager {
		@Deprecated
		@UnsupportedAppUsage
		public String nvReadItem(int itemID) {
		if (Flags.cleanupCdma()) return "";
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		@@ -8324,6 +8334,7 @@ public class TelephonyManager {
		*/
		@Deprecated
		public boolean nvWriteItem(int itemID, String itemValue) {
		if (Flags.cleanupCdma()) return false;
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		@@ -8352,6 +8363,7 @@ public class TelephonyManager {
		*/
		@Deprecated
		public boolean nvWriteCdmaPrl(byte[] preferredRoamingList) {
		if (Flags.cleanupCdma()) return false;
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		@@ -10712,6 +10724,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public String getCdmaMdn() {
		if (Flags.cleanupCdma()) return null;
		return getCdmaMdn(getSubId());
		}

		@@ -10727,6 +10740,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public String getCdmaMdn(int subId) {
		if (Flags.cleanupCdma()) return null;
		try {
		ITelephony telephony = getITelephony();
		if (telephony == null)
		@@ -10751,6 +10765,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public String getCdmaMin() {
		if (Flags.cleanupCdma()) return null;
		return getCdmaMin(getSubId());
		}

		@@ -10766,6 +10781,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public String getCdmaMin(int subId) {
		if (Flags.cleanupCdma()) return null;
		try {
		ITelephony telephony = getITelephony();
		if (telephony == null)
		@@ -12059,6 +12075,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public @CdmaRoamingMode int getCdmaRoamingMode() {
		if (Flags.cleanupCdma()) return CDMA_ROAMING_MODE_RADIO_DEFAULT;
		int mode = CDMA_ROAMING_MODE_RADIO_DEFAULT;
		try {
		ITelephony telephony = getITelephony();
		@@ -12106,6 +12123,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public void setCdmaRoamingMode(@CdmaRoamingMode int mode) {
		if (Flags.cleanupCdma()) return;
		if (getPhoneType() != PHONE_TYPE_CDMA) {
		throw new IllegalStateException("Phone does not support CDMA.");
		}
		@@ -12191,6 +12209,7 @@ public class TelephonyManager {
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public @CdmaSubscription int getCdmaSubscriptionMode() {
		if (Flags.cleanupCdma()) return CDMA_SUBSCRIPTION_UNKNOWN;
		int mode = CDMA_SUBSCRIPTION_RUIM_SIM;
		try {
		ITelephony telephony = getITelephony();
		@@ -12234,6 +12253,7 @@ public class TelephonyManager {
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public void setCdmaSubscriptionMode(@CdmaSubscription int mode) {
		if (Flags.cleanupCdma()) return;
		if (getPhoneType() != PHONE_TYPE_CDMA) {
		throw new IllegalStateException("Phone does not support CDMA.");
		}
		@@ -13961,6 +13981,7 @@ public class TelephonyManager {
		@SystemApi
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
		public String getCdmaPrlVersion() {
		if (Flags.cleanupCdma()) return null;
		return getCdmaPrlVersion(getSubId());
		}

		@@ -13976,6 +13997,7 @@ public class TelephonyManager {
		*/
		@Deprecated
		public String getCdmaPrlVersion(int subId) {
		if (Flags.cleanupCdma()) return null;
		try {
		ITelephony service = getITelephony();
		if (service != null) {