commit 2184fb285dac9c3666fce1da97f6e3de401962a2
author nharold <nharold@google.com> Mon Oct 16 20:13:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 16 20:13:19 2017 +0000
tree 8a55c5a3221bb9a128c84ba697270078eb550a0d
parent f4165c4cf7a4152a5ef34856a53f7a7757483020
parent ab6b2db8ed7432d8843e663be17e60a21a162129

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

Change-Id: I936b30270a6e40d83469fb7cc528e94e49141c64

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index e448fb2..116e711 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -1197,15 +1197,6 @@
         }
     }
 
-    /**
-     * @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);