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/stub/StubVoicemailClient.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/stub/StubVoicemailClient.java')
| -rw-r--r-- | java/com/android/voicemail/stub/StubVoicemailClient.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 |