am d32a235d: am 8c58c318: am fe8426a3: am 06bdab9b: Merge "Set AppErrorDialog result during dismissal if it isn\'t already set" into mnc-dev

* commit 'd32a235dbff1c3c42df75c8710dd6f5a64f269f4':
  Set AppErrorDialog result during dismissal if it isn't already set

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();
+    }
 }