summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/com/android/incallui/NewReturnToCallController.java8
-rw-r--r--java/com/android/newbubble/NewBubbleInfo.java3
2 files changed, 9 insertions, 2 deletions
diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java
index abff000fd..95da1c65e 100644
--- a/java/com/android/incallui/NewReturnToCallController.java
+++ b/java/com/android/incallui/NewReturnToCallController.java
@@ -205,7 +205,13 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au
}
private void startContactInfoSearch() {
- DialerCall dialerCall = CallList.getInstance().getActiveOrBackgroundCall();
+ DialerCall dialerCall = CallList.getInstance().getIncomingCall();
+ if (dialerCall == null) {
+ dialerCall = CallList.getInstance().getOutgoingCall();
+ }
+ if (dialerCall == null) {
+ dialerCall = CallList.getInstance().getActiveOrBackgroundCall();
+ }
if (dialerCall != null) {
contactInfoCache.findInfo(
dialerCall, false /* isIncoming */, new ReturnToCallContactInfoCacheCallback(this));
diff --git a/java/com/android/newbubble/NewBubbleInfo.java b/java/com/android/newbubble/NewBubbleInfo.java
index 126b300ed..ec26a3143 100644
--- a/java/com/android/newbubble/NewBubbleInfo.java
+++ b/java/com/android/newbubble/NewBubbleInfo.java
@@ -53,7 +53,8 @@ public abstract class NewBubbleInfo {
.setPrimaryColor(bubbleInfo.getPrimaryColor())
.setPrimaryIcon(bubbleInfo.getPrimaryIcon())
.setStartingYPosition(bubbleInfo.getStartingYPosition())
- .setActions(bubbleInfo.getActions());
+ .setActions(bubbleInfo.getActions())
+ .setAvatar(bubbleInfo.getAvatar());
}
/** Builder for {@link NewBubbleInfo} */