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

Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev

Browse Source
This commit is contained in:
Svetoslav
2014-09-24 20:29:46 +00:00
committed by Android (Google) Code Review
parent a14ec04b1e d23bfa9d42
commit 30a87547c7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -412,8 +412,6 @@ public final class PageContentRepository {
}
private static final class AsyncRenderer implements ServiceConnection {
private static final int MALFORMED_PDF_FILE_ERROR = -2;
private final Object mLock = new Object();
private final Context mContext;
@@ -486,7 +484,7 @@ public final class PageContentRepository {
return mRenderer.openDocument(source);
} catch (RemoteException re) {
Log.e(LOG_TAG, "Cannot open PDF document");
return MALFORMED_PDF_FILE_ERROR;
return PdfManipulationService.MALFORMED_PDF_FILE_ERROR;
} finally {
// Close the fd as we passed it to another process
// which took ownership.
@@ -497,7 +495,7 @@ public final class PageContentRepository {
@Override
public void onPostExecute(Integer pageCount) {
if (pageCount == MALFORMED_PDF_FILE_ERROR) {
if (pageCount == PdfManipulationService.MALFORMED_PDF_FILE_ERROR) {
mOnMalformedPdfFileListener.onMalformedPdfFile();
mPageCount = PrintDocumentInfo.PAGE_COUNT_UNKNOWN;
} else {

4
packages/PrintSpooler/src/com/android/printspooler/renderer/PdfManipulationService.java
View File

@@ -47,6 +47,8 @@ public final class PdfManipulationService extends Service {
public static final String ACTION_GET_EDITOR =
"com.android.printspooler.renderer.ACTION_GET_EDITOR";
public static final int MALFORMED_PDF_FILE_ERROR = -2;
private static final String LOG_TAG = "PdfManipulationService";
private static final boolean DEBUG = false;
@@ -88,7 +90,7 @@ public final class PdfManipulationService extends Service {
} catch (IOException|IllegalStateException e) {
IoUtils.closeQuietly(source);
Log.e(LOG_TAG, "Cannot open file", e);
throw new RemoteException(e.toString());
return MALFORMED_PDF_FILE_ERROR;
}
}
}