commit b00dcbbcdac4f22d3921049ca875d5b791605f17
author Chen Xu <fionaxu@google.com> Fri Apr 28 17:25:53 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 28 17:25:54 2017 +0000
tree 53221c479a8fa2cc26372b2987083711f53e95cc
parent 7f4e6e1076faa76618196d06e665f3717b38e713
parent 1255110bd0840663b05fba2fe7d14e00ce997cd7

Merge "Change getVisualVoicemailPackageName() to use subId"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3fb8544..f59e97f 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2036,13 +2036,11 @@
     }
 
     @Override
-    public String getVisualVoicemailPackageName(String callingPackage,
-            @Nullable PhoneAccountHandle phoneAccountHandle) {
+    public String getVisualVoicemailPackageName(String callingPackage, int subId) {
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
         if (!canReadPhoneState(callingPackage, "getVisualVoicemailPackageName")) {
             return null;
         }
-        int subId = PhoneUtils.getSubIdForPhoneAccountHandle(phoneAccountHandle);
         return RemoteVvmTaskManager.getRemotePackage(mPhone.getContext(), subId).getPackageName();
     }