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

Commit 9340da07 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge tag android-5.0.2_r1 into HEAD"

parents e0417a93 62040b38

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    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/util/DialerUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ public class DialerUtils { 
     */

    public static void startActivityWithErrorToast(Context context, Intent intent, int msgId) {

        try {

            if (Intent.ACTION_CALL.equals(intent.getAction())) {

            if (Intent.ACTION_CALL.equals(intent.getAction())

                    || Intent.ACTION_CALL_PRIVILEGED.equals(intent.getAction())) {

                // All dialer-initiated calls should pass the touch point to the InCallUI

                Point touchPoint = TouchPointManager.getInstance().getPoint();

                if (touchPoint.x != 0 || touchPoint.y != 0) {