commit 3d2484c362732c1a0ee26d73471c7bc907c2f8f8
author The Android Automerger <android-build@google.com> Mon Apr 13 06:00:50 2015 -0700
committer The Android Automerger <android-build@google.com> Mon Apr 13 06:00:50 2015 -0700
tree ba4462c4035eaa864b93e1622a3c6165751d0bb0
parent d7133654b09bffcada982d2a5d37d0eeb0ffbd2d
parent 7adffb547f47215482296c88be257ddce7c2c83d

merge in lmp-mr1-wfc-release history after reset to lmp-mr1-wfc-dev

src/java/com/android/ims/ImsManager.java

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index ed1a43a..729b4d3 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -250,7 +250,7 @@
                         com.android.internal.R.bool.config_carrier_volte_provisioned)) {
             isProvisioned = false; // disable on any error
             ImsManager mgr = ImsManager.getInstance(context,
-                    SubscriptionManager.getDefaultVoiceSubId());
+                    SubscriptionManager.getDefaultVoicePhoneId());
             if (mgr != null) {
                 try {
                     ImsConfig config = mgr.getConfigInterface();