summaryrefslogtreecommitdiffstats
path: root/src/com/android/dialer/interactions
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2015-02-03 14:13:58 -0800
committerBrian Attwell <brianattwell@google.com>2015-02-03 17:33:59 -0800
commit8204324a69c4d6b1b95351ab2863b5ddac6fb0a5 (patch)
tree74ff149d4d97b4c702b1cf1805ace74c2f8fc601 /src/com/android/dialer/interactions
parentf5554ceb3c152949b4b6278b7f5e1522148a574c (diff)
downloadandroid_packages_apps_Dialer-8204324a69c4d6b1b95351ab2863b5ddac6fb0a5.tar.gz
android_packages_apps_Dialer-8204324a69c4d6b1b95351ab2863b5ddac6fb0a5.tar.bz2
android_packages_apps_Dialer-8204324a69c4d6b1b95351ab2863b5ddac6fb0a5.zip
Move CallUtil into Dialer. P1/3
CallUtil relies on the a priviliged intent that should only be used by system apps. Therefore, it shouldn't be used by an unbundled Contacts app. I'm leaving one (isVideoEnabled) method from CallUtil inside ContactsCommon. This way, when the changes that Tyler made inside m-wireless-telephony-shamu-dev (b/19062133) get merged back into master both ContactsCommon and Dialer will be updated. Bug: 18777272 Change-Id: I49c9cc714ded01d523ed770a5bf62cf92c378e2f
Diffstat (limited to 'src/com/android/dialer/interactions')
-rw-r--r--src/com/android/dialer/interactions/PhoneNumberInteraction.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/interactions/PhoneNumberInteraction.java b/src/com/android/dialer/interactions/PhoneNumberInteraction.java
index de217ce7b..78c468bbc 100644
--- a/src/com/android/dialer/interactions/PhoneNumberInteraction.java
+++ b/src/com/android/dialer/interactions/PhoneNumberInteraction.java
@@ -45,7 +45,6 @@ import android.widget.CheckBox;
import android.widget.ListAdapter;
import android.widget.TextView;
-import com.android.contacts.common.CallUtil;
import com.android.contacts.common.Collapser;
import com.android.contacts.common.Collapser.Collapsible;
import com.android.contacts.common.MoreContactUtils;
@@ -53,6 +52,7 @@ import com.android.contacts.common.activity.TransactionSafeActivity;
import com.android.contacts.common.util.ContactDisplayUtils;
import com.android.dialer.R;
import com.android.dialer.contact.ContactUpdateService;
+import com.android.dialer.util.PrivilegedCallUtil;
import com.android.dialer.util.DialerUtils;
import com.google.common.annotations.VisibleForTesting;
@@ -322,7 +322,7 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener<Cursor> {
Intent.ACTION_SENDTO, Uri.fromParts("sms", phoneNumber, null));
break;
default:
- intent = CallUtil.getCallIntent(phoneNumber, callOrigin);
+ intent = PrivilegedCallUtil.getCallIntent(phoneNumber, callOrigin);
break;
}
DialerUtils.startActivityWithErrorToast(context, intent);