diff options
author | Brandon Maxwell <maxwelb@google.com> | 2016-09-01 02:34:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-01 02:34:54 +0000 |
commit | ae57b14aefb889496bf30caa78deb352af4a8b42 (patch) | |
tree | 0c88bf3bb90c4043ecfe96dd760341d5487a56ae /src/com/android | |
parent | d15b25ba43c296a54e6cfdaf106612349ac5a588 (diff) | |
parent | b825046c97f98a86cc4d54cffd5a30b6de07ee92 (diff) |
[Cherry-pick] Use the correct handleMmi function am: a1e500b29a am: bfb1cdc6cc
am: b825046c97
Change-Id: I487b07a1bf1f87bc891de8b7e778bf7e7e14807f
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/dialer/util/TelecomUtil.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/dialer/util/TelecomUtil.java b/src/com/android/dialer/util/TelecomUtil.java index bd201c459..69c7334b9 100644 --- a/src/com/android/dialer/util/TelecomUtil.java +++ b/src/com/android/dialer/util/TelecomUtil.java @@ -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."); } |