diff options
| author | Anthony Lee <anthonylee@google.com> | 2015-09-22 21:35:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-22 21:35:34 +0000 |
| commit | 91a7333c41be143f027a246f328682344457fd09 (patch) | |
| tree | bdd90358dbcc831782b01374b68e555ac76f0ce5 /src/com/android/incallui/CallCardPresenter.java | |
| parent | 74d278dd4afb7e700bded95b6a528711135fa419 (diff) | |
| parent | 1b26f2ee1380a6b3e05747143b53e0ad67628073 (diff) | |
| download | InCallUI-91a7333c41be143f027a246f328682344457fd09.tar.gz | |
am 1b26f2ee: am 4b52c305: am 126265d8: Merge "Ensure call subject is hidden if disabled for carrier." into mnc-dr-dev
* commit '1b26f2ee1380a6b3e05747143b53e0ad67628073':
Ensure call subject is hidden if disabled for carrier.
Diffstat (limited to 'src/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | src/com/android/incallui/CallCardPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/incallui/CallCardPresenter.java b/src/com/android/incallui/CallCardPresenter.java index 6c2b6b6c..0cc5da1c 100644 --- a/src/com/android/incallui/CallCardPresenter.java +++ b/src/com/android/incallui/CallCardPresenter.java @@ -921,7 +921,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> boolean isIncomingOrWaiting = mPrimary.getState() == Call.State.INCOMING || mPrimary.getState() == Call.State.CALL_WAITING; return isIncomingOrWaiting && !TextUtils.isEmpty(call.getCallSubject()) && - call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED; + call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED && + call.isCallSubjectSupported(); } /** |