summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2016-09-01 02:19:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-01 02:19:14 +0000
commit05a8c8a31857e904e8d7b9551a03d4f867f95a63 (patch)
tree580729a626253757579bc05a1a6d23c86df47f66
parent15eb6049a6b9a5737cc5290d527f83e156508889 (diff)
parenta1e500b29a85226f6b18e9fff1e429823c680c5d (diff)
[Cherry-pick] Use the correct handleMmi function
am: a1e500b29a Change-Id: I1d14ccd54f1cdacc13eeccc775101740776d4622
-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.");
}