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