commit b825046c97f98a86cc4d54cffd5a30b6de07ee92
author Brandon Maxwell <maxwelb@google.com> Thu Sep 01 02:21:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 01 02:21:44 2016 +0000
tree 915b5284ab27be1a48dff5b1ed8e586c88470c00
parent 25727988916fdb6b9050a2292a2a1354f1a0821f
parent bfb1cdc6cca64c532656fc6b6927089891e37974

[Cherry-pick] Use the correct handleMmi function am: a1e500b29a
am: bfb1cdc6cc

Change-Id: I3cc44b1d742f48ee277233733f8a0616b79a4b62

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

diff --git a/src/com/android/dialer/util/TelecomUtil.java b/src/com/android/dialer/util/TelecomUtil.java
index bd201c4..69c7334 100644
--- a/src/com/android/dialer/util/TelecomUtil.java
+++ b/src/com/android/dialer/util/TelecomUtil.java
@@ -95,11 +95,14 @@
     }
 
     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.");
             }