commit 629b7747c5381d3a920522f94c3c34d8dc71f37b
author erfanian <erfanian@google.com> Tue Jun 19 16:39:45 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 19 16:39:45 2018 -0700
tree d51c4c8b1572565a32807d8c9fba2cae54471115
parent e388a9034e2c530e22ceecfbf1245bf3fcecdfa1
parent fe710890000e2e9fad144f3279779d50a3336309

Merge "Add call eligibility checks."
am: fe71089000

Change-Id: I0edd5b167e88b84b9cced8c823ef3d254be6c124

java/com/android/incallui/StatusBarNotifier.java

diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 4026be7..1d73fe8 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -455,7 +455,7 @@
         addVideoCallAction(builder);
       } else {
         addAnswerAction(builder);
-        addSpeakeasyAnswerAction(builder);
+        addSpeakeasyAnswerAction(builder, call);
       }
     }
   }
@@ -874,7 +874,11 @@
             .build());
   }
 
-  private void addSpeakeasyAnswerAction(Notification.Builder builder) {
+  private void addSpeakeasyAnswerAction(Notification.Builder builder, DialerCall call) {
+    if (!call.isSpeakEasyEligible()) {
+      return;
+    }
+
     if (!ConfigProviderComponent.get(context)
         .getConfigProvider()
         .getBoolean("enable_speakeasy_notification_button", false)) {