commit 5ab2248517ef0993b4ca576ad83598c4c0fa6bc9
author Jonathan Basseri <misterikkit@google.com> Wed Aug 02 01:11:17 2017 +0000
committer Jonathan Basseri <misterikkit@google.com> Wed Aug 02 01:11:17 2017 +0000
tree 0525f16ceb8723d7bc63ceeb2328822d4571e676
parent 842096c70670b8f80b2447c6d127ac59cf05c173

Revert "Implement getNetworkCountryIso in PhoneInterfaceManager."

This reverts commit 842096c70670b8f80b2447c6d127ac59cf05c173.

Change-Id: I176088d1f64ce6a52ca5f2280173812cca1f3544

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 01de5d8..b7c913c 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -92,7 +92,6 @@
 import com.android.internal.telephony.RIL;
 import com.android.internal.telephony.RILConstants;
 import com.android.internal.telephony.SubscriptionController;
-import com.android.internal.telephony.TelephonyProperties;
 import com.android.internal.telephony.uicc.IccIoResult;
 import com.android.internal.telephony.uicc.IccUtils;
 import com.android.internal.telephony.uicc.SIMRecords;
@@ -1636,24 +1635,6 @@
         }
     }
 
-    @Override
-    public String getNetworkCountryIsoForPhone(int phoneId) {
-        // Reporting the correct network country is ambiguous when IWLAN could conflict with
-        // registered cell info, so return a NULL country instead.
-        final long identity = Binder.clearCallingIdentity();
-        try {
-            final int subId = mSubscriptionController.getSubIdUsingPhoneId(subId);
-            if (TelephonyManager.NETWORK_TYPE_IWLAN
-                    == getVoiceNetworkType(subId, mApp.getPackageName())) {
-                return "";
-            }
-        } finally {
-            Binder.restoreCallingIdentity(identity);
-        }
-        return TelephonyManager.getTelephonyProperty(
-                phoneId, TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");
-    }
-
     private void enforceFineOrCoarseLocationPermission(String message) {
         try {
             mApp.enforceCallingOrSelfPermission(