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, 5 insertions, 0 deletions

diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java
index 9ccda3251..0a7c2689b 100644
--- a/java/com/android/incallui/InCallActivityCommon.java
+++ b/java/com/android/incallui/InCallActivityCommon.java
@@ -29,6 +29,7 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Trace;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -257,6 +258,7 @@ public class InCallActivityCommon {
   }
 
   public void onStart() {
+    Trace.beginSection("InCallActivityCommon.onStart");
     // setting activity should be last thing in setup process
     InCallPresenter.getInstance().setActivity(inCallActivity);
     enableInCallOrientationEventListener(
@@ -267,9 +269,11 @@ public class InCallActivityCommon {
     if (!isRecreating) {
       InCallPresenter.getInstance().onUiShowing(true);
     }
+    Trace.endSection();
   }
 
   public void onResume() {
+    Trace.beginSection("InCallActivityCommon.onResume");
     if (InCallPresenter.getInstance().isReadyForTearDown()) {
       LogUtil.i(
           "InCallActivityCommon.onResume",
@@ -309,6 +313,7 @@ public class InCallActivityCommon {
     CallList.getInstance()
         .onInCallUiShown(
             inCallActivity.getIntent().getBooleanExtra(INTENT_EXTRA_FOR_FULL_SCREEN, false));
+    Trace.endSection();
   }
 
   // onPause is guaranteed to be called when the InCallActivity goes