From 03d23999d3658c36f69e043483a9201bd520c4b8 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Mon, 9 Oct 2017 11:27:40 -0700
Subject: [PATCH] Remove getNetworkType() from ServiceState

This method was deprecated 4 years and 11 months ago
and set to be removed in 2013. It was replaced by
getVoiceNetworkType().

Bug: 67589287
Test: make checkbuild on goog/master
Change-Id: I5fefa755738ff2fb3f3babfcafd4dfb329314feb
---
 telephony/java/android/telephony/ServiceState.java | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index e448fb2a532e..116e711ee886 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -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);
-- 
2.11.0