summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-21 00:57:31 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-21 00:57:31 -0700
commitd0c5f0e8de846f2fa5c26f0a04ada0af2071fea6 (patch)
treed3084f437733153493c8d493ec1a2a2c31b7d3d4 /src
parent4fcff72133d7e167bb649efc4aab5ee01bd14bff (diff)
parent2b20a0d0e8c327b267f794eb5564b497c54ce04b (diff)
downloadandroid_packages_apps_Dialer-d0c5f0e8de846f2fa5c26f0a04ada0af2071fea6.tar.gz
android_packages_apps_Dialer-d0c5f0e8de846f2fa5c26f0a04ada0af2071fea6.tar.bz2
android_packages_apps_Dialer-d0c5f0e8de846f2fa5c26f0a04ada0af2071fea6.zip
Merge "IMS: Get IMS Registration Status based on subId" into atel.lnx.2.0-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/util/IntentUtil.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/util/IntentUtil.java b/src/com/android/dialer/util/IntentUtil.java
index 8d47075e7..bb87a49cf 100644
--- a/src/com/android/dialer/util/IntentUtil.java
+++ b/src/com/android/dialer/util/IntentUtil.java
@@ -177,7 +177,8 @@ public class IntentUtil {
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;
}