Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5880b363 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am fe666e84: am 4e041150: Merge "Avoid NPE and add a warning log if a printing... 

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

* commit 'fe666e84':
  Avoid NPE and add a warning log if a printing app misbehaves.
parents fdf7c36d fe666e84

core/java/android/print/PrintManager.java

+30 −0
Original line number Original line Diff line number Diff line
@@ -860,6 +860,11 @@ public final class PrintManager { 
                }

                }

                final ILayoutResultCallback callback;

                final ILayoutResultCallback callback;

                synchronized (mLock) {

                synchronized (mLock) {

                    if (mDestroyed) {

                        Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "

                                + "finish the printing activity before print completion?");

                        return;

                    }

                    callback = mCallback;

                    callback = mCallback;

                    clearLocked();

                    clearLocked();

                }

                }
@@ -876,6 +881,11 @@ public final class PrintManager { 
            public void onLayoutFailed(CharSequence error) {

            public void onLayoutFailed(CharSequence error) {

                final ILayoutResultCallback callback;

                final ILayoutResultCallback callback;

                synchronized (mLock) {

                synchronized (mLock) {

                    if (mDestroyed) {

                        Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "

                                + "finish the printing activity before print completion?");

                        return;

                    }

                    callback = mCallback;

                    callback = mCallback;

                    clearLocked();

                    clearLocked();

                }

                }
@@ -891,6 +901,11 @@ public final class PrintManager { 
            @Override

            @Override

            public void onLayoutCancelled() {

            public void onLayoutCancelled() {

                synchronized (mLock) {

                synchronized (mLock) {

                    if (mDestroyed) {

                        Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "

                                + "finish the printing activity before print completion?");

                        return;

                    }

                    clearLocked();

                    clearLocked();

                }

                }

            }

            }
@@ -918,6 +933,11 @@ public final class PrintManager { 
            public void onWriteFinished(PageRange[] pages) {

            public void onWriteFinished(PageRange[] pages) {

                final IWriteResultCallback callback;

                final IWriteResultCallback callback;

                synchronized (mLock) {

                synchronized (mLock) {

                    if (mDestroyed) {

                        Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "

                                + "finish the printing activity before print completion?");

                        return;

                    }

                    callback = mCallback;

                    callback = mCallback;

                    clearLocked();

                    clearLocked();

                }

                }
@@ -940,6 +960,11 @@ public final class PrintManager { 
            public void onWriteFailed(CharSequence error) {

            public void onWriteFailed(CharSequence error) {

                final IWriteResultCallback callback;

                final IWriteResultCallback callback;

                synchronized (mLock) {

                synchronized (mLock) {

                    if (mDestroyed) {

                        Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "

                                + "finish the printing activity before print completion?");

                        return;

                    }

                    callback = mCallback;

                    callback = mCallback;

                    clearLocked();

                    clearLocked();

                }

                }
@@ -955,6 +980,11 @@ public final class PrintManager { 
            @Override

            @Override

            public void onWriteCancelled() {

            public void onWriteCancelled() {

                synchronized (mLock) {

                synchronized (mLock) {

                    if (mDestroyed) {

                        Log.e(LOG_TAG, "PrintDocumentAdapter is destroyed. Did you "

                                + "finish the printing activity before print completion?");

                        return;

                    }

                    clearLocked();

                    clearLocked();

                }

                }

            }

            }