diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-06-01 19:08:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 19:08:47 +0000 |
| commit | 35e0c1776fd755e8dfe0079d478dd9342dfc8abc (patch) | |
| tree | d3657787937bef10b5c6baba7826b96b3e4d1c6e /InCallUI | |
| parent | e5b24ecbe50bd79d2ce7ad8a284ac17ad1284d83 (diff) | |
| parent | 3016064e2cb1c3dbd79413d38beabe88e556c3b6 (diff) | |
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
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 3 |
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 fac539311..0103f61ed 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -544,6 +544,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; } |