diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-07 14:58:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-07 14:58:52 +0000 |
| commit | 6cd92f57ee71cc36276803807809d0014259b51a (patch) | |
| tree | 51da6f501246f57d4900c0533f5c773bfe8cd9e4 /java/com/android/dialer/app | |
| parent | 4662229bb3c8053a27b0030a0da359f4d99b042e (diff) | |
| parent | cf61ca00e96f7fb723ca2d4406ec24485a60acd1 (diff) | |
Merge changes I0e8549cf,I12ac7b89,I2c77f0c6,I3ba5795b
* changes:
Lazy loading animation of hd icon.
Use TelecomManager#isInManagedCall starting from O.
Setup SMS filter during activation if legacy mode is used
Last contact in search is now visible when dialpad is closed.
Diffstat (limited to 'java/com/android/dialer/app')
| -rw-r--r-- | java/com/android/dialer/app/DialtactsActivity.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index 3e6b50cae..a4c075c51 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -1410,7 +1410,7 @@ public class DialtactsActivity extends TransactionSafeActivity } private boolean phoneIsInUse() { - return TelecomUtil.isInCall(this); + return TelecomUtil.isInManagedCall(this); } private boolean canIntentBeHandled(Intent intent) { diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java index de4e1cc4a..685357ace 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java @@ -516,7 +516,7 @@ public class VoicemailPlaybackPresenter mView.disableUiElements(); mIsPrepared = false; - if (mContext != null && TelecomUtil.isInCall(mContext)) { + if (mContext != null && TelecomUtil.isInManagedCall(mContext)) { handleError(new IllegalStateException("Cannot play voicemail when call is in progress")); return; } |