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

Commit 5c8ebb28 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-7.0.0_r14' of... 

Merge tag 'android-7.0.0_r14' of https://android.googlesource.com/platform/packages/apps/Dialer into cm-14.0

Android 7.0.0 Release 14 (NBD90Z)

Change-Id: Icebdc1d62b0e72af0424f07a22f74df86127d7ac
parents 49fb7e3e 7f6e4148

src/com/android/dialer/util/TelecomUtil.java

+6 −3
Original line number Diff line number Diff line
@@ -95,11 +95,14 @@ public class TelecomUtil { 
    }



    public static boolean handleMmi(Context context, String dialString,

            PhoneAccountHandle handle) {

            @Nullable PhoneAccountHandle handle) {

        if (hasModifyPhoneStatePermission(context)) {

            try {

                return TelecomManagerCompat.handleMmi(

                        getTelecomManager(context), dialString, handle);

                if (handle == null) {

                    return getTelecomManager(context).handleMmi(dialString);

                } else {

                    return getTelecomManager(context).handleMmi(dialString, handle);

                }

            } catch (SecurityException e) {

                Log.w(TAG, "TelecomManager.handleMmi called without permission.");

            }