Fix issue with failing ContactsProviderTest.
We used to call DefaultDialerManager.isDefaultOrSystemDialer; that method
has an explicit empty/null check for the callingPackage, which I didn't
replicate here.
Honestly the test probably should have a null callingPackage, but in the
interest of maintaining the same code/test behavior, changing this method
works to solve the problem.
Test: Re-run unit tests
Bug: 144004289
Change-Id: I72e3b379ca13db3860f9882585f9f3d06daa1bb5
diff --git a/src/com/android/providers/contacts/VoicemailPermissions.java b/src/com/android/providers/contacts/VoicemailPermissions.java
index fc83ebc..58e7a14 100644
--- a/src/com/android/providers/contacts/VoicemailPermissions.java
+++ b/src/com/android/providers/contacts/VoicemailPermissions.java
@@ -20,6 +20,7 @@
import android.os.Binder;
import android.telecom.TelecomManager;
import android.telephony.TelephonyManager;
+import android.text.TextUtils;
import com.android.providers.contacts.util.ContactsPermissions;
@@ -42,6 +43,11 @@
}
private boolean isDefaultOrSystemDialer(String callingPackage) {
+ // Note: Mimics previous dependency on DefaultDialerManager; that code just returns false
+ // here if the calling package is empty.
+ if (TextUtils.isEmpty(callingPackage)) {
+ return false;
+ }
TelecomManager tm = mContext.getSystemService(TelecomManager.class);
return (callingPackage.equals(tm.getDefaultDialerPackage())
|| callingPackage.equals(tm.getSystemDialerPackage()));