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
Merged-In: I5bb1b4cbf21c8b1dac18ff60d007b763935053cf
Change-Id: I5bb1b4cbf21c8b1dac18ff60d007b763935053cf
(cherry picked from commit eb1e7fe4c60d154b3bb0b724ccf5da891cd54f63)
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index dc286be..c0b8617 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2285,16 +2285,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();