Update Dialer to v10 RC32
This release was created following the instructions at:
go/dialer-aosp-release
Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.
Version: 10
Candidate: RC32
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC32
This release contains the following bug fixes since RC17:
Bug: 33176679 33272455 3646510 36773894 37297649 37413780
37513689 37640315 37680595 37698062 37873639 37901752
37919295 37953423 38062852 38069600 38137349 38173549
38180252 38191514
Test: make, on device
Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java
index 76a5d24..0b3592d 100644
--- a/java/com/android/incallui/CallCardPresenter.java
+++ b/java/com/android/incallui/CallCardPresenter.java
@@ -373,6 +373,9 @@
@Override
public void onHandoverToWifiFailure() {}
+ @Override
+ public void onInternationalCallOnWifi() {}
+
/** Handles a change to the child number by refreshing the primary call info. */
@Override
public void onDialerCallChildNumberChange() {
@@ -737,7 +740,7 @@
mInCallScreen.setPrimary(
new PrimaryInfo(
number,
- name,
+ mPrimary.updateNameIfRestricted(name),
nameIsNumber,
shouldShowLocationAsLabel(nameIsNumber, mPrimaryContactInfo.shouldShowLocation)
? mPrimaryContactInfo.location
@@ -890,7 +893,7 @@
mInCallScreen.setSecondary(
new SecondaryInfo(
true /* show */,
- name,
+ mSecondary.updateNameIfRestricted(name),
nameIsNumber,
mSecondaryContactInfo.label,
mSecondary.getCallProviderLabel(),