Merge changes I4ad55f38,Ie8fb633c
* changes:
Adding method to check if call waiting tone should be played
Refactored dialer Ringtone code in prep for call waiting
diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java
index 40203da..ab4150b 100644
--- a/InCallUI/src/com/android/incallui/ContactInfoCache.java
+++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java
@@ -297,6 +297,8 @@
// field is no longer used; it is persisted here in case
// the UI is ever changed to use it.
entry.location = oldEntry.location;
+ // Contact specific ringtone is obtained from local lookup.
+ entry.contactRingtoneUri = oldEntry.contactRingtoneUri;
}
// If no image and it's a business, switch to using the default business avatar.