Cleaned up the deprecated APIs
Bug: 270094276
Test: Basic phone funcationality tests
Change-Id: Iffae0504a47718525152bc28f3cad2657b542362
diff --git a/src/com/android/phone/ImsProvisioningController.java b/src/com/android/phone/ImsProvisioningController.java
index 6a6b155..a62980e 100644
--- a/src/com/android/phone/ImsProvisioningController.java
+++ b/src/com/android/phone/ImsProvisioningController.java
@@ -1564,13 +1564,7 @@
}
protected int getSubId(int slotId) {
- final int[] subIds = mSubscriptionManager.getSubscriptionIds(slotId);
- int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
- if (subIds != null && subIds.length >= 1) {
- subId = subIds[0];
- }
-
- return subId;
+ return SubscriptionManager.getSubscriptionId(slotId);
}
protected int getSlotId(int subId) {
diff --git a/src/com/android/services/telephony/rcs/TelephonyRcsService.java b/src/com/android/services/telephony/rcs/TelephonyRcsService.java
index 3a8ad62..f6ba40b 100644
--- a/src/com/android/services/telephony/rcs/TelephonyRcsService.java
+++ b/src/com/android/services/telephony/rcs/TelephonyRcsService.java
@@ -366,16 +366,7 @@
}
private int getSubscriptionFromSlot(int slotId) {
- SubscriptionManager manager = mContext.getSystemService(SubscriptionManager.class);
- if (manager == null) {
- Log.w(LOG_TAG, "Couldn't find SubscriptionManager for slotId=" + slotId);
- return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
- }
- int[] subIds = manager.getSubscriptionIds(slotId);
- if (subIds != null && subIds.length > 0) {
- return subIds[0];
- }
- return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ return SubscriptionManager.getSubscriptionId(slotId);
}
/**