commit 6e33abd8fced93a14775d0cf5fc7f157e63b9183
author Jordan Liu <jminjie@google.com> Wed Oct 02 14:28:43 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 02 14:28:43 2019 -0700
tree 28c76aafd55fd8bd8914d3517cbe641590b14327
parent b30032bee3c48a52ed3c38cfe1f2e39cd2e078b0
parent a6ba2a9d5e563350aa58006af355b914cc79f3bc

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

Change-Id: I069bc9bbbdd50046d14faac46ea6965c512d8a28

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;
         }