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 | |
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')
3 files changed, 7 insertions, 1 deletions
diff --git a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java index 4860649b3..e2ea72569 100644 --- a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java +++ b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java @@ -151,6 +151,8 @@ public class VoicemailSettingsFragment extends PreferenceFragment (PreferenceScreen) findPreference(getString(R.string.voicemail_advanced_settings_key)); Intent advancedSettingsIntent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL); advancedSettingsIntent.putExtra(TelephonyManager.EXTRA_HIDE_PUBLIC_SETTINGS, true); + advancedSettingsIntent.putExtra( + TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle); advancedSettings.setIntent(advancedSettingsIntent); voicemailChangePinPreference.setOnPreferenceClickListener( new OnPreferenceClickListener() { 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( diff --git a/java/com/android/voicemail/stub/StubVoicemailClient.java b/java/com/android/voicemail/stub/StubVoicemailClient.java index 992950340..c2c7a6d38 100644 --- a/java/com/android/voicemail/stub/StubVoicemailClient.java +++ b/java/com/android/voicemail/stub/StubVoicemailClient.java @@ -77,7 +77,9 @@ public final class StubVoicemailClient implements VoicemailClient { @Override public Intent getSetPinIntent(Context context, PhoneAccountHandle phoneAccountHandle) { - return new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL); + Intent intent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL); + intent.putExtra(TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle); + return intent; } @Override |