Merge "Remove the obsolete APIs" (6f28bde1) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ServiceState.java

+1 −12

Original line number	Diff line number	Diff line
		@@ -1407,7 +1407,7 @@ public class ServiceState implements Parcelable {
		m.putString("data-operator-numeric", mOperatorNumeric);
		m.putBoolean("manual", mIsManualNetworkSelection);
		m.putInt("radioTechnology", getRilVoiceRadioTechnology());
		m.putInt("dataRadioTechnology", getRadioTechnology());
		m.putInt("dataRadioTechnology", getRilDataRadioTechnology());
		m.putBoolean("cssIndicator", mCssIndicator);
		m.putInt("networkId", mNetworkId);
		m.putInt("systemId", mSystemId);
		@@ -1545,17 +1545,6 @@ public class ServiceState implements Parcelable {
		return networkTypeToRilRadioTechnology(getDataNetworkType());
		}

		/**
		* @hide
		* @Deprecated to be removed Q3 2013 use {@link #getRilDataRadioTechnology} or
		* {@link #getRilVoiceRadioTechnology}
		*/
		@UnsupportedAppUsage
		public int getRadioTechnology() {
		Rlog.e(LOG_TAG, "ServiceState.getRadioTechnology() DEPRECATED will be removed *******");
		return getRilDataRadioTechnology();
		}

		/**
		* Transform RIL radio technology {@link RilRadioTechnology} value to Network
		* type {@link NetworkType}.