diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index afd73a0..095cff6 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -356,16 +356,16 @@
         }
 
         /**
-         * @see android.telecom.TelecomManager#hasVoiceMailNumber
+         * @see android.telecom.TelecomManager#getVoiceMailNumber
          */
         @Override
-        public boolean hasVoiceMailNumber(PhoneAccountHandle accountHandle) {
+        public String getVoiceMailNumber(PhoneAccountHandle accountHandle) {
             synchronized (mLock) {
                 enforceReadPermissionOrDefaultDialer();
                 try {
                     if (!isVisibleToCaller(accountHandle)) {
                         Log.w(this, "%s is not visible for the calling user", accountHandle);
-                        return false;
+                        return null;
                     }
 
                     int subId = SubscriptionManager.getDefaultVoiceSubId();
@@ -373,7 +373,7 @@
                         subId = mPhoneAccountRegistrar
                                 .getSubscriptionIdForPhoneAccount(accountHandle);
                     }
-                    return !TextUtils.isEmpty(getTelephonyManager().getVoiceMailNumber(subId));
+                    return getTelephonyManager().getVoiceMailNumber(subId);
                 } catch (Exception e) {
                     Log.e(this, e, "getSubscriptionIdForPhoneAccount");
                     throw e;
