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, 1 deletions

diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index a0069a629..70fe88be8 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -444,6 +444,7 @@ public class InCallPresenter implements CallList.Listener {
    * activity is provided, it means that the activity was finished and we should attempt to cleanup.
    */
   private void updateActivity(InCallActivity inCallActivity) {
+    Trace.beginSection("InCallPresenter.updateActivity");
     boolean updateListeners = false;
     boolean doAttemptCleanup = false;
 
@@ -475,6 +476,7 @@ public class InCallPresenter implements CallList.Listener {
       if (mInCallState == InCallState.NO_CALLS) {
         LogUtil.i("InCallPresenter.updateActivity", "UI Initialized, but no calls left. Shut down");
         attemptFinishActivity();
+        Trace.endSection();
         return;
       }
     } else {
@@ -510,6 +512,7 @@ public class InCallPresenter implements CallList.Listener {
     if (doAttemptCleanup) {
       attemptCleanup();
     }
+    Trace.endSection();
   }
 
   public void setManageConferenceActivity(
@@ -842,7 +845,7 @@ public class InCallPresenter implements CallList.Listener {
     if (!mCallList.hasLiveCall()
         && !call.getLogState().isIncoming
         && !isSecretCode(call.getNumber())
-        && !CallerInfoUtils.isVoiceMailNumber(mContext, call)) {
+        && !call.isVoiceMailNumber()) {
       PostCall.onCallDisconnected(mContext, call.getNumber(), call.getConnectTimeMillis());
     }
   }