Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f9c93ba2: am eaaf0512: Crash in print spooler when back pressed before content update complted.

Browse Source 
* commit 'f9c93ba26790cf26df40d21d7e8b6e1e83391dd1':
  Crash in print spooler when back pressed before content update complted.
This commit is contained in:
Svet Ganov
2014-12-02 19:03:54 +00:00
committed by Android Git Automerger
parent e67cf73146 f9c93ba267
commit 66a1200156
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java
View File

@@ -486,7 +486,9 @@ public final class PageContentRepository {
protected Void doInBackground(Void... params) {
synchronized (mLock) {
try {
mRenderer.closeDocument();
if (mRenderer != null) {
mRenderer.closeDocument();
}
} catch (RemoteException re) {
/* ignore */
}

4
packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
View File

@@ -487,6 +487,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
requestCreatePdfFileOrFinish();
} break;
case STATE_PRINT_CANCELED: {
updateOptionsUi();
} break;
default: {
updatePrintPreviewController(document.changed);