commit 1fdab8a00e601f19d7578c897bfd63d44704cb9b
author Nancy Chen <nancychen@google.com> Wed Dec 03 15:18:38 2014 -0800
committer Nancy Chen <nancychen@google.com> Thu Dec 04 14:28:02 2014 -0800
tree 6e386433951a253061dac777fd37fdb9e04e4353
parent d5c2fcf3bc8fc8ae08c05d7172e2244335c73e8f

Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)

Since we don't want the phone app to call TelephonyManager methods
directly, create a method in TelecomManager to mimic the behavior. The
reason we don't return the voicemail number directly is because once
TelecomManager becomes public, we don't want any old app to be able to
get the SIM's voicemail number.

Bug: 18233678

Change-Id: I7eb9a60ab65aababeef7da7bce3b035dcaa1ad1d

src/com/android/server/telecom/TelecomServiceImpl.java

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