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

Merge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4

Browse Source 
am: a9c65ffb00

* commit 'a9c65ffb003c8c00667f9ec0d3d7efd28c334b6c':
  Prevent printing from finishing activity.

Change-Id: I8f3263acd7323f6cb7804c75b2cd877768963ada
This commit is contained in:
Philip P. Moltmann
2016-04-21 00:37:22 +00:00
committed by android-build-merger
parent 3d46ea737c a9c65ffb00
commit 7db07e5731
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/print/PrintManager.java
View File

@@ -778,6 +778,12 @@ public final class PrintManager {
public PrintDocumentAdapterDelegate(Activity activity, public PrintDocumentAdapterDelegate(Activity activity,
PrintDocumentAdapter documentAdapter) { PrintDocumentAdapter documentAdapter) {
if (activity.isFinishing()) {
// The activity is already dead hence the onActivityDestroyed callback won't be
// triggered. Hence it is not save to print in this situation.
throw new IllegalStateException("Cannot start printing for finishing activity");
}
mActivity = activity; mActivity = activity;
mDocumentAdapter = documentAdapter; mDocumentAdapter = documentAdapter;
mHandler = new MyHandler(mActivity.getMainLooper()); mHandler = new MyHandler(mActivity.getMainLooper());