diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index c3a9f9f..77d3175 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -37,7 +37,10 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
 
 // TODO: Needed for move to system service: import com.android.internal.R;
 import com.android.internal.telecom.ITelecomService;
@@ -354,6 +357,24 @@
     }
 
     /**
+     * @see android.telecom.TelecomManager#hasVoiceMailNumber
+     */
+    @Override
+    public boolean hasVoiceMailNumber(PhoneAccountHandle accountHandle) {
+        enforceReadPermissionOrDefaultDialer();
+        try {
+            int subId = SubscriptionManager.getDefaultVoiceSubId();
+            if (accountHandle != null) {
+                subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle);
+            }
+            return !TextUtils.isEmpty(getTelephonyManager().getVoiceMailNumber(subId));
+        } catch (Exception e) {
+            Log.e(this, e, "getSubscriptionIdForPhoneAccount");
+            throw e;
+        }
+    }
+
+    /**
      * @see android.telecom.TelecomManager#silenceRinger
      */
     @Override
