diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-06-01 18:21:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 18:21:26 +0000 |
| commit | 3016064e2cb1c3dbd79413d38beabe88e556c3b6 (patch) | |
| tree | 262e98d010b1f572ab6c443a3d08c90b60909cca /InCallUI | |
| parent | 28d0c6120c8c89e054744058754612e68f51d822 (diff) | |
| parent | 1335994507a9dd0780e0c770d1ba6dbe059176c7 (diff) | |
Merge "Ensure external calls do not go through call blocking code." into nyc-mr1-dev
am: 1335994507
* commit '1335994507a9dd0780e0c770d1ba6dbe059176c7':
Ensure external calls do not go through call blocking code.
Change-Id: Ia08ad649b8ca6ca46cbe65c4c4f1d43261439e40
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 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; } |