diff options
author | Wileen Chiu <wileenc@codeaurora.org> | 2016-08-12 17:40:07 -0700 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2016-08-24 08:18:49 -0600 |
commit | c6177c1b3f6d6414364f21496030df441f2959e0 (patch) | |
tree | b3ad8be985e9e6a592a0523141081501a73e5f6e | |
parent | 93136e62f29192f43badde3fe0d36a6af235defc (diff) | |
download | android_packages_apps_ContactsCommon-c6177c1b3f6d6414364f21496030df441f2959e0.tar.gz android_packages_apps_ContactsCommon-c6177c1b3f6d6414364f21496030df441f2959e0.tar.bz2 android_packages_apps_ContactsCommon-c6177c1b3f6d6414364f21496030df441f2959e0.zip |
Fix changing sim pin through mmi codestaging/cm-14.0-caf
- Attempting to handle mmi code is failing
when PhoneAccount object is null
- call handleMmi API with only dial string if
null
Change-Id: If353c6955a0a912325fbaff1985b32a2301a43d9
-rw-r--r-- | src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java index 6292b7fe..227ea746 100644 --- a/src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java +++ b/src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java @@ -235,17 +235,19 @@ public class TelecomManagerCompat { if (telecomManager == null || TextUtils.isEmpty(dialString)) { return false; } - if (CompatUtils.isMarshmallowCompatible()) { - return telecomManager.handleMmi(dialString, accountHandle); - } + if (accountHandle != null) { + if (CompatUtils.isMarshmallowCompatible()) { + return telecomManager.handleMmi(dialString, accountHandle); + } - Object handleMmiResult = CompatUtils.invokeMethod( - telecomManager, - "handleMmi", - new Class<?>[] {PhoneAccountHandle.class, String.class}, - new Object[] {accountHandle, dialString}); - if (handleMmiResult != null) { - return (boolean) handleMmiResult; + Object handleMmiResult = CompatUtils.invokeMethod( + telecomManager, + "handleMmi", + new Class<?>[] {PhoneAccountHandle.class, String.class}, + new Object[] {accountHandle, dialString}); + if (handleMmiResult != null) { + return (boolean) handleMmiResult; + } } return telecomManager.handleMmi(dialString); |