From 8204324a69c4d6b1b95351ab2863b5ddac6fb0a5 Mon Sep 17 00:00:00 2001 From: Brian Attwell Date: Tue, 3 Feb 2015 14:13:58 -0800 Subject: 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 --- src/com/android/dialer/CallDetailActivity.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/com/android/dialer/CallDetailActivity.java') diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index 6c576508c..fb663d729 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -50,9 +50,9 @@ import android.widget.TextView; import android.widget.Toast; import com.android.contacts.common.ContactPhotoManager; -import com.android.contacts.common.CallUtil; import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest; import com.android.contacts.common.GeoUtil; +import com.android.contacts.common.CallUtil; import com.android.dialer.calllog.CallDetailHistoryAdapter; import com.android.dialer.calllog.CallTypeHelper; import com.android.dialer.calllog.ContactInfo; @@ -62,6 +62,7 @@ import com.android.dialer.calllog.PhoneNumberDisplayHelper; import com.android.dialer.calllog.PhoneNumberUtilsWrapper; import com.android.dialer.util.AsyncTaskExecutor; import com.android.dialer.util.AsyncTaskExecutors; +import com.android.dialer.util.PrivilegedCallUtil; import com.android.dialer.util.DialerUtils; import com.android.dialer.voicemail.VoicemailPlaybackFragment; import com.android.dialer.voicemail.VoicemailStatusHelper; @@ -364,8 +365,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware getSystemService(Context.TELEPHONY_SERVICE); if (tm.getCallState() == TelephonyManager.CALL_STATE_IDLE) { DialerUtils.startActivityWithErrorToast(this, - CallUtil.getCallIntent(Uri.fromParts(PhoneAccount.SCHEME_TEL, mNumber, - null)), R.string.call_not_available); + PrivilegedCallUtil.getCallIntent(Uri.fromParts(PhoneAccount.SCHEME_TEL, + mNumber, null)), R.string.call_not_available); return true; } } -- cgit v1.2.3