summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/StatusBarNotifier.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/com/android/incallui/StatusBarNotifier.java')
-rw-r--r--java/com/android/incallui/StatusBarNotifier.java12
1 files changed, 3 insertions, 9 deletions
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 7ff0040e2..4ce43935e 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -376,8 +376,6 @@ public class StatusBarNotifier
builder.setColorized(true);
builder.setChannelId(NotificationChannelId.ONGOING_CALL);
}
- // This will be ignored on O+ and handled by the channel
- builder.setPriority(Notification.PRIORITY_MAX);
break;
default:
break;
@@ -648,7 +646,8 @@ public class StatusBarNotifier
return R.drawable.ic_hd_call;
}
// If ReturnToCall is enabled, use the static icon. The animated one will show in the bubble.
- if (ReturnToCallController.isEnabled(mContext)) {
+ if (ReturnToCallController.isEnabled(mContext)
+ || NewReturnToCallController.isEnabled(mContext)) {
return R.drawable.quantum_ic_call_vd_theme_24;
} else {
return R.drawable.on_going_call;
@@ -714,7 +713,7 @@ public class StatusBarNotifier
if (resId == R.string.notification_incoming_call_wifi_template
|| resId == R.string.notification_ongoing_call_wifi_template) {
- // TODO(b/64525903): Potentially apply this template logic everywhere.
+ // TODO(a bug): Potentially apply this template logic everywhere.
return mContext.getString(resId, wifiBrand);
}
@@ -1027,11 +1026,6 @@ public class StatusBarNotifier
@Override
public void onAudioStateChanged(CallAudioState audioState) {
- if (CallList.getInstance().getActiveOrBackgroundCall() == null) {
- // We only care about speaker mode when in call
- return;
- }
-
updateNotification();
}