diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-16 18:57:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-16 18:57:37 +0000 |
| commit | 95b433814f96de5acabb986b29a0e56e06d40b56 (patch) | |
| tree | ea00234972acf2e54c773a7bb7f34a63cdf16de1 | |
| parent | 0fdab3c481b804d0919d81ade032321dee04b824 (diff) | |
| parent | b37b7ae137d09e21ed9b57415960ae1b975bdc0f (diff) | |
| download | frameworks_base-95b433814f96de5acabb986b29a0e56e06d40b56.zip frameworks_base-95b433814f96de5acabb986b29a0e56e06d40b56.tar.gz frameworks_base-95b433814f96de5acabb986b29a0e56e06d40b56.tar.bz2 | |
am ccf13317: Merge "Do not change fragments if print activity finishing." into lmp-dev
* commit 'ccf133173bf628df149a27481f879cd9eeacbfba':
Do not change fragments if print activity finishing.
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index 693e5ac..3985285 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -816,6 +816,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat } private void ensureProgressUiShown() { + if (isFinishing()) { + return; + } if (mUiState != UI_STATE_PROGRESS) { mUiState = UI_STATE_PROGRESS; mPrintPreviewController.setUiShown(false); @@ -825,6 +828,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat } private void ensurePreviewUiShown() { + if (isFinishing()) { + return; + } if (mUiState != UI_STATE_PREVIEW) { mUiState = UI_STATE_PREVIEW; mPrintPreviewController.setUiShown(true); @@ -833,6 +839,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat } private void ensureErrorUiShown(CharSequence message, int action) { + if (isFinishing()) { + return; + } if (mUiState != UI_STATE_ERROR) { mUiState = UI_STATE_ERROR; mPrintPreviewController.setUiShown(false); |