Promotion of atel.lnx.2.0-00028.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1085422 I914a6d5b053e4dd9cd193701b571522fb8bf523a Fix showing number repeat in call log for 4G conference
1083453 I0bbbf25b95ae82a2d67152edd07c4f7c14498917 Fix DialtactsActivity leaks
Change-Id: Ib64ae1ebb823d593deb9bbd447db2aa45b15b5a9
CRs-Fixed: 1085422, 1083453
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 462b036..a1ec0b3 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -380,6 +380,13 @@
}
}
+ public void onStop () {
+ pauseCache();
+ if (mHiddenItemUri != null) {
+ CallLogAsyncTaskUtil.deleteVoicemail(mContext, mHiddenItemUri, null);
+ }
+ }
+
@VisibleForTesting
/* package */ void pauseCache() {
mContactInfoCache.stop();
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index b44d8ca..96551a4 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -354,14 +354,13 @@
@Override
public void onPause() {
cancelDisplayUpdate();
- mAdapter.onPause();
super.onPause();
}
@Override
public void onStop() {
updateOnTransition();
-
+ mAdapter.onStop();
super.onStop();
}
diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index 07db044..bcc9e2f 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -288,6 +288,10 @@
for (String num : nums) {
ContactInfo singleCi = lookupContactFromUri(getContactInfoLookupUri(num),
isSip);
+ // If contact does not exist, need to avoid changing static empty-contact.
+ if (singleCi == ContactInfo.EMPTY) {
+ singleCi = new ContactInfo();
+ }
if (TextUtils.isEmpty(singleCi.name)) {
singleCi.name = formatPhoneNumber(num, null, countryIso);
}