diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-09-01 02:19:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-01 02:19:50 +0000 |
| commit | bfb1cdc6cca64c532656fc6b6927089891e37974 (patch) | |
| tree | fa8833af594473703a98c96eefbba1c4fcfa2e50 /src/com | |
| parent | c381f60aa16ca567342a351c47280d1df46108b4 (diff) | |
| parent | a1e500b29a85226f6b18e9fff1e429823c680c5d (diff) | |
| download | android_packages_apps_Dialer-bfb1cdc6cca64c532656fc6b6927089891e37974.tar.gz android_packages_apps_Dialer-bfb1cdc6cca64c532656fc6b6927089891e37974.tar.bz2 android_packages_apps_Dialer-bfb1cdc6cca64c532656fc6b6927089891e37974.zip | |
[Cherry-pick] Use the correct handleMmi function
am: a1e500b29a
Change-Id: I7d7ced10ae11b019841d0fe681a4ea53b45dce07
Diffstat (limited to 'src/com')
| -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."); } |