summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-12-05 01:59:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-05 01:59:09 +0000
commit859fba1def4ed680cfbd189621c1ae557c2cab9a (patch)
treef8c82c6c2b9e15e2c2d5e25665e536118e0699fb
parent3cb6496b6c8bb48d458c46e7a062228f0488307d (diff)
parentfa53c93462ba273fb645831422c74d29e748519c (diff)
downloadframeworks_base-859fba1def4ed680cfbd189621c1ae557c2cab9a.zip
frameworks_base-859fba1def4ed680cfbd189621c1ae557c2cab9a.tar.gz
frameworks_base-859fba1def4ed680cfbd189621c1ae557c2cab9a.tar.bz2
am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev
* commit 'fa53c93462ba273fb645831422c74d29e748519c': Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java20
-rw-r--r--telecomm/java/com/android/internal/telecom/ITelecomService.aidl5
2 files changed, 25 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 2a3d7ab..6621726 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -732,6 +732,26 @@ public class TelecomManager {
}
/**
+ * Return whether a given phone account has a voicemail number configured.
+ *
+ * @param accountHandle The handle for the account to check for a voicemail number.
+ * @return {@code true} If the given phone account has a voicemail number.
+ *
+ * @hide
+ */
+ @SystemApi
+ public boolean hasVoiceMailNumber(PhoneAccountHandle accountHandle) {
+ try {
+ if (isServiceConnected()) {
+ return getTelecomService().hasVoiceMailNumber(accountHandle);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "RemoteException calling isInCall().", e);
+ }
+ return false;
+ }
+
+ /**
* Returns whether there is an ongoing phone call (can be in dialing, ringing, active or holding
* states).
* <p>
diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
index cbd9d69..f8d7539 100644
--- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
+++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
@@ -121,6 +121,11 @@ interface ITelecomService {
boolean isVoiceMailNumber(in PhoneAccountHandle accountHandle, String number);
/**
+ * @see TelecomServiceImpl#hasVoiceMailNumber
+ */
+ boolean hasVoiceMailNumber(in PhoneAccountHandle accountHandle);
+
+ /**
* @see TelecomServiceImpl#getDefaultPhoneApp
*/
ComponentName getDefaultPhoneApp();