commit da980a226647a5e60c90537a4578ea6b63e61a5f
author Nancy Chen <nancychen@google.com> Fri Oct 17 00:05:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 17 00:05:16 2014 +0000
tree 98a69ea8862e279aed5efb296c8196ccc1b679cf
parent 5422246b69d124cce76b396b101c35b8c5fa9235
parent 3c1671df007b21ff8d1c811f36bf3b952ac53f9e

am 3c1671df: Merge "Revert "Add API method to extract subscription ID from phone account (3/3)"" into lmp-sprout-dev

* commit '3c1671df007b21ff8d1c811f36bf3b952ac53f9e':
  Revert "Add API method to extract subscription ID from phone account (3/3)"

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

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index bbd65cc..b337622 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -256,9 +256,7 @@
                 new ComponentName(phone.getContext(), TelephonyConnectionService.class);
         // TODO: Should use some sort of special hidden flag to decorate this account as
         // an emergency-only account
-        TelecomManager telecomManager = TelecomManager.from(phone.getContext());
-        String id = isEmergency ?
-            "E" : prefix + telecomManager.getPhoneAccountIdForSubscriptionId(phone.getSubId());
+        String id = isEmergency ? "E" : prefix + String.valueOf(phone.getSubId());
         return new PhoneAccountHandle(pstnConnectionServiceName, id);
     }