Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84

am: 7edf405cdd

Change-Id: I0782f2db112fb1c0e404dc01e9a401268523ad39
This commit is contained in:
nharold
2017-10-16 18:52:15 +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);