commit 437ea672cced80e4a6555a790df1dbb27de56ea2
author Sailesh Nepal <sail@google.com> Wed Jul 23 03:16:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 23 03:16:57 2014 +0000
tree e8e55f3a81b99685e4a0ffbb21eafbcea484855a
parent 912edbdcf96c36eaf651079e22ca1ded52f2a320
parent a005cb2d1568d61369e491915fce5811a607dc31

am a005cb2d: am 28a20d1a: am 98243310: Fix exception when creating a remote connection

* commit 'a005cb2d1568d61369e491915fce5811a607dc31':
  Fix exception when creating a remote connection

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;
     }