diff options
Diffstat (limited to 'java/com/android/incallui/call')
| -rw-r--r-- | java/com/android/incallui/call/CallList.java | 4 | ||||
| -rw-r--r-- | java/com/android/incallui/call/DialerCall.java | 2 | ||||
| -rw-r--r-- | java/com/android/incallui/call/InCallVideoCallCallbackNotifier.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java index 26fd926d1..0bb16080b 100644 --- a/java/com/android/incallui/call/CallList.java +++ b/java/com/android/incallui/call/CallList.java @@ -28,11 +28,11 @@ import android.telecom.Call; import android.telecom.DisconnectCause; import android.telecom.PhoneAccount; import android.util.ArrayMap; -import com.android.contacts.common.GeoUtil; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.blocking.FilteredNumbersUtil; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; +import com.android.dialer.location.GeoUtil; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.shortcuts.ShortcutUsageReporter; @@ -95,7 +95,7 @@ public class CallList implements DialerCallDelegate { /** * USED ONLY FOR TESTING Testing-only constructor. Instance should only be acquired through - * getInstance(). + * getRunningInstance(). */ @VisibleForTesting public CallList() {} diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index 71dfd4caa..3825e6e26 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -1326,7 +1326,7 @@ public class DialerCall implements VideoTechListener { String phoneNumber = call.getNumber(); phoneNumber = phoneNumber != null ? phoneNumber : ""; - phoneNumber = phoneNumber.replaceAll("[^0-9]", ""); + phoneNumber = phoneNumber.replaceAll("[^+0-9]", ""); // Insert order here determines the priority of that video tech option videoTechs = new ArrayList<>(); diff --git a/java/com/android/incallui/call/InCallVideoCallCallbackNotifier.java b/java/com/android/incallui/call/InCallVideoCallCallbackNotifier.java index 1cb9f742e..ff94120bf 100644 --- a/java/com/android/incallui/call/InCallVideoCallCallbackNotifier.java +++ b/java/com/android/incallui/call/InCallVideoCallCallbackNotifier.java @@ -36,7 +36,7 @@ public class InCallVideoCallCallbackNotifier { private final Set<SurfaceChangeListener> mSurfaceChangeListeners = Collections.newSetFromMap(new ConcurrentHashMap<SurfaceChangeListener, Boolean>(8, 0.9f, 1)); - /** Private constructor. Instance should only be acquired through getInstance(). */ + /** Private constructor. Instance should only be acquired through getRunningInstance(). */ private InCallVideoCallCallbackNotifier() {} /** Static singleton accessor method. */ |