From eb8962e3eac3d4edd5e8fda9cd4f95a80501d404 Mon Sep 17 00:00:00 2001
From: NathanielWaggoner <nwaggoner@cyngn.com>
Date: Tue, 10 May 2016 16:04:28 -0700
Subject: Best fix for the case where ModButtonPresenter UI wasn't updating
 properly in onResume cases.

NOTES-122

Change-Id: I8dab2c5d4d77f63e868ff950c523c3f13fc4cc02
(cherry picked from commit 77f56a511ddd14abfe96f0ca363e2a1749af1a5f)
---
 src/com/android/incallui/ModButtonFragment.java  | 2 +-
 src/com/android/incallui/ModButtonPresenter.java | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/com/android/incallui/ModButtonFragment.java b/src/com/android/incallui/ModButtonFragment.java
index e3cda71c..271af48d 100644
--- a/src/com/android/incallui/ModButtonFragment.java
+++ b/src/com/android/incallui/ModButtonFragment.java
@@ -129,7 +129,7 @@ public class ModButtonFragment
     @Override
     public void onResume() {
         super.onResume();
-
+        getPresenter().getPreferredLinks();
         updateColors();
     }
 
diff --git a/src/com/android/incallui/ModButtonPresenter.java b/src/com/android/incallui/ModButtonPresenter.java
index d70f97c2..338f3c81 100644
--- a/src/com/android/incallui/ModButtonPresenter.java
+++ b/src/com/android/incallui/ModButtonPresenter.java
@@ -148,11 +148,7 @@ public class ModButtonPresenter extends Presenter<ModButtonPresenter.ModButtonUi
             mCall = null;
         }
 
-        if (mCall != null && mPrimaryContactInfo == null) {
-            startContactInfoSearch(mCall, newState == InCallState.INCOMING);
-            getPreferredLinks();
-        }
-
+        getPreferredLinks();
         updateUi(newState, mCall);
     }
 
@@ -493,7 +489,7 @@ public class ModButtonPresenter extends Presenter<ModButtonPresenter.ModButtonUi
     }
 
     public void getPreferredLinks() {
-        if (mCall != null) {
+        if (mCall != null && (mNoteDeepLink == null || !mNoteDeepLink.getAlreadyHasContent())) {
             Uri callUri = DeepLinkIntegrationManager.generateCallUri(mCall.getNumber(),
                     mCall.getCreateTimeMillis());
             DeepLinkIntegrationManager.getInstance().getPreferredLinksFor(mNoteDeepLinkCallback,
-- 
cgit v1.2.3