diff options
author | Ihab Awad <ihab@google.com> | 2014-12-01 22:32:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 22:32:34 +0000 |
commit | 913636546254b3860da92aa76a882647cd9de364 (patch) | |
tree | 73ab54d703756ecb89295398c21e73058a3c1b84 /InCallUI | |
parent | cd75373fcc49810751675bcd36bd7d7dee5055e9 (diff) | |
parent | bd4440be6e5e8ea2c01c1e3c6c1d0e3c9344a6bd (diff) |
am 8936f6d6: Fix build breakage due to http://ag/587241
* commit '8936f6d64bfe5991d3efa85f58d1c6b2b8c7d80f':
Fix build breakage due to http://ag/587241
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/StatusBarNotifier.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index 4737c8fe8..a0eddcc57 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -31,7 +31,6 @@ import android.graphics.drawable.BitmapDrawable; import android.os.Handler; import android.os.Message; import android.telecom.PhoneAccount; -import android.telecom.PhoneCapabilities; import android.text.TextUtils; import com.android.contacts.common.util.BitmapUtil; @@ -383,7 +382,8 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener { * Returns the main string to use in the notification. */ private String getContentTitle(ContactCacheEntry contactInfo, Call call) { - if (call.isConferenceCall() && !call.can(PhoneCapabilities.GENERIC_CONFERENCE)) { + if (call.isConferenceCall() + && !call.can(android.telecom.Call.Details.CAPABILITY_GENERIC_CONFERENCE)) { return mContext.getResources().getString(R.string.card_title_conf_call); } if (TextUtils.isEmpty(contactInfo.name)) { @@ -408,7 +408,8 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener { */ private Bitmap getLargeIconToDisplay(ContactCacheEntry contactInfo, Call call) { Bitmap largeIcon = null; - if (call.isConferenceCall() && !call.can(PhoneCapabilities.GENERIC_CONFERENCE)) { + if (call.isConferenceCall() + && !call.can(android.telecom.Call.Details.CAPABILITY_GENERIC_CONFERENCE)) { largeIcon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.img_conference); } |