Commit efe8d59c authored Jul 08, 2015 by Wale Ogunwale Committed by Android Git Automerger Jul 08, 2015

am d32a235d: am 8c58c318: am fe8426a3: am 06bdab9b: Merge "Set AppErrorDialog...

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

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

parents 97db8395 d32a235d

services/core/java/com/android/server/am/AppErrorDialog.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}