diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-11 22:24:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-11 22:24:46 +0000 |
| commit | b21b9f9b2efbc358ee9806af87b7edc3f82af4da (patch) | |
| tree | 3e6418fc85a41ccfb06b362f39f462485061e80d /java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java | |
| parent | 3523770fcf79ccf3b05ca2485af08b78f53b1294 (diff) | |
| parent | bf900241b71a4a594ce989bf0d18ada1d5fadb56 (diff) | |
Merge changes I8578dd2c,Ia8e581f1
* changes:
Send PhoneAccountHandle with ACTION_CONFIGURE_VOICEMAIL
Fix NPE in contacts fragment.
Diffstat (limited to 'java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java')
| -rw-r--r-- | java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java b/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java index e902825c0..d55e3b5ae 100644 --- a/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java +++ b/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java @@ -101,6 +101,8 @@ public class LegacyModeSmsHandler { Intent launchVoicemailSettingsIntent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL); launchVoicemailSettingsIntent.putExtra(TelephonyManager.EXTRA_HIDE_PUBLIC_SETTINGS, true); + launchVoicemailSettingsIntent.putExtra( + TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle); launchVoicemailSettingsPendingIntent = PendingIntent.getActivity( |