commit a5a08d8890b08ac1fde8ccaf333fe33c69333ae5
author yueg <yueg@google.com> Tue Oct 31 14:11:53 2017 -0700
committer zachh <zachh@google.com> Fri Nov 03 00:21:12 2017 +0000
tree ab82401c5c33c58ecf534fc73962405f8af94122
parent 9ebcbef57c9c694f2ab1c357b6b6356d0aa0d143

Add avatar and small icon in bubble primary button.

Bug: 67605985
Test: NewBubbleIntegrationTest, NewReturnToCallControllerTest
PiperOrigin-RevId: 174089572
Change-Id: Icaeb41482cffe522e09ee1ec068b5d47f476b146

java/com/android/incallui/InCallServiceImpl.java

diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java
index 402e002..539dba8 100644
--- a/java/com/android/incallui/InCallServiceImpl.java
+++ b/java/com/android/incallui/InCallServiceImpl.java
@@ -99,7 +99,8 @@
       returnToCallController = new ReturnToCallController(this);
     }
     if (NewReturnToCallController.isEnabled(this)) {
-      newReturnToCallController = new NewReturnToCallController(this);
+      newReturnToCallController =
+          new NewReturnToCallController(this, ContactInfoCache.getInstance(context));
     }
 
     IBinder iBinder = super.onBind(intent);