summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2016-09-01 02:21:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-01 02:21:44 +0000
commitb825046c97f98a86cc4d54cffd5a30b6de07ee92 (patch)
tree915b5284ab27be1a48dff5b1ed8e586c88470c00
parent25727988916fdb6b9050a2292a2a1354f1a0821f (diff)
parentbfb1cdc6cca64c532656fc6b6927089891e37974 (diff)
[Cherry-pick] Use the correct handleMmi function am: a1e500b29a
am: bfb1cdc6cc Change-Id: I3cc44b1d742f48ee277233733f8a0616b79a4b62
-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.");
}