diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-08-21 21:34:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-21 21:34:09 +0000 |
| commit | 0104503c50623cb5b1e92cc5fb706263df1891f2 (patch) | |
| tree | 6d6f4dce55edc4029cab8bf7c8f1fe7136cc456e | |
| parent | 105f6ceb0f123d365e1ff5837f0442b3e377a056 (diff) | |
| parent | b1a8a89697fbe714c0fa447fec2a73628555a656 (diff) | |
| download | frameworks_base-0104503c50623cb5b1e92cc5fb706263df1891f2.zip frameworks_base-0104503c50623cb5b1e92cc5fb706263df1891f2.tar.gz frameworks_base-0104503c50623cb5b1e92cc5fb706263df1891f2.tar.bz2 | |
Merge "Work on issue #16683269: system_server still leaking memory" into lmp-dev
| -rw-r--r-- | services/core/java/com/android/server/am/AppErrorDialog.java | 3 |
1 files changed, 3 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 0ba62c5..098b0b6 100644 --- a/services/core/java/com/android/server/am/AppErrorDialog.java +++ b/services/core/java/com/android/server/am/AppErrorDialog.java @@ -94,6 +94,9 @@ final class AppErrorDialog extends BaseErrorDialog { } mResult.set(msg.what); + // Make sure we don't have time timeout still hanging around. + removeMessages(FORCE_QUIT); + // If this is a timeout we won't be automatically closed, so go // ahead and explicitly dismiss ourselves just in case. dismiss(); |