Hook CarrierConfigLoader<->SubscriptionInfoUpdater
am: 48ac0977c8
Change-Id: I81ff8c7b71529e51382f9b34c0e16d5cd2510443
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ca93961..f7d0979 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -21,6 +21,7 @@
import static com.android.internal.telephony.PhoneConstants.SUBSCRIPTION_KEY;
import android.Manifest.permission;
+import android.annotation.Nullable;
import android.app.AppOpsManager;
import android.app.PendingIntent;
import android.content.ComponentName;
@@ -4440,6 +4441,7 @@
if (locationResult == LocationAccessPolicy.LocationPermissionResult.DENIED_HARD) {
throw e;
} else {
+ loge(e.getMessage());
return TelephonyScanManager.INVALID_SCAN_ID;
}
}
@@ -4459,10 +4461,6 @@
if (request.getSpecifiers() != null && request.getSpecifiers().length > 0) {
for (RadioAccessSpecifier ras : request.getSpecifiers()) {
- if (ras.getBands() != null && ras.getBands().length > 0) {
- return new SecurityException("Specific bands must not be"
- + " scanned without location access.");
- }
if (ras.getChannels() != null && ras.getChannels().length > 0) {
return new SecurityException("Specific channels must not be"
+ " scanned without location access.");
@@ -5301,6 +5299,20 @@
}
}
+ @Override
+ public @Nullable PhoneAccountHandle getPhoneAccountHandleForSubscriptionId(int subscriptionId) {
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ Phone phone = getPhone(subscriptionId);
+ if (phone == null) {
+ return null;
+ }
+ return PhoneUtils.makePstnPhoneAccountHandle(phone);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
/**
* @return the VoWiFi calling availability.
*/