summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2016-08-31 17:12:59 -0700
committerBrandon Maxwell <maxwelb@google.com>2016-09-01 02:00:22 +0000
commita1e500b29a85226f6b18e9fff1e429823c680c5d (patch)
treeeb4fa0bb4bfc1ad205a0c9e157d23eefde14c4dd
parentcb222f5406f4be6ca8bdd4929f965053bf96f2f2 (diff)
downloadandroid_packages_apps_Dialer-a1e500b29a85226f6b18e9fff1e429823c680c5d.tar.gz
android_packages_apps_Dialer-a1e500b29a85226f6b18e9fff1e429823c680c5d.tar.bz2
android_packages_apps_Dialer-a1e500b29a85226f6b18e9fff1e429823c680c5d.zip
[Cherry-pick] Use the correct handleMmi function
In the event that the PhoneAccountHandle is null, do not pass in null as the account handle, instead use the handleMmi string that only takes the dialString. This change seems to have taken place in http://ag/#/c/838273/11/src/com/android/dialer/util/TelecomUtil.java Fixing that with this CL Bug:31165762 Bug:29443147 Change-Id: Idc174639c48ab3c01ad5bde340272a8ec55d6ab1 (cherry picked from commit f9163d84e77a5287c16c679a946c3a8f934350d1)
-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.");
}