Revert "Be more robust when attempting to parse the subscription ID."

This reverts commit 90012dca6e012b5cad7f4fd59c2043d3c84c0db3.

Change-Id: Ie68b0bfbc72608991a8892cf66ea83a5253eb12b

1 files changed, 6 insertions, 8 deletions

diff --git a/src/com/android/incallui/Call.java b/src/com/android/incallui/Call.java
index 63826e35..773dd36b 100644
--- a/src/com/android/incallui/Call.java
+++ b/src/com/android/incallui/Call.java
@@ -418,17 +418,15 @@ public final class Call {
 
     public long getSubId() {
         PhoneAccountHandle ph = getAccountHandle();
-        if (ph == null) {
-            return SubscriptionManager.INVALID_SUB_ID;
-        }
-        if (ph.getId() != null) {
-            try {
+        if (ph != null) {
+            if (ph.getId() != null && !ph.getId().toLowerCase().contains("sip")) {
                 return Long.parseLong(getAccountHandle().getId());
-            } catch (NumberFormatException e) {
-                // fall through
+            } else {
+                return SubscriptionManager.getDefaultVoiceSubId();
             }
+        } else {
+            return SubscriptionManager.INVALID_SUB_ID;
         }
-        return SubscriptionManager.getDefaultVoiceSubId();
     }
 
     public VideoCall getVideoCall() {