Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8

am: 02cc8151a6

Change-Id: Ie3ef6584785cf976cd14fd9143bcf83c20506500

telephony/java/android/telephony/TelephonyManager.java

@@ -1628,8 +1628,7 @@ public class TelephonyManager {
      * @hide
      */
     public String getNetworkCountryIso(int subId) {
-        int phoneId = SubscriptionManager.getPhoneId(subId);
+        return getNetworkCountryIsoForPhone(getPhoneId(subId));
-        return getNetworkCountryIsoForPhone(phoneId);
     }
 
     /**
@@ -1644,7 +1643,14 @@ public class TelephonyManager {
      */
     /** {@hide} */
     public String getNetworkCountryIsoForPhone(int phoneId) {
-        return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");
+        try {
+            ITelephony telephony = getITelephony();
+            if (telephony != null)
+                return "";
+            return telephony.getNetworkCountryIsoForPhone(phoneId);
+        } catch (RemoteException ex) {
+                return "";
+        }
     }
 
     /** Network type is unknown */

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -376,6 +376,13 @@ interface ITelephony {
 
     Bundle getCellLocation(String callingPkg);
 
+    /**
+     * Returns the ISO country code equivalent of the current registered
+     * operator's MCC (Mobile Country Code).
+     * @see android.telephony.TelephonyManager#getNetworkCountryIso
+     */
+    String getNetworkCountryIsoForPhone(int phoneId);
+
     /**
      * Returns the neighboring cell information of the device.
      */