commit d0c5f0e8de846f2fa5c26f0a04ada0af2071fea6
author Linux Build Service Account <lnxbuild@localhost> Fri Oct 21 00:57:31 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 21 00:57:31 2016 -0700
tree d3084f437733153493c8d493ec1a2a2c31b7d3d4
parent 4fcff72133d7e167bb649efc4aab5ee01bd14bff
parent 2b20a0d0e8c327b267f794eb5564b497c54ce04b

Merge "IMS: Get IMS Registration Status based on subId" into atel.lnx.2.0-dev

src/com/android/dialer/util/IntentUtil.java

diff --git a/src/com/android/dialer/util/IntentUtil.java b/src/com/android/dialer/util/IntentUtil.java
index 8d47075..bb87a49 100644
--- a/src/com/android/dialer/util/IntentUtil.java
+++ b/src/com/android/dialer/util/IntentUtil.java
@@ -177,7 +177,8 @@
                     if (subRes.getBoolean(R.bool.config_enable_conference_dialer)) {
                         TelephonyManager telephonyMgr = (TelephonyManager) context.
                                 getSystemService(Context.TELEPHONY_SERVICE);
-                        isEnabled = telephonyMgr.isImsRegistered();
+                        isEnabled = telephonyMgr.isImsRegisteredForSubscriber(subInfo
+                                .getSubscriptionId());
                         if (isEnabled) {
                             break;
                         }