Removed permission check
Removed permission check for getNetworkCountryIso and made it public.
This API was added since the first version of Android. Removed the
permission check for backward compatibility reason.
Test: Telephony sanity tests
Bug: 149872821
Change-Id: I5bb1b4cbf21c8b1dac18ff60d007b763935053cf
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d0a4b69..0e909a6 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2272,16 +2272,7 @@
}
@Override
- public String getNetworkCountryIsoForPhone(int phoneId, String callingPackage,
- String callingFeatureId) {
- if (!TextUtils.isEmpty(callingPackage)) {
- final int subId = mSubscriptionController.getSubIdUsingPhoneId(phoneId);
- if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(mApp, subId, callingPackage,
- callingFeatureId, "getNetworkCountryIsoForPhone")) {
- return "";
- }
- }
-
+ 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();