commit 982433108ea2dc179610fa415d538aa989e68529
author Sailesh Nepal <sail@google.com> Mon Jul 21 19:29:18 2014 -0700
committer Sailesh Nepal <sail@google.com> Wed Jul 23 02:59:14 2014 +0000
tree e8e55f3a81b99685e4a0ffbb21eafbcea484855a
parent ce95274195d591b34d7e278ea9e34e3786a9d3ec

Fix exception when creating a remote connection

Change-Id: Ib55b2bc3ca8c6f3703bda9751b16064cd6c01d23

src/com/android/services/telephony/TelephonyConnectionService.java

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index b3467a6..00fc362 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -263,9 +263,11 @@
 
     private Phone getPhoneForAccount(PhoneAccountHandle accountHandle) {
         if (Objects.equals(mExpectedComponentName, accountHandle.getComponentName())) {
-            int phoneId = SubscriptionController.getInstance().getPhoneId(
-                    Long.parseLong(accountHandle.getId()));
-            return PhoneFactory.getPhone(phoneId);
+            if (accountHandle.getId() != null) {
+                int phoneId = SubscriptionController.getInstance().getPhoneId(
+                        Long.parseLong(accountHandle.getId()));
+                return PhoneFactory.getPhone(phoneId);
+            }
         }
         return null;
     }