diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2023-02-24 19:48:32 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-02-24 19:48:32 +0000 |
commit | 32c3056485a3b18d2779088141f5e08ec7ad355c (patch) | |
tree | 95e73a2aa02c7a7d54879ad0c2a9b7d0afcc812f | |
parent | fbcc55fd68e4fed5700ee737ab7209d87eb621a8 (diff) | |
parent | 6c7a6284938ba458653379f2a5daeec48ab51ca2 (diff) | |
download | ims-32c3056485a3b18d2779088141f5e08ec7ad355c.tar.gz |
Merge "Cleaned up the deprecated APIs" into udc-dev
-rw-r--r-- | src/java/com/android/ims/ImsManager.java | 13 | ||||
-rw-r--r-- | tests/src/com/android/ims/ImsManagerTest.java | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index b1d2ebcc..b5a1168b 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -261,7 +261,7 @@ public class ImsManager implements FeatureUpdates { @VisibleForTesting public interface SubscriptionManagerProxy { boolean isValidSubscriptionId(int subId); - int[] getSubscriptionIds(int slotIndex); + int getSubscriptionId(int slotIndex); int getDefaultVoicePhoneId(); int getIntegerSubscriptionProperty(int subId, String propKey, int defValue); void setSubscriptionProperty(int subId, String propKey, String propValue); @@ -296,8 +296,8 @@ public class ImsManager implements FeatureUpdates { } @Override - public int[] getSubscriptionIds(int slotIndex) { - return getSubscriptionManager().getSubscriptionIds(slotIndex); + public int getSubscriptionId(int slotIndex) { + return SubscriptionManager.getSubscriptionId(slotIndex); } @Override @@ -1437,12 +1437,7 @@ public class ImsManager implements FeatureUpdates { } private int getSubId() { - int[] subIds = mSubscriptionManagerProxy.getSubscriptionIds(mPhoneId); - int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; - if (subIds != null && subIds.length >= 1) { - subId = subIds[0]; - } - return subId; + return mSubscriptionManagerProxy.getSubscriptionId(mPhoneId); } private void setWfcModeInternal(int wfcMode) { diff --git a/tests/src/com/android/ims/ImsManagerTest.java b/tests/src/com/android/ims/ImsManagerTest.java index 2c0fd870..ad5051be 100644 --- a/tests/src/com/android/ims/ImsManagerTest.java +++ b/tests/src/com/android/ims/ImsManagerTest.java @@ -119,7 +119,7 @@ public class ImsManagerTest extends ImsTestBase { doReturn(true).when(mSubscriptionManagerProxy).isValidSubscriptionId(anyInt()); doReturn(mSubId).when(mSubscriptionManagerProxy).getActiveSubscriptionIdList(); - doReturn(mSubId).when(mSubscriptionManagerProxy).getSubscriptionIds(anyInt()); + doReturn(mSubId[0]).when(mSubscriptionManagerProxy).getSubscriptionId(anyInt()); doReturn(mPhoneId).when(mSubscriptionManagerProxy).getDefaultVoicePhoneId(); doReturn(-1).when(mSubscriptionManagerProxy).getIntegerSubscriptionProperty(anyInt(), anyString(), anyInt()); |