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

Browse Source 
am: 41304f47f4

* commit '41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
  Prevent printing from finishing activity.

Change-Id: I4ab24c8ace1023c481244431bbac8cfbce4003a4
This commit is contained in:
Philip P. Moltmann
2016-04-21 00:34:33 +00:00
committed by android-build-merger
parent 6d3a23d148 41304f47f4
commit a9c65ffb00
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,
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;
mDocumentAdapter = documentAdapter;
mHandler = new MyHandler(mActivity.getMainLooper());