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

am 4e041150: Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev

Browse Source 
* commit '4e04115052a66d5a7836c5e7a9bfc1a5d6f3784b':
  Avoid NPE and add a warning log if a printing app misbehaves.
This commit is contained in:
Svetoslav
2013-11-13 17:50:22 -08:00
committed by Android Git Automerger
parent 378c804d65 4e04115052
commit fe666e848a
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -860,6 +860,11 @@ public final class PrintManager {
}
final ILayoutResultCallback callback;
synchronized (mLock) {
if (mDestroyed) {
Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "
+ "finish the printing activity before print completion?");
return;
}
callback = mCallback;
clearLocked();
}
@@ -876,6 +881,11 @@ public final class PrintManager {
public void onLayoutFailed(CharSequence error) {
final ILayoutResultCallback callback;
synchronized (mLock) {
if (mDestroyed) {
Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "
+ "finish the printing activity before print completion?");
return;
}
callback = mCallback;
clearLocked();
}
@@ -891,6 +901,11 @@ public final class PrintManager {
@Override
public void onLayoutCancelled() {
synchronized (mLock) {
if (mDestroyed) {
Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "
+ "finish the printing activity before print completion?");
return;
}
clearLocked();
}
}
@@ -918,6 +933,11 @@ public final class PrintManager {
public void onWriteFinished(PageRange[] pages) {
final IWriteResultCallback callback;
synchronized (mLock) {
if (mDestroyed) {
Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "
+ "finish the printing activity before print completion?");
return;
}
callback = mCallback;
clearLocked();
}
@@ -940,6 +960,11 @@ public final class PrintManager {
public void onWriteFailed(CharSequence error) {
final IWriteResultCallback callback;
synchronized (mLock) {
if (mDestroyed) {
Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "
+ "finish the printing activity before print completion?");
return;
}
callback = mCallback;
clearLocked();
}
@@ -955,6 +980,11 @@ public final class PrintManager {
@Override
public void onWriteCancelled() {
synchronized (mLock) {
if (mDestroyed) {
Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "
+ "finish the printing activity before print completion?");
return;
}
clearLocked();
}
}