commit 875b281f71cd1b418bc860440f46d605786162fe
author Ta-wei Yen <twyen@google.com> Thu Jan 26 03:33:30 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 26 03:33:35 2017 +0000
tree 71e56f0c5dbf4edff5a8d0331478ea64aa14d8ab
parent 134cc1176235c999a32e460a05510c8f65bb2b8e
parent dca928f50b6717fde22e3d5c07eb6ca309930183

Merge "Implement getVisualVoicemailPackageName()"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 0e4361a..81e6abc 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -19,6 +19,7 @@
 import static com.android.internal.telephony.PhoneConstants.SUBSCRIPTION_KEY;
 
 import android.Manifest.permission;
+import android.annotation.Nullable;
 import android.app.ActivityManager;
 import android.app.AppOpsManager;
 import android.app.PendingIntent;
@@ -1968,6 +1969,17 @@
     }
 
     @Override
+    public String getVisualVoicemailPackageName(String callingPackage,
+            @Nullable PhoneAccountHandle phoneAccountHandle) {
+        mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
+        if (!canReadPhoneState(callingPackage, "getVisualVoicemailPackageName")) {
+            return null;
+        }
+        int subId = PhoneUtils.getSubIdForPhoneAccountHandle(phoneAccountHandle);
+        return RemoteVvmTaskManager.getRemotePackage(mPhone.getContext(), subId).getPackageName();
+    }
+
+    @Override
     public void enableVisualVoicemailSmsFilter(String callingPackage, int subId,
             VisualVoicemailSmsFilterSettings settings) {
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);

src/com/android/phone/vvm/RemoteVvmTaskManager.java

diff --git a/src/com/android/phone/vvm/RemoteVvmTaskManager.java b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
index 49b0a1c..f48fc7e 100644
--- a/src/com/android/phone/vvm/RemoteVvmTaskManager.java
+++ b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
@@ -104,6 +104,7 @@
         return getRemotePackage(context, subId) != null;
     }
 
+    @Nullable
     public static ComponentName getRemotePackage(Context context, int subId) {
         Intent bindIntent = newBindIntent(context);