Merge "Remove unused methods" into main (4b442274) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+0 −135

Original line number	Diff line number	Diff line
		@@ -2649,10 +2649,6 @@ public class TelephonyManager {
		return getCurrentPhoneType();
		}

		private int getPhoneTypeFromProperty() {
		return getPhoneTypeFromProperty(getPhoneId());
		}

		/** {@hide} */
		@UnsupportedAppUsage
		private int getPhoneTypeFromProperty(int phoneId) {
		@@ -2662,10 +2658,6 @@ public class TelephonyManager {
		return getPhoneTypeFromNetworkType(phoneId);
		}

		private int getPhoneTypeFromNetworkType() {
		return getPhoneTypeFromNetworkType(getPhoneId());
		}

		/** {@hide} */
		private int getPhoneTypeFromNetworkType(int phoneId) {
		// When the system property CURRENT_ACTIVE_PHONE, has not been set,
		@@ -11563,16 +11555,6 @@ public class TelephonyManager {
		}
		}

		/**
		* Set TelephonyProperties.icc_operator_numeric for the default phone.
		*
		* @hide
		*/
		public void setSimOperatorNumeric(String numeric) {
		int phoneId = getPhoneId();
		setSimOperatorNumericForPhone(phoneId, numeric);
		}

		/**
		* Set TelephonyProperties.icc_operator_numeric for the given phone.
		*
		@@ -11587,16 +11569,6 @@ public class TelephonyManager {
		}
		}

		/**
		* Set TelephonyProperties.icc_operator_alpha for the default phone.
		*
		* @hide
		*/
		public void setSimOperatorName(String name) {
		int phoneId = getPhoneId();
		setSimOperatorNameForPhone(phoneId, name);
		}

		/**
		* Set TelephonyProperties.icc_operator_alpha for the given phone.
		*
		@@ -11849,17 +11821,6 @@ public class TelephonyManager {
		}
		}

		/**
		* Set baseband version for the default phone.
		*
		* @param version baseband version
		* @hide
		*/
		public void setBasebandVersion(String version) {
		int phoneId = getPhoneId();
		setBasebandVersionForPhone(phoneId, version);
		}

		/**
		* Set baseband version by phone id.
		*
		@@ -11897,18 +11858,6 @@ public class TelephonyManager {
		return getTelephonyProperty(phoneId, TelephonyProperties.baseband_version(), "");
		}

		/**
		* Set phone type for the default phone.
		*
		* @param type phone type
		*
		* @hide
		*/
		public void setPhoneType(int type) {
		int phoneId = getPhoneId();
		setPhoneType(phoneId, type);
		}

		/**
		* Set phone type by phone id.
		*
		@@ -11926,19 +11875,6 @@ public class TelephonyManager {
		}
		}

		/**
		* Get OTASP number schema for the default phone.
		*
		* @param defaultValue default value
		* @return OTA SP number schema
		*
		* @hide
		*/
		public String getOtaSpNumberSchema(String defaultValue) {
		int phoneId = getPhoneId();
		return getOtaSpNumberSchemaForPhone(phoneId, defaultValue);
		}

		/**
		* Get OTASP number schema by phone id.
		*
		@@ -11958,19 +11894,6 @@ public class TelephonyManager {
		return defaultValue;
		}

		/**
		* Get SMS receive capable from system property for the default phone.
		*
		* @param defaultValue default value
		* @return SMS receive capable
		*
		* @hide
		*/
		public boolean getSmsReceiveCapable(boolean defaultValue) {
		int phoneId = getPhoneId();
		return getSmsReceiveCapableForPhone(phoneId, defaultValue);
		}

		/**
		* Get SMS receive capable from system property by phone id.
		*
		@@ -11988,19 +11911,6 @@ public class TelephonyManager {
		return defaultValue;
		}

		/**
		* Get SMS send capable from system property for the default phone.
		*
		* @param defaultValue default value
		* @return SMS send capable
		*
		* @hide
		*/
		public boolean getSmsSendCapable(boolean defaultValue) {
		int phoneId = getPhoneId();
		return getSmsSendCapableForPhone(phoneId, defaultValue);
		}

		/**
		* Get SMS send capable from system property by phone id.
		*
		@@ -12063,16 +11973,6 @@ public class TelephonyManager {
		return null;
		}

		/**
		* Set the alphabetic name of current registered operator.
		* @param name the alphabetic name of current registered operator.
		* @hide
		*/
		public void setNetworkOperatorName(String name) {
		int phoneId = getPhoneId();
		setNetworkOperatorNameForPhone(phoneId, name);
		}

		/**
		* Set the alphabetic name of current registered operator.
		* @param phoneId which phone you want to set
		@@ -12106,16 +12006,6 @@ public class TelephonyManager {
		}
		}

		/**
		* Set the numeric name (MCC+MNC) of current registered operator.
		* @param operator the numeric name (MCC+MNC) of current registered operator
		* @hide
		*/
		public void setNetworkOperatorNumeric(String numeric) {
		int phoneId = getPhoneId();
		setNetworkOperatorNumericForPhone(phoneId, numeric);
		}

		/**
		* Set the numeric name (MCC+MNC) of current registered operator.
		* @param phoneId for which phone type is set
		@@ -12131,16 +12021,6 @@ public class TelephonyManager {
		}
		}

		/**
		* Set roaming state of the current network, for GSM purposes.
		* @param isRoaming is network in romaing state or not
		* @hide
		*/
		public void setNetworkRoaming(boolean isRoaming) {
		int phoneId = getPhoneId();
		setNetworkRoamingForPhone(phoneId, isRoaming);
		}

		/**
		* Set roaming state of the current network, for GSM purposes.
		* @param phoneId which phone you want to set
		@@ -12320,21 +12200,6 @@ public class TelephonyManager {
		return null;
		}

		/**
		* TODO delete after SuW migrates to new API.
		* @hide
		*/
		public String getLocaleFromDefaultSim() {
		try {
		final ITelephony telephony = getITelephony();
		if (telephony != null) {
		return telephony.getSimLocaleForSubscriber(getSubId());
		}
		} catch (RemoteException ex) {
		}
		return null;
		}

		/**
		* Exception that may be supplied to the callback provided in {@link #requestModemActivityInfo}.
		* @hide