Removing var type check (simSlot == null) for the following function: String getLine1Number(@RpcDefault("0") Integer simSlot) and int getTelephonyCallState(@RpcDefault("0") Integer simSlot)

1 files changed, 2 insertions, 4 deletions

diff --git a/src/main/java/com/google/android/mobly/snippet/bundled/TelephonySnippet.java b/src/main/java/com/google/android/mobly/snippet/bundled/TelephonySnippet.java
index 1495bd0..e4d33ec 100644
--- a/src/main/java/com/google/android/mobly/snippet/bundled/TelephonySnippet.java
+++ b/src/main/java/com/google/android/mobly/snippet/bundled/TelephonySnippet.java
@@ -47,7 +47,7 @@ public class TelephonySnippet implements Snippet {
     public String getLine1Number(@RpcDefault("0") Integer simSlot) {
         String thisNumber = "";
 
-        if (Build.VERSION.SDK_INT < 33 || simSlot == null) {
+        if (Build.VERSION.SDK_INT < 33) {
             thisNumber = mTelephonyManager.getLine1Number();
         } else {
             SubscriptionInfo mSubscriptionInfo =
@@ -77,7 +77,7 @@ public class TelephonySnippet implements Snippet {
 
         if (Build.VERSION.SDK_INT < 31) {
             return mTelephonyManager.getCallState();
-        } else if (simSlot != null) {
+        } else {
             SubscriptionInfo mSubscriptionInfo =
                     mSubscriptionManager.getActiveSubscriptionInfoForSimSlotIndex(
                             simSlot.intValue());
@@ -87,8 +87,6 @@ public class TelephonySnippet implements Snippet {
                                 .createForSubscriptionId(mSubscriptionInfo.getSubscriptionId())
                                 .getCallStateForSubscription();
             }
-        } else {
-            thisState = mTelephonyManager.getCallState();
         }
 
         return thisState;