Don't use static instance of EmergencyCallListener.

There's a couple ways to fix this, but this seemed to be the most
straightforward one. Basically, we want the values for the emergency
call listener (ie. the cached isEmergency value) to reset across
different displays of the InCall UI.

Bug: 21027909
Change-Id: I0b42873e3fa52ee2fc8ee98ee876caf31ec98883

1 files changed, 2 insertions, 3 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index b233ad56b..eed92cf59 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -65,12 +65,11 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
         public void onCallUpdated(BaseFragment fragment, boolean isEmergency);
     }
 
-    private static final EmergencyCallListener mEmergencyCallListener =
-            ObjectFactory.newEmergencyCallListener();
-
     private static final String TAG = CallCardPresenter.class.getSimpleName();
     private static final long CALL_TIME_UPDATE_INTERVAL_MS = 1000;
 
+    private final EmergencyCallListener mEmergencyCallListener = ObjectFactory.newEmergencyCallListener();
+
     private Call mPrimary;
     private Call mSecondary;
     private ContactCacheEntry mPrimaryContactInfo;