commit 35e0c1776fd755e8dfe0079d478dd9342dfc8abc
author Tyler Gunn <tgunn@google.com> Wed Jun 01 19:08:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 19:08:47 2016 +0000
tree d3657787937bef10b5c6baba7826b96b3e4d1c6e
parent e5b24ecbe50bd79d2ce7ad8a284ac17ad1284d83
parent 3016064e2cb1c3dbd79413d38beabe88e556c3b6

Merge "Ensure external calls do not go through call blocking code." into nyc-mr1-dev am: 1335994507
am: 3016064e2c

* commit '3016064e2cb1c3dbd79413d38beabe88e556c3b6':
  Ensure external calls do not go through call blocking code.

Change-Id: Iea997e8ec6e61e813b7891285761a33908b4da5a

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 fac5393..0103f61 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -544,6 +544,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;
     }