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

Browse Source
This commit is contained in:
Calvin Pan
2021-09-17 01:33:05 +00:00
committed by Android (Google) Code Review
parent ebe477db21 e32a2abc16
commit 216315523b
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 static com.android.settings.sim.smartForwarding.SmartForwardingUtils.TAG;
import android.telephony.CallForwardingInfo; import android.telephony.CallForwardingInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.Log; import android.util.Log;
@@ -37,16 +38,29 @@ public class DisableSmartForwardingTask implements Runnable {
@Override @Override
public void run() { public void run() {
for (int i = 0; i < tm.getActiveModemCount(); i++) { 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]); 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 if (callForwardingInfo != null
&& callForwardingInfo[i] != null) { && callForwardingInfo[i] != null
&& subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
Log.d(TAG, "Restore call forwarding to " + callForwardingInfo[i]); 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;
}
} }