commit 1255110bd0840663b05fba2fe7d14e00ce997cd7
author Ta-wei Yen <twyen@google.com> Mon Mar 06 16:00:44 2017 -0800
committer fionaxu <fionaxu@google.com> Thu Apr 27 16:49:52 2017 -0700
tree 7c189e0c3487051618ee43a8b4ff6ad3eb8b9547
parent 797017f90b967c41affd99490b39f0b3124ec023

Change getVisualVoicemailPackageName() to use subId

getVisualVoicemailPackageName() now acquires the pinned subId form
the TelphonyManager, instead of having a PhoneAccountHandle passed in.

Change-Id: I678362f6966531c1bb7885c6e1895b934bd7c397
Merged-in: I678362f6966531c1bb7885c6e1895b934bd7c397
Fixes: 35766370
Test: CTS TelephonyManagerTest

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();
     }