Merge "Fix DialtactsActivity leaks" into atel.lnx.2.0-dev
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();
     }