commit 702a34baba799eb5d220f497ba9014420406a3ca
author James Lin <jamescflin@google.com> Fri May 29 05:24:20 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 29 05:24:20 2020 +0000
tree 39e21f6083a0dbbdbaa1f16dea5ab32ef9fde75a
parent 16d5332473d71a1499a4f7e8c41fffd09ae422b8
parent 9190189ed9d8f2ab444163030a38386d06b35854

Merge "Fix NullPointerException in PresencePublication"

src/com/android/phone/EmergencyCallbackModeExitDialog.java

diff --git a/src/com/android/phone/EmergencyCallbackModeExitDialog.java b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
index 1210627..591f435 100644
--- a/src/com/android/phone/EmergencyCallbackModeExitDialog.java
+++ b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
@@ -190,7 +190,7 @@
      * Shows Emergency Callback Mode dialog and starts countdown timer
      */
     private void showEmergencyCallbackModeExitDialog() {
-        if (!mIsResumed) {
+        if (isDestroyed()) {
             Log.w(TAG, "Tried to show dialog, but activity was already finished");
             return;
         }