[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: 4632fb9a15 -s ours
am skip reason: subject contains skip directive
Change-Id: I4719a29f9ebcaee25da93b1031c37c6d0a1358a4
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index fea0e77..cc7ef70 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2136,10 +2136,16 @@
case DENIED_HARD:
throw new SecurityException("Not allowed to access cell info");
case DENIED_SOFT:
+ try {
+ cb.onCellInfo(new ArrayList<CellInfo>());
+ } catch (RemoteException re) {
+ // Drop without consequences
+ }
return;
}
- final Phone phone = getPhone(subId);
+
+ final Phone phone = getPhoneFromSubId(subId);
if (phone == null) throw new IllegalArgumentException("Invalid Subscription Id: " + subId);
sendRequestAsync(CMD_REQUEST_CELL_INFO_UPDATE, cb, phone, workSource);
@@ -3067,10 +3073,8 @@
final long identity = Binder.clearCallingIdentity();
try {
// TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
- boolean isRoaming = TelephonyManager.from(
- getPhone(subId).getContext()).isNetworkRoaming(subId);
ImsManager.getInstance(mApp,
- getSlotIndexOrException(subId)).setWfcNonPersistent(isCapable, mode, isRoaming);
+ getSlotIndexOrException(subId)).setWfcNonPersistent(isCapable, mode);
} finally {
Binder.restoreCallingIdentity(identity);
}