commit 1335994507a9dd0780e0c770d1ba6dbe059176c7
author Tyler Gunn <tgunn@google.com> Wed Jun 01 17:41:23 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 17:41:23 2016 +0000
tree 0641703139c87ce8c2e3c4e843b4e9e8a4b37890
parent 7e632d2c87d47aa1fb7b2f4d18b472ec1c9f7d7b
parent a4a838a29e5c61e06e2e282efa104a89aaa9129c

Merge "Ensure external calls do not go through call blocking code." into nyc-mr1-dev

InCallUI/src/com/android/incallui/InCallPresenter.java

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 38507ee..c3ca6de 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -534,6 +534,9 @@
             Log.i(this, "Not attempting to block incoming call due to recent emergency call");
             return false;
         }
+        if (call.getDetails().hasProperty(CallSdkCompat.Details.PROPERTY_IS_EXTERNAL_CALL)) {
+            return false;
+        }
 
         return true;
     }