commit 077dc7afcf9f2d5bacfcd5a048d6303ed73792f6
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 19 22:31:12 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 19 22:31:12 2018 +0000
tree fa2dc3ce9af9e207186a5a04bf8417157f5008a6
parent d43f57edb0f0184221a876183e3e4f41efd2bc22
parent 6f80c367c2579fc6829fc68bed9b5c8d220709b6

Merge "Check null for getPhoneAccount() in VoicemailChannelUtils"

java/com/android/dialer/notification/VoicemailChannelUtils.java

diff --git a/java/com/android/dialer/notification/VoicemailChannelUtils.java b/java/com/android/dialer/notification/VoicemailChannelUtils.java
index 374619a..ddc0f77 100644
--- a/java/com/android/dialer/notification/VoicemailChannelUtils.java
+++ b/java/com/android/dialer/notification/VoicemailChannelUtils.java
@@ -180,6 +180,9 @@
       @NonNull Context context, @NonNull PhoneAccountHandle handle) {
     PhoneAccount phoneAccount =
         context.getSystemService(TelecomManager.class).getPhoneAccount(handle);
+    if (phoneAccount == null) {
+      return;
+    }
     NotificationChannel channel =
         newChannel(context, getChannelIdForAccount(handle), phoneAccount.getLabel());
     migrateVoicemailSoundSettings(context, channel, handle);