commit 4a1ef4a01f6f7f50953ff0ba64917f571b8de5a0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 08 15:46:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 08 15:46:53 2019 +0000
tree 9071d9470f901b202e6c99df13ebb65ff154ffda
parent c5b95938cdff58418631a04e05b092dfdb8ed076
parent d38c07c92d58746a3245c59193d14444ddd722c0

Merge "Change package of CallerInfo"

src/com/android/providers/contacts/VoicemailPermissions.java

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