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

Merge "Cleaned up the deprecated APIs" into udc-dev am: 22a620dbd4

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

Change-Id: I819254885e6972c342d53eec9696a1fda876f98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-02-23 17:54:26 +00:00
committed by Automerger Merge Worker
parent 2a269d9b76 22a620dbd4
commit 3105ce9819
3 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/sim/smartForwarding/EnableSmartForwardingTask.java
View File

@@ -37,8 +37,6 @@ import java.util.concurrent.Executor;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
import java.util.stream.Collectors;
public class EnableSmartForwardingTask public class EnableSmartForwardingTask
implements Callable<EnableSmartForwardingTask.FeatureResult> { implements Callable<EnableSmartForwardingTask.FeatureResult> {
@@ -94,14 +92,9 @@ public class EnableSmartForwardingTask
mSlotUTData = new SlotUTData[tm.getActiveModemCount()]; mSlotUTData = new SlotUTData[tm.getActiveModemCount()];
for (int i = 0; i < mSlotUTData.length; i++) { for (int i = 0; i < mSlotUTData.length; i++) {
int[] subIdList = sm.getSubscriptionIds(i); int subId = SubscriptionManager.getSubscriptionId(i);
if (subIdList.length < 1) {
Log.e(TAG, "getSubscriptionIds() return empty sub id list.");
return false;
}
int subId = subIdList[0];
if (!sm.isActiveSubId(subId)) { if (!SubscriptionManager.isValidSubscriptionId(subId)) {
mResult.setReason(FeatureResult.FailedReason.SIM_NOT_ACTIVE); mResult.setReason(FeatureResult.FailedReason.SIM_NOT_ACTIVE);
return false; return false;
} }

2
src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java
View File

@@ -137,7 +137,7 @@ public class SmartForwardingActivity extends SettingsBaseActivity {
TelephonyManager tm = getSystemService(TelephonyManager.class); TelephonyManager tm = getSystemService(TelephonyManager.class);
SubscriptionManager sm = getSystemService(SubscriptionManager.class); SubscriptionManager sm = getSystemService(SubscriptionManager.class);
boolean[] callWaitingStatus = getAllSlotCallWaitingStatus(this, sm, tm); boolean[] callWaitingStatus = getAllSlotCallWaitingStatus(this, tm);
CallForwardingInfo[] callForwardingInfo = getAllSlotCallForwardingStatus(this, sm, tm); CallForwardingInfo[] callForwardingInfo = getAllSlotCallForwardingStatus(this, sm, tm);
// Disable feature // Disable feature

19
src/com/android/settings/sim/smartForwarding/SmartForwardingUtils.java
View File

@@ -80,13 +80,12 @@ public class SmartForwardingUtils {
preferences.clear().commit(); preferences.clear().commit();
} }
public static boolean[] getAllSlotCallWaitingStatus(Context context, SubscriptionManager sm, public static boolean[] getAllSlotCallWaitingStatus(Context context, TelephonyManager tm) {
TelephonyManager tm) {
int phoneCount = tm.getActiveModemCount(); int phoneCount = tm.getActiveModemCount();
boolean[] allStatus = new boolean[phoneCount]; boolean[] allStatus = new boolean[phoneCount];
for (int i = 0; i < phoneCount; i++) { for (int i = 0; i < phoneCount; i++) {
int subId = sm.getSubscriptionIds(i)[0]; int subId = SubscriptionManager.getSubscriptionId(i);
boolean callWaitingStatus = getBackupCallWaitingStatus(context, subId); boolean callWaitingStatus = getBackupCallWaitingStatus(context, subId);
allStatus[i] = callWaitingStatus; allStatus[i] = callWaitingStatus;
} }
@@ -99,7 +98,7 @@ public class SmartForwardingUtils {
CallForwardingInfo[] allStatus = new CallForwardingInfo[phoneCount]; CallForwardingInfo[] allStatus = new CallForwardingInfo[phoneCount];
for (int i = 0; i < phoneCount; i++) { for (int i = 0; i < phoneCount; i++) {
int subId = sm.getSubscriptionIds(i)[0]; int subId = SubscriptionManager.getSubscriptionId(i);
CallForwardingInfo callWaitingStatus = getBackupCallForwardingStatus(context, subId); CallForwardingInfo callWaitingStatus = getBackupCallForwardingStatus(context, subId);
allStatus[i] = callWaitingStatus; allStatus[i] = callWaitingStatus;
} }
@@ -110,7 +109,7 @@ public class SmartForwardingUtils {
TelephonyManager tm) { TelephonyManager tm) {
int phoneCount = tm.getActiveModemCount(); int phoneCount = tm.getActiveModemCount();
for (int i = 0; i < phoneCount; i++) { for (int i = 0; i < phoneCount; i++) {
int subId = sm.getSubscriptionIds(i)[0]; int subId = SubscriptionManager.getSubscriptionId(i);
clearBackupData(context, subId); clearBackupData(context, subId);
} }
} }
@@ -134,12 +133,8 @@ public class SmartForwardingUtils {
public static String getPhoneNumber(Context context, int slotId) { public static String getPhoneNumber(Context context, int slotId) {
SubscriptionManager subscriptionManager = context.getSystemService( SubscriptionManager subscriptionManager = context.getSystemService(
SubscriptionManager.class); SubscriptionManager.class);
int[] subIdList = subscriptionManager.getSubscriptionIds(slotId); SubscriptionInfo subInfo = subscriptionManager.getActiveSubscriptionInfo(
if (subIdList != null) { SubscriptionManager.getSubscriptionId(slotId));
SubscriptionInfo subInfo = subscriptionManager.getActiveSubscriptionInfo(subIdList[0]); return (subInfo != null) ? subInfo.getNumber() : "";
return (subInfo != null) ? subInfo.getNumber() : "";
} else {
return "";
}
} }
} }