summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2016-06-01 17:41:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-01 17:41:23 +0000
commit1335994507a9dd0780e0c770d1ba6dbe059176c7 (patch)
tree0641703139c87ce8c2e3c4e843b4e9e8a4b37890 /InCallUI
parent7e632d2c87d47aa1fb7b2f4d18b472ec1c9f7d7b (diff)
parenta4a838a29e5c61e06e2e282efa104a89aaa9129c (diff)
Merge "Ensure external calls do not go through call blocking code." into nyc-mr1-dev
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/InCallPresenter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 38507eef9..c3ca6de85 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -534,6 +534,9 @@ public class InCallPresenter implements CallList.Listener,
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;
}