PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable smart forwarding based on subid" into sc-qpr1-dev am: 216315523b am: 6e51289e9b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15819074

Change-Id: Iaa365ffddefba0d5692b3e5be663c20a9aa2e8e5
This commit is contained in:
Calvin Pan
2021-09-17 02:02:01 +00:00
committed by Automerger Merge Worker
parent 666d5776db 6e51289e9b
commit c7560a39e8
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.sim.smartForwarding;
import static com.android.settings.sim.smartForwarding.SmartForwardingUtils.TAG;
import android.telephony.CallForwardingInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.Log;
@@ -37,16 +38,29 @@ public class DisableSmartForwardingTask implements Runnable {
@Override
public void run() {
for (int i = 0; i < tm.getActiveModemCount(); i++) {
if (callWaitingStatus != null) {
int subId = getSubId(i);
if (callWaitingStatus != null
&& subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
Log.d(TAG, "Restore call waiting to " + callWaitingStatus[i]);
tm.setCallWaitingEnabled(callWaitingStatus[i], null, null);
tm.createForSubscriptionId(subId)
.setCallWaitingEnabled(callWaitingStatus[i], null, null);
}
if (callForwardingInfo != null
&& callForwardingInfo[i] != null) {
&& callForwardingInfo[i] != null
&& subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
Log.d(TAG, "Restore call forwarding to " + callForwardingInfo[i]);
tm.setCallForwarding(callForwardingInfo[i], null, null);
tm.createForSubscriptionId(subId)
.setCallForwarding(callForwardingInfo[i], null, null);
}
}
}
private int getSubId(int slotIndex) {
int[] subId = SubscriptionManager.getSubId(slotIndex);
if (subId != null && subId.length > 0) {
return subId[0];
}
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
}