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

diff --git a/java/com/android/dialer/location/GeoUtil.java b/java/com/android/dialer/location/GeoUtil.java
index b39256d32..27fbf2315 100644
--- a/java/com/android/dialer/location/GeoUtil.java
+++ b/java/com/android/dialer/location/GeoUtil.java
@@ -17,6 +17,7 @@
 package com.android.dialer.location;
 
 import android.content.Context;
+import android.os.Trace;
 
 /** Static methods related to Geo. */
 public class GeoUtil {
@@ -24,6 +25,9 @@ public class GeoUtil {
   /** @return the ISO 3166-1 two letters country code of the country the user is in. */
   public static String getCurrentCountryIso(Context context) {
     // The {@link CountryDetector} should never return null so this is safe to return as-is.
-    return CountryDetector.getInstance(context).getCurrentCountryIso();
+    Trace.beginSection("GeoUtil.getCurrentCountryIso");
+    String countryIso = CountryDetector.getInstance(context).getCurrentCountryIso();
+    Trace.endSection();
+    return countryIso;
   }
 }