summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2016-09-01 02:32:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-01 02:32:46 +0000
commitfc17ba8a41303fd27124808410148f62c60d2989 (patch)
tree4cc27323ea4aed5f7b87bbabe3290efb4b59d2f4
parentf66d490d17472023ea930d9163ddc2875c30407a (diff)
parentf2d4bc9098e8280dd8b9ed77d32a867ded6c85c8 (diff)
[Cherry-pick] Use the correct handleMmi function am: a1e500b29a am: 05a8c8a318
am: f2d4bc9098 Change-Id: Ifefb94babafa5ed947fb45a71625d49858278442
-rw-r--r--src/com/android/dialer/util/TelecomUtil.java9
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.");
}