Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b82e8dae authored by Yorke Lee's avatar Yorke Lee
Browse files

Use TelecomManager.placeCall API 

Bug: 20348183
Change-Id: If1b193f933b4a7b2b322784b0cbbc66c210b25df
parent f452a206

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    coreApp="true">



    <uses-permission android:name="android.permission.CALL_PHONE" />

    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.WRITE_CONTACTS" />

    <uses-permission android:name="android.permission.READ_CALL_LOG" />

src/com/android/dialer/CallDetailActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,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.CallIntentUtil;

import com.android.dialer.util.DialerUtils;

import com.android.dialer.voicemail.VoicemailPlaybackFragment;

import com.android.dialer.voicemail.VoicemailStatusHelper;
@@ -317,7 +317,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
                        getSystemService(Context.TELEPHONY_SERVICE);

                if (tm.getCallState() == TelephonyManager.CALL_STATE_IDLE) {

                    DialerUtils.startActivityWithErrorToast(this,

                            PrivilegedCallUtil.getCallIntent(Uri.fromParts(PhoneAccount.SCHEME_TEL,

                            CallIntentUtil.getCallIntent(Uri.fromParts(PhoneAccount.SCHEME_TEL,

                                    mNumber, null)), R.string.call_not_available);

                    return true;

                }

src/com/android/dialer/DialtactsActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ import com.android.dialer.list.SearchFragment; 
import com.android.dialer.list.SmartDialSearchFragment;

import com.android.dialer.list.SpeedDialFragment;

import com.android.dialer.settings.DialerSettingsActivity;

import com.android.dialer.util.PrivilegedCallUtil;

import com.android.dialer.util.CallIntentUtil;

import com.android.dialer.util.DialerUtils;

import com.android.dialer.widget.ActionBarController;

import com.android.dialer.widget.SearchEditTextLayout;
@@ -1158,8 +1158,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
    @Override

    public void onCallNumberDirectly(String phoneNumber, boolean isVideoCall) {

        Intent intent = isVideoCall ?

                PrivilegedCallUtil.getVideoCallIntent(phoneNumber, getCallOrigin()) :

                PrivilegedCallUtil.getCallIntent(phoneNumber, getCallOrigin());

                CallIntentUtil.getVideoCallIntent(phoneNumber, getCallOrigin()) :

                CallIntentUtil.getCallIntent(phoneNumber, getCallOrigin());

        DialerUtils.startActivityWithErrorToast(this, intent);

        mClearSearchOnPause = true;

    }

src/com/android/dialer/calllog/IntentProvider.java

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import com.android.contacts.common.model.ContactLoader; 
import com.android.dialer.CallDetailActivity;

import com.android.dialer.DialtactsActivity;

import com.android.dialer.PhoneCallDetails;

import com.android.dialer.util.PrivilegedCallUtil;

import com.android.dialer.util.CallIntentUtil;



import java.util.ArrayList;
@@ -54,7 +54,7 @@ public abstract class IntentProvider { 
        return new IntentProvider() {

            @Override

            public Intent getIntent(Context context) {

                return PrivilegedCallUtil.getCallIntent(number, accountHandle);

                return CallIntentUtil.getCallIntent(number, accountHandle);

            }

        };

    }
@@ -68,7 +68,7 @@ public abstract class IntentProvider { 
        return new IntentProvider() {

            @Override

            public Intent getIntent(Context context) {

                return PrivilegedCallUtil.getVideoCallIntent(number, accountHandle);

                return CallIntentUtil.getVideoCallIntent(number, accountHandle);

            }

        };

    }
@@ -77,7 +77,7 @@ public abstract class IntentProvider { 
        return new IntentProvider() {

            @Override

            public Intent getIntent(Context context) {

                return PrivilegedCallUtil.getVoicemailIntent();

                return CallIntentUtil.getVoicemailIntent();

            }

        };

    }

src/com/android/dialer/dialpad/DialpadFragment.java

+4 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ import com.android.dialer.NeededForReflection; 
import com.android.dialer.R;

import com.android.dialer.SpecialCharSequenceMgr;

import com.android.dialer.calllog.PhoneAccountUtils;

import com.android.dialer.util.PrivilegedCallUtil;

import com.android.dialer.util.CallIntentUtil;

import com.android.dialer.util.DialerUtils;

import com.android.phone.common.CallLogAsync;

import com.android.phone.common.HapticFeedback;
@@ -1001,7 +1001,7 @@ public class DialpadFragment extends Fragment 
    }



    public void callVoicemail() {

        DialerUtils.startActivityWithErrorToast(getActivity(), PrivilegedCallUtil

        DialerUtils.startActivityWithErrorToast(getActivity(), CallIntentUtil

                .getVoicemailIntent());

        hideAndClearDialpad(false);

    }
@@ -1098,7 +1098,7 @@ public class DialpadFragment extends Fragment 
                // Clear the digits just in case.

                clearDialpad();

            } else {

                final Intent intent = PrivilegedCallUtil.getCallIntent(number,

                final Intent intent = CallIntentUtil.getCallIntent(number,

                        (getActivity() instanceof DialtactsActivity ?

                                ((DialtactsActivity) getActivity()).getCallOrigin() : null));

                DialerUtils.startActivityWithErrorToast(getActivity(), intent);
@@ -1616,7 +1616,7 @@ public class DialpadFragment extends Fragment 
    }



    private Intent newFlashIntent() {

        final Intent intent = PrivilegedCallUtil.getCallIntent(EMPTY_NUMBER);

        final Intent intent = CallIntentUtil.getCallIntent(EMPTY_NUMBER);

        intent.putExtra(EXTRA_SEND_EMPTY_FLASH, true);

        return intent;

    }