Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84 am: 7edf405cdd am: a550f85f84

am: ab6b2db8ed

Change-Id: I936b30270a6e40d83469fb7cc528e94e49141c64
This commit is contained in:
nharold
2017-10-16 20:13:19 +00:00
committed by android-build-merger

View File

@@ -1197,15 +1197,6 @@ public class ServiceState implements Parcelable {
}
}
/**
* @Deprecated to be removed Q3 2013 use {@link #getVoiceNetworkType}
* @hide
*/
public int getNetworkType() {
Rlog.e(LOG_TAG, "ServiceState.getNetworkType() DEPRECATED will be removed *******");
return rilRadioTechnologyToNetworkType(mRilVoiceRadioTechnology);
}
/** @hide */
public int getDataNetworkType() {
return rilRadioTechnologyToNetworkType(mRilDataRadioTechnology);