diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-16 19:09:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-16 19:09:10 +0000 |
| commit | 307bdcd1dc677f9a44fa00def8d72e529e010a20 (patch) | |
| tree | daca1e1831e94310bf4550a43393cf8b6ca13066 | |
| parent | 4bac6dee4382a60b273658e8ac539237fae2bc34 (diff) | |
| parent | 95b433814f96de5acabb986b29a0e56e06d40b56 (diff) | |
| download | frameworks_base-307bdcd1dc677f9a44fa00def8d72e529e010a20.zip frameworks_base-307bdcd1dc677f9a44fa00def8d72e529e010a20.tar.gz frameworks_base-307bdcd1dc677f9a44fa00def8d72e529e010a20.tar.bz2 | |
am 79541afa: am ccf13317: Merge "Do not change fragments if print activity finishing." into lmp-dev
* commit '79541afacfec8f5135a5a9486030b0bd1d06ee42':
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); |