Merge "Set AppErrorDialog result during dismissal if it isn't already set" into mnc-dev

1 files changed, 9 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/am/AppErrorDialog.java b/services/core/java/com/android/server/am/AppErrorDialog.java
index 098b0b65210f..c8fb351bc416 100644
--- a/services/core/java/com/android/server/am/AppErrorDialog.java
+++ b/services/core/java/com/android/server/am/AppErrorDialog.java
@@ -102,4 +102,13 @@ final class AppErrorDialog extends BaseErrorDialog {
             dismiss();
         }
     };
+
+    @Override
+    public void dismiss() {
+        if (!mResult.mHasResult) {
+            // We are dismissing and the result has not been set...go ahead and set.
+            mResult.set(FORCE_QUIT);
+        }
+        super.dismiss();
+    }
 }