diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-16 18:47:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-16 18:47:45 +0000 |
| commit | b37b7ae137d09e21ed9b57415960ae1b975bdc0f (patch) | |
| tree | c0f7dcd98a3b622898f17faad35ee91fea51af84 /packages | |
| parent | 9c6b5b729bd83b1d1e00428f8a76f272b609c97e (diff) | |
| parent | 23d3361e1747ee286157f9c61c3d02e6e20cac58 (diff) | |
| download | frameworks_base-b37b7ae137d09e21ed9b57415960ae1b975bdc0f.zip frameworks_base-b37b7ae137d09e21ed9b57415960ae1b975bdc0f.tar.gz frameworks_base-b37b7ae137d09e21ed9b57415960ae1b975bdc0f.tar.bz2 | |
Merge "Do not change fragments if print activity finishing." into lmp-dev
Diffstat (limited to 'packages')
| -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); |