commit 59c58249e8e8b18534e1d515374985ac10fc9b65
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 23 01:34:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 23 01:34:57 2018 +0000
tree d32b931223afa4e67512fcb8dd3bcb35fa5c0320
parent 470e27aa76be60c44e3d468d54abdbc82d492eb0
parent 37a969d4b3ffb71b5e5939ef3556115c2b2e4cc1

Merge "Fix bug in isVoicemailNumber method not returning early"

java/com/android/incallui/call/DialerCall.java

diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index 90a0140..50bc691 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -501,10 +501,12 @@
   private void updateIsVoiceMailNumber() {
     if (getHandle() != null && PhoneAccount.SCHEME_VOICEMAIL.equals(getHandle().getScheme())) {
       isVoicemailNumber = true;
+      return;
     }
 
     if (!PermissionsUtil.hasPermission(context, permission.READ_PHONE_STATE)) {
       isVoicemailNumber = false;
+      return;
     }
 
     isVoicemailNumber = TelecomUtil.isVoicemailNumber(context, getAccountHandle(), getNumber());