commit a6ba2a9d5e563350aa58006af355b914cc79f3bc
author Jordan Liu <jminjie@google.com> Wed Oct 02 13:34:19 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 02 13:34:19 2019 -0700
tree 1c132aef1c5c950e669a709e949bead6237dfc54
parent f9fe5aa4e18850c06dca6cd12c847e96e03d4d3e
parent 1722f5bd0337cae5256c81493fc4b22b9a4be52b

Merge "Do not use isResumed()" am: b99211257a
am: 1722f5bd03

Change-Id: I76615c4c7200caec57960cbd281fff0328824cac

src/com/android/phone/EmergencyCallbackModeExitDialog.java

diff --git a/src/com/android/phone/EmergencyCallbackModeExitDialog.java b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
index 2492f46..dcfa024 100644
--- a/src/com/android/phone/EmergencyCallbackModeExitDialog.java
+++ b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
@@ -68,6 +68,7 @@
     private boolean mInEmergencyCall = false;
     private static final int ECM_TIMER_RESET = 1;
     private Phone mPhone = null;
+    private boolean mIsResumed = false;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -100,6 +101,18 @@
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+        mIsResumed = true;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mIsResumed = false;
+    }
+
+    @Override
     public void onDestroy() {
         super.onDestroy();
         try {
@@ -176,7 +189,7 @@
      * Shows Emergency Callback Mode dialog and starts countdown timer
      */
     private void showEmergencyCallbackModeExitDialog() {
-        if (!this.isResumed()) {
+        if (!mIsResumed) {
             Log.w(TAG, "Tried to show dialog, but activity was already finished");
             return;
         }