Merge changes I14a2c0b6,Ic67566c2,Id0ef9164,Iec48f030,Ibe1f9de6, ...

* changes:
  Handle invalid PhoneAccountHandle component name in MissedCallNotifier
  Use TelephonyManagerCompat for IS_REFRESH
  Updated animation to enter and exit search ui.
  Optimization for incoming call latency.
  Fix for voice screen showing for a short time when making a video call
  Fix incallui to use latest ux mocks for assisted dialing.
  Remove voicemail count changed check for legacy notifications

1 files changed, 4 insertions, 0 deletions

diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java
index 2a9394526..2fb18b8d7 100644
--- a/java/com/android/incallui/ContactInfoCache.java
+++ b/java/com/android/incallui/ContactInfoCache.java
@@ -807,10 +807,12 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
 
     @Override
     public void onQueryComplete(int token, Object cookie, CallerInfo callerInfo) {
+      Trace.beginSection("ContactInfoCache.FindInfoCallback.onQueryComplete");
       Assert.isMainThread();
       DialerCallCookieWrapper cw = (DialerCallCookieWrapper) cookie;
       String callId = cw.callId;
       if (!isWaitingForThisQuery(cw.callId, mQueryToken.mQueryId)) {
+        Trace.endSection();
         return;
       }
       ContactCacheEntry cacheEntry = mInfoMap.get(callId);
@@ -818,6 +820,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
       if (cacheEntry == null) {
         Log.w(TAG, "Contact lookup done, but cache entry is not found.");
         clearCallbacks(callId);
+        Trace.endSection();
         return;
       }
       // Before issuing a request for more data from other services, we only check that the
@@ -842,6 +845,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
         }
         clearCallbacks(callId);
       }
+      Trace.endSection();
     }
   }